add optional scope param to backendClient

Author: jsendo

packages/sdk/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 # Changelog
 
+## [1.7.0] - 2025-07-03
+
+### Added
+
+- Added optional scope parameter to backendClient creation.
+
 ## [1.6.9] - 2025-06-10
 
 ### Added

packages/sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pipedream/sdk",
   "type": "module",
-  "version": "1.6.9",
+  "version": "1.7.0",
   "description": "Pipedream SDK",
   "main": "./dist/server.js",
   "module": "./dist/server.js",

packages/sdk/src/server/index.ts

@@ -298,68 +298,68 @@ export class BackendClient extends BaseClient {
       as,
     } = this.oauthClient
 
-    let attempts = 0;
     const maxAttempts = 2;
 
     while (!this.oauthAccessToken || this.oauthAccessToken.expiresAt - Date.now() < 1000) {
-      if (attempts > maxAttempts) {
-        throw new Error("ran out of attempts trying to retrieve oauth access token");
-      }
-      if (attempts > 0) {
-        // Wait for a short duration before retrying to avoid rapid retries
-        await new Promise((resolve) => setTimeout(resolve, 100));
-      }
+      for (let attempts = 0; attempts <= maxAttempts; attempts++) {
+        if (attempts > 0) {
+          // Wait for a short duration before retrying to avoid rapid retries
+          await new Promise((resolve) => setTimeout(resolve, 100));
+        }
 
-      const parameters = new URLSearchParams();
-      if (this.scope && this.scope.length > 0) {
-        parameters.set("scope", this.scope.join(" "));
-      }
-      try {
-        const response = await oauth.clientCredentialsGrantRequest(as, client, clientAuth, parameters);
-        const oauthTokenResponse = await oauth.processClientCredentialsResponse(as, client, response);
-        this.oauthAccessToken = {
-          token: oauthTokenResponse.access_token,
-          expiresAt: Date.now() + (oauthTokenResponse.expires_in || 0) * 1000,
-        };
-      } catch (e) {
-        // Extract error details from OAuth response
-        let errorMessage = "OAuth token request failed";
-        let wwwAuthenticate: string | undefined;
-        let statusCode: number | undefined;
-        
-        if (e instanceof Error) {
-          errorMessage = e.message;
+        const parameters = new URLSearchParams();
+        if (this.scope && this.scope.length > 0) {
+          parameters.set("scope", this.scope.join(" "));
         }
+        parameters.set("project_id", this.projectId);
+        parameters.set("environment", this.environment);
 
-        // Check if the error contains response information
-        if (e && typeof e === 'object' && 'response' in e) {
-          const errorResponse = (e as any).response;
-          if (errorResponse) {
-            statusCode = errorResponse.status;
-            wwwAuthenticate = errorResponse.headers?.get?.('www-authenticate') || 
-                             errorResponse.headers?.['www-authenticate'];
-            
-            // Create more specific error message based on status code
-            if (statusCode === 401) {
-              errorMessage = `OAuth authentication failed (401 Unauthorized)${wwwAuthenticate ? `: ${wwwAuthenticate}` : ''}`;
-            } else if (statusCode === 400) {
-              errorMessage = "OAuth request invalid (400 Bad Request) - check client credentials";
-            } else if (statusCode) {
-              errorMessage = `OAuth request failed with status ${statusCode}`;
+        try {
+          const response = await oauth.clientCredentialsGrantRequest(as, client, clientAuth, parameters);
+          const oauthTokenResponse = await oauth.processClientCredentialsResponse(as, client, response);
+          this.oauthAccessToken = {
+            token: oauthTokenResponse.access_token,
+            expiresAt: Date.now() + (oauthTokenResponse.expires_in || 0) * 1000,
+          };
+          break; // Successfully got token, exit retry loop
+        } catch (e) {
+          // Extract error details from OAuth response
+          let errorMessage = "OAuth token request failed";
+          let wwwAuthenticate: string | undefined;
+          let statusCode: number | undefined;
+          
+          if (e instanceof Error) {
+            errorMessage = e.message;
+          }
+          
+          // Check if the error contains response information
+          if (e && typeof e === 'object' && 'response' in e) {
+            const errorResponse = (e as any).response;
+            if (errorResponse) {
+              statusCode = errorResponse.status;
+              wwwAuthenticate = errorResponse.headers?.get?.('www-authenticate') || 
+                               errorResponse.headers?.['www-authenticate'];
+              
+              // Create more specific error message based on status code
+              if (statusCode === 401) {
+                errorMessage = `OAuth authentication failed (401 Unauthorized)${wwwAuthenticate ? `: ${wwwAuthenticate}` : ''}`;
+              } else if (statusCode === 400) {
+                errorMessage = "OAuth request invalid (400 Bad Request) - check client credentials";
+              } else if (statusCode) {
+                errorMessage = `OAuth request failed with status ${statusCode}`;
+              }
             }
           }
-        }
-        
-        // If this is the last attempt, throw a detailed error
-        if (attempts >= maxAttempts) {
-          const error = new Error(errorMessage);
-          (error as any).statusCode = statusCode;
-          (error as any).wwwAuthenticate = wwwAuthenticate;
-          throw error;
+          
+          // If this is the last attempt, throw a detailed error
+          if (attempts >= maxAttempts) {
+            const error = new Error(errorMessage);
+            (error as any).statusCode = statusCode;
+            (error as any).wwwAuthenticate = wwwAuthenticate;
+            throw error;
+          }
         }
       }
-
-      attempts++;
     }
 
     return this.oauthAccessToken.token;