Changeset 9873

Timestamp:

05/13/2020 06:43:14 PM (5 years ago)

Author:

coreymckrill

Message:

Official WP Events: Attempt to reset oauth token when response is auth_fail

The Meetup API sometimes sends auth_fail errors in the middle of a batch of
requests where all the previous ones succeeded. This might be because the token
has expired, so this tries to reset the token without canceling the entire
current batch of requests.

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

@@ -102 +102 @@
         $body = json_decode( wp_remote_retrieve_body( $response ), true );
 
-        if ( 400 === $code && ! empty( $body['error'] ) && 'invalid_grant' === $body['error'] ) {
+        $parsed_error = $this->parse_error( $body );
+
+        if (
+            ( 400 === $code && $parsed_error->get_error_message( 'invalid_grant' ) )
+            || ( 401 === $code && $parsed_error->get_error_message( 'auth_fail' ) )
+        ) {
             $this->oauth_client->reset_oauth_token();
 
@@ -219 +224 @@
         $oauth_token = $this->oauth_client->get_oauth_token();
 
+        if ( ! empty( $this->oauth_client->error->get_error_messages() ) ) {
+            $this->error = $this->merge_errors( $this->error, $this->oauth_client->error );
+        }
+
         return array(
             'headers' => array(
@@ -321 +330 @@
         $data          = json_decode( wp_remote_retrieve_body( $response ), true );
 
-        if ( isset( $data['errors'] ) ) {
-            foreach ( $data['errors'] as $error ) {
-                $this->error->add(
-                    $error['code'],
-                    $error['message']
-                );
-            }
-        } 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(
-                $data['code'],
-                $data['details']
-            );
-        } elseif ( $response_code ) {
-            $this->error->add(
-                'http_response_code',
-                sprintf( 'HTTP Status: %d', absint( $response_code ) )
-            );
+        $parsed_error = $this->parse_error( $data, $response_code );
+
+        if ( ! empty( $parsed_error->get_error_messages() ) ) {
+            $this->error = self::merge_errors( $this->error, $parsed_error );
         } else {
             $this->error->add(
@@ -352 +343 @@
 
     /**
+     * Attempt to extract codes and messages from a suspected error response.
+     *
+     * @param array $data          The data in the response body, parsed as an array.
+     * @param int   $response_code Optional. The HTTP status code from the response.
+     *
+     * @return WP_Error
+     */
+    protected function parse_error( array $data, $response_code = 0 ) {
+        $error = new WP_Error();
+
+        if ( isset( $data['errors'] ) ) {
+            foreach ( $data['errors'] as $error ) {
+                $error->add(
+                    $error['code'],
+                    $error['message']
+                );
+            }
+        } elseif ( isset( $data['error'], $data['error_description'] ) ) {
+            $error->add(
+                $data['error'],
+                $data['error_description']
+            );
+        } elseif ( isset( $data['code'], $data['details'] ) ) {
+            $error->add(
+                $data['code'],
+                $data['details']
+            );
+        } elseif ( $response_code ) {
+            $error->add(
+                'http_response_code',
+                sprintf( 'HTTP Status: %d', absint( $response_code ) )
+            );
+        }
+
+        return $error;
+    }
+
+    /**
      * Retrieve data about groups in the Chapter program.
      *