Changeset 9223

Timestamp:

10/22/2019 06:08:56 AM (5 years ago)

Author:

dd32

Message:

Official WordPress Events: Tweak the logic around token refreshing.

The cron tasks were failing sporadically as the token wasn't valid - it looks like the token "looked valid" and expired, but looks like the refresh token was also expired.

This feels lik a hammer, forcing a new token to be fetched when both the token and refresh token are expired, but it worked.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/meetup/class-meetup-oauth2-client.php (modified) (1 diff)

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

@@ -295 +295 @@
             $needs_caching = true;
         } elseif ( $this->is_expired_token( $token ) ) {
-            $server_token  = $this->request_token( 'refresh_token', $token ); // Alternate for Steps 1 & 2.
+            $server_token = $this->request_token( 'refresh_token', $token ); // Alternate for Steps 1 & 2.
+
+            // If the token is no longer valid but "looked valid" fetch a fresh one.
+            if ( ! $server_token && $this->error->get_error_message( 'oauth_error' ) ) {
+                $this->error->remove( 'oauth_error' );
+
+                // The token isn't valid for refreshing, request a new one.
+                $authorization = $this->request_authorization_code(); // Step 1.
+                $server_token  = $this->request_token( 'server_token', $authorization ); // Step 2.
+            }
+
             $token         = $this->request_token( 'oauth_token', $server_token ); // Step 3.
             $needs_caching = true;