OAuth: normalise scope when refreshing tokens

docs/utils-reference/getting-started.md

@@ -16,6 +16,10 @@ npm install --save @raycast/utils
 
 ## Changelog
 
+### v2.2.6
+
+- Fixed an issue where refreshing OAuth tokens would fails for providers that return scope as an array instead of a string
+
 ### v2.2.5
 
 - Fixed an issue where `useSql` would not properly show the permission priming screen

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raycast/utils",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Set of utilities to streamline building Raycast extensions",
   "author": "Raycast Technologies Ltd.",
   "homepage": "https://developers.raycast.com/utilities/getting-started",

src/oauth/OAuthService.ts

@@ -7,6 +7,11 @@
   ProviderWithDefaultClientOptions,
 } from "./types";
 
+function normalizeTokenResponse(tokens: OAuth.TokenResponse): OAuth.TokenResponse {
+  // Some clients such as Linear can return a scope array instead of a string.
+  return Array.isArray(tokens.scope) ? { ...tokens, scope: tokens.scope.join(" ") } : tokens;
+}
+
 /**
  * Class allowing to create an OAuth service using the the PKCE (Proof Key for Code Exchange) flow.
  *
@@ -273,7 +278,7 @@
       tokenRefreshResponseParser: options.tokenRefreshResponseParser,
       tokenResponseParser:
         options.tokenResponseParser ??
         ((response: any) => {
           return {
             access_token: response.authed_user.access_token,
             scope: response.authed_user.scope,
@@ -400,8 +405,7 @@
     }
     const tokens = this.tokenResponseParser(await response.json());
 
-    // Some clients such as Linear can return a scope array instead of a string
-    return Array.isArray(tokens.scope) ? { ...tokens, scope: tokens.scope.join(" ") } : tokens;
+    return normalizeTokenResponse(tokens);
   }
 
   private async refreshTokens({ token }: { token: string }) {
@@ -435,7 +439,7 @@
     } else {
       const tokenResponse = this.tokenRefreshResponseParser(await response.json());
       tokenResponse.refresh_token = tokenResponse.refresh_token ?? token;
-      return tokenResponse;
+      return normalizeTokenResponse(tokenResponse);
     }
   }
 }