fix: refresh access token before issuing request

salesforcecli · Jan 15, 2025 · f0e0cd0 · f0e0cd0
1 parent edc3234
commit f0e0cd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/commands/api/request/graphql.ts b/src/commands/api/request/graphql.ts
@@ -45,6 +45,8 @@ export default class Graphql extends SfCommand<void> {
       .replaceAll('"', '\\"')}"}`;
     const url = new URL(`${org.getField<string>(Org.Fields.INSTANCE_URL)}/services/data/v${apiVersion}/graphql`);
 
+    // refresh access token to ensure `got` gets a valid access token.
+    // TODO: we could skip this step if we used jsforce's HTTP module instead (handles expired tokens).
     await org.refreshAuth();
 
     const options = {

diff --git a/src/commands/api/request/rest.ts b/src/commands/api/request/rest.ts
@@ -138,6 +138,10 @@ export class Rest extends SfCommand<void> {
       headers = { ...headers, ...body.getHeaders() };
     }
 
+    // refresh access token to ensure `got` gets a valid access token.
+    // TODO: we could skip this step if we used jsforce's HTTP module instead (handles expired tokens).
+    await org.refreshAuth();
+
     const options = {
       agent: { https: new ProxyAgent() },
       method,
@@ -155,8 +159,6 @@ export class Rest extends SfCommand<void> {
       followRedirect: false,
     };
 
-    await org.refreshAuth();
-
     await sendAndPrintRequest({ streamFile, url, options, include: flags.include, this: this });
   }
 }