Changeset 9107 for sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-api-client.php

Timestamp:

08/17/2019 12:35:04 AM (7 years ago)

Author:

coreymckrill

Message:

Official WordPress Events: Tweak Meetup client to try to avoid auth token probs

This attempts to avoid the scenario where the client has somehow stored an
oauth token that is expired/invalid, and keeps using it for requests anyway.
Now it will try to detect when the token it has isn't working and refresh it
without breaking the current request cycle.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-api-client.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-api-client.php

@@ -37 +37 @@
      */
     protected $breaking_response_codes = [];
+
+    /**
+     * @var string|null The URL for the current request being attempted.
+     */
+    protected $current_request_url = null;
+
+    /**
+     * @var array|null The args for the current request being attempted.
+     */
+    protected $current_request_args = null;
 
     /**
@@ -86 +96 @@
         }
 
+        // Set current request in state so it can be manipulated between request attempts if necessary.
+        $this->current_request_url  = $url;
+        $this->current_request_args = $args;
+
         while ( $attempt_count < $max_attempts ) {
-            $response      = wp_remote_request( $url, $args );
+            $response      = wp_remote_request( $this->current_request_url, $this->current_request_args );
             $response_code = wp_remote_retrieve_response_code( $response );
 
@@ -118 +132 @@
              * @param int   $max_attempts
              */
-            do_action( 'api_client_tenacious_remote_request_attempt', $response, compact( 'url', 'args' ), $attempt_count, $max_attempts );
+            do_action(
+                'api_client_tenacious_remote_request_attempt',
+                $response,
+                array(
+                    'url'  => $this->current_request_url,
+                    'args' => $this->current_request_args,
+                ),
+                $attempt_count,
+                $max_attempts
+            );
 
             if ( $attempt_count < $max_attempts ) {
@@ -129 +152 @@
             }
         }
+
+        // Reset current request.
+        $this->current_request_url  = null;
+        $this->current_request_args = null;
 
         if ( $attempt_count === $max_attempts && ( 200 !== $response_code || is_wp_error( $response ) ) ) {
@@ -225 +252 @@
 
     /**
+     * Merge two error objects into one, new error object.
+     *
+     * @param WP_Error $error1 An error object.
+     * @param WP_Error $error2 An error object.
+     *
+     * @return WP_Error The combined errors of the two parameters.
+     */
+    protected function merge_errors( WP_Error $error1, WP_Error $error2 ) {
+        $codes = $error2->get_error_codes();
+
+        foreach ( $codes as $code ) {
+            $messages = $error2->get_error_messages( $code );
+
+            foreach ( $messages as $message ) {
+                $error1->add( $code, $message );
+            }
+        }
+
+        return $error1;
+    }
+
+    /**
      * Outputs a message when the command is run from the PHP command line.
      *