Fix body-encoding not being used

raycast · Jun 20, 2024 · bb8964f · bb8964f
1 parent 5e65297
commit bb8964f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/docs/utils-reference/getting-started.md b/docs/utils-reference/getting-started.md
@@ -16,6 +16,10 @@ npm install --save @raycast/utils
 
 ## Changelog
 
+### v1.16.1
+
+- Fixed an issue where `bodyEncoding` wasn't properly used in OAuthService.
+
 ### v1.16.0
 
 - Add a `failureToastOptions` prop to `useFetch`, `useCachedPromise`, and `usePromise` to make it possible to customize the error displayed instead of a generic "Failed to fetch latest data".

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@raycast/utils",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Set of utilities to streamline building Raycast extensions",
   "author": "Raycast Technologies Ltd.",
   "homepage": "https://developers.raycast.com/utils-reference",

diff --git a/src/oauth/OAuthService.ts b/src/oauth/OAuthService.ts
@@ -26,13 +26,6 @@ export interface OAuthServiceOptions {
   tokenRefreshResponseParser?: (response: unknown) => OAuth.TokenResponse;
 }
 
-type FetchTokensArgs = { authRequest: OAuth.AuthorizationRequest; authorizationCode: string } & Pick<
-  OAuthServiceOptions,
-  "clientId" | "tokenUrl" | "bodyEncoding"
->;
-
-type RefreshTokensArgs = { token: string } & Pick<OAuthServiceOptions, "clientId" | "tokenUrl" | "bodyEncoding">;
-
 /**
  * Class allowing to create an OAuth service using the the PKCE (Proof Key for Code Exchange) flow.
  *
@@ -182,9 +175,7 @@ export class OAuthService implements OAuthServiceOptions {
       if (currentTokenSet.refreshToken && currentTokenSet.isExpired()) {
         const tokens = await this.refreshTokens({
           token: currentTokenSet.refreshToken,
-          clientId: this.clientId,
-          tokenUrl: this.refreshTokenUrl ?? this.tokenUrl,
-        })
+        });
         await this.client.setTokens(tokens);
         return tokens.access_token;
       }
@@ -202,20 +193,24 @@ export class OAuthService implements OAuthServiceOptions {
     const tokens = await this.fetchTokens({
       authRequest,
       authorizationCode,
-      clientId: this.clientId,
-      tokenUrl: this.tokenUrl,
     });
 
     await this.client.setTokens(tokens);
 
     return tokens.access_token;
   }
 
-  private async fetchTokens({ authRequest, authorizationCode, clientId, tokenUrl, bodyEncoding }: FetchTokensArgs) {
+  private async fetchTokens({
+    authRequest,
+    authorizationCode,
+  }: {
+    authRequest: OAuth.AuthorizationRequest;
+    authorizationCode: string;
+  }) {
     let options;
-    if (bodyEncoding === "url-encoded") {
+    if (this.bodyEncoding === "url-encoded") {
       const params = new URLSearchParams();
-      params.append("client_id", clientId);
+      params.append("client_id", this.clientId);
       params.append("code", authorizationCode);
       params.append("code_verifier", authRequest.codeVerifier);
       params.append("grant_type", "authorization_code");
@@ -225,7 +220,7 @@ export class OAuthService implements OAuthServiceOptions {
     } else {
       options = {
         body: JSON.stringify({
-          client_id: clientId,
+          client_id: this.clientId,
           code: authorizationCode,
           code_verifier: authRequest.codeVerifier,
           grant_type: "authorization_code",
@@ -235,7 +230,7 @@ export class OAuthService implements OAuthServiceOptions {
       };
     }
 
-    const response = await fetch(tokenUrl, { method: "POST", ...options });
+    const response = await fetch(this.tokenUrl, { method: "POST", ...options });
     if (!response.ok) {
       const responseText = await response.text();
       console.error("fetch tokens error:", responseText);
@@ -247,27 +242,27 @@ export class OAuthService implements OAuthServiceOptions {
     return Array.isArray(tokens.scope) ? { ...tokens, scope: tokens.scope.join(" ") } : tokens;
   }
 
-  private async refreshTokens({ token, clientId, tokenUrl, bodyEncoding }: RefreshTokensArgs) {
+  private async refreshTokens({ token }: { token: string }) {
     let options;
-    if (bodyEncoding === "url-encoded") {
+    if (this.bodyEncoding === "url-encoded") {
       const params = new URLSearchParams();
-      params.append("client_id", clientId);
+      params.append("client_id", this.clientId);
       params.append("refresh_token", token);
       params.append("grant_type", "refresh_token");
 
       options = { body: params };
     } else {
       options = {
         body: JSON.stringify({
-          client_id: clientId,
+          client_id: this.clientId,
           refresh_token: token,
           grant_type: "refresh_token",
         }),
         headers: { "Content-Type": "application/json" },
       };
     }
 
-    const response = await fetch(tokenUrl, { method: "POST", ...options });
+    const response = await fetch(this.refreshTokenUrl ?? this.tokenUrl, { method: "POST", ...options });
     if (!response.ok) {
       const responseText = await response.text();
       console.error("refresh tokens error:", responseText);