Changeset 9107 for sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-meetup-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-meetup-client.php (modified) (4 diffs)

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

@@ -73 +73 @@
                 );
 
+                $this->debug = $settings['debug'];
+
+                if ( $this->debug ) {
+                        self::cli_message( "Meetup Client debug is on. Results will be truncated." );
+                }
+
                 $this->oauth_client = new Meetup_OAuth2_Client;
-                $this->debug        = $settings['debug'];
-
-                if ( $this->debug ) {
-                        self::cli_message( "Meetup Client debug is ON. Results will be truncated." );
+
+                if ( ! empty( $this->oauth_client->error->get_error_messages() ) ) {
+                        $this->error = $this->merge_errors( $this->error, $this->oauth_client->error );
+                }
+
+                add_action( 'api_client_tenacious_remote_request_attempt', array( $this, 'maybe_reset_oauth_token' ) );
+        }
+
+        /**
+         * Attempt to fix authorization errors before they permanently fail.
+         *
+         * Hooked to `api_client_tenacious_remote_request_attempt` so that a request that has failed due to an invalid
+         * oauth token can be retried after resetting the token.
+         *
+         * @param array $response
+         *
+         * @return void
+         */
+        public function maybe_reset_oauth_token( $response ) {
+                $code = wp_remote_retrieve_response_code( $response );
+                $body = json_decode( wp_remote_retrieve_body( $response ), true );
+
+                if ( 400 === $code && ! empty( $body['error'] ) && 'invalid_grant' === $body['error'] ) {
+                        $this->oauth_client->reset_oauth_token();
+
+                        if ( ! empty( $this->oauth_client->error->get_error_messages() ) ) {
+                                $this->error = $this->merge_errors( $this->error, $this->oauth_client->error );
+                        }
+
+                        // Reset the request headers, so that they include the new oauth token.
+                        $this->current_request_args = $this->get_request_args();
                 }
         }
@@ -123 +156 @@
                                 $request_url = $this->get_next_url( $response );
                         } else {
-                                $this->handle_error_response( $response );
+                                $this->handle_error_response( $response, $request_url );
                                 break;
                         }
@@ -168 +201 @@
                         }
                 } else {
-                        $this->handle_error_response( $response );
+                        $this->handle_error_response( $response, $request_url );
                 }
 
@@ -295 +328 @@
                                 );
                         }
+                } elseif ( isset( $data['error'], $data['error_description'] ) ) {
+                        $this->error->add(
+                                $data['error'],
+                                $data['error_description']
+                        );
                 } elseif ( isset( $data['code'] ) && isset( $data['details'] ) ) {
                         $this->error->add(