fix renewing tokens, send all scopes to get access token & refresh to…

…kens for personal MS account also
Symplicity · Mar 14, 2024 · c6bce4e · c6bce4e
1 parent f157b49
commit c6bce4e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/Token.php b/src/Token.php
@@ -92,7 +92,7 @@ public function refresh(string $refreshToken, string $redirectUrl, ?AbstractProv
     {
         $tokenRequestContext = $this->getClientCredentialContext();
         $params = $tokenRequestContext->getRefreshTokenParams($refreshToken);
-        $params['scope'] ??= self::CALENDAR_READ_WRITE_SCOPE;
+        $params['scope'] ??= implode(' ', $this->scopes);
         $oauthProvider ??= ProviderFactory::create($tokenRequestContext);
         $response = $oauthProvider->getAccessToken('refresh_token', $params);
         $this->getCacheKey($response->getToken());

diff --git a/src/Utilities/MigrationService.php b/src/Utilities/MigrationService.php
@@ -12,15 +12,18 @@ public static function isTokenInvalid(string $accessToken): bool
     {
         $migrate = false;
         [, $payload,] = \explode('.', $accessToken);
-        $payloadString = \base64_decode($payload);
-        if ($payloadString) {
-            $tokenArray = \json_decode($payloadString, true);
-            if (json_last_error() === \JSON_ERROR_NONE
-                && isset($tokenArray['aud'])
-                && $tokenArray['aud'] !== static::VALID_AUDIENCE_ENDPOINT) {
-                $migrate = true;
+        if (\is_string($payload)) {
+            $payloadString = \base64_decode($payload);
+            if ($payloadString) {
+                $tokenArray = \json_decode($payloadString, true);
+                if (json_last_error() === \JSON_ERROR_NONE
+                    && isset($tokenArray['aud'])
+                    && $tokenArray['aud'] !== static::VALID_AUDIENCE_ENDPOINT) {
+                    $migrate = true;
+                }
             }
         }
+
         return $migrate;
     }
 }