Changeset 11728 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-helpscout.php

Timestamp:

04/01/2022 03:30:53 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Stats Report: Fix the first request to the HelpScout API endpoints.

• The first non-cached request to the HelpScout API failed to use the proper Authorization header format, due to a missing BEARER prefix.
• Increased the API timeout for HelpScout to 15s, although it probably doesn't need it.
• Make it more obvious that something is wrong with the HelpScout details, by returning 0's for all numbers, rather than just one or two of them.

See #4306.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-helpscout.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/clients/class-helpscout.php

@@ -9 +9 @@
 class HelpScout {
     const API_BASE = 'https://api.helpscout.net';
+
+    /**
+     * The HTTP timeout for the HelpScout API.
+     */
+    const TIMEOUT = 15;
 
     public static function api( $url, $args = null, $method = 'GET' ) {
@@ -33 +38 @@
                     'Authorization' => self::get_auth_string(),
                 ],
+                'timeout' => self::TIMEOUT,
                 'body'    => ( 'POST' === $method && $args ) ? $args : null,
             )
@@ -52 +58 @@
             self::API_BASE . '/v2/oauth2/token',
             array(
-                'body' => array(
+                'timeout' => self::TIMEOUT,
+                'body'    => array(
                     'grant_type'    => 'client_credentials',
                     'client_id'     => HELPSCOUT_APP_ID,
@@ -72 +79 @@
         set_site_transient( __CLASS__ . 'get_auth_token', [ 'exp' => time() + $expiry, 'token' => $token ], $expiry );
 
-        return $token;
+        return 'BEARER ' . $token;
     }