@zapier/zapier-sdk-cli 0.13.10 → 0.13.12

package/dist/index.cjs

@@ -161,7 +161,15 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
-var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
+var login = async ({
+  timeoutMs = LOGIN_TIMEOUT_MS,
+  baseUrl,
+  authBaseUrl,
+  authClientId
+}) => {
+  const authOptions = { baseUrl, authBaseUrl };
+  const tokenUrl = zapierSdkCliLogin.getAuthTokenUrl(authOptions);
+  const authorizeUrl = zapierSdkCliLogin.getAuthAuthorizeUrl(authOptions);
   zapierSdkCliLogin.logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -187,9 +195,9 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge__default.default();
-  const authUrl = `${zapierSdkCliLogin.ZAPIER_BASE}/oauth/authorize/?${new URLSearchParams({
+  const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: zapierSdkCliLogin.LOGIN_CLIENT_ID,
+    client_id: authClientId || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
     redirect_uri: redirectUri,
     scope: "internal offline_access",
     state: generateRandomString(),
@@ -232,12 +240,12 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   }
   log_default.info("Exchanging authorization code for tokens...");
   const { data } = await client_default.post(
-    `${zapierSdkCliLogin.ZAPIER_BASE}/oauth/token/`,
+    tokenUrl,
     {
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: zapierSdkCliLogin.LOGIN_CLIENT_ID,
+      client_id: authClientId || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
       code_verifier: codeVerifier
     },
     {
@@ -258,7 +266,7 @@ var LoginSchema = zod.z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.10"};
+  version: "0.13.12"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -316,23 +324,35 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-var loginWithSdk = zapierSdk.createFunction(async function loginWithSdk2(options) {
-  const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-  if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-    throw new Error("Timeout must be a positive number");
+var loginWithSdk = zapierSdk.createFunction(
+  async (options) => {
+    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+    if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+      throw new Error("Timeout must be a positive number");
+    }
+    await login_default({
+      timeoutMs: timeoutSeconds * 1e3,
+      baseUrl: options.baseUrl,
+      authBaseUrl: options.authBaseUrl,
+      authClientId: options.authClientId
+    });
+    const user = await zapierSdkCliLogin.getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
+    setTimeout(() => process.exit(0), 100);
   }
-  await login_default(timeoutSeconds * 1e3);
-  const user = await zapierSdkCliLogin.getLoggedInUser();
-  console.log(`\u2705 Successfully logged in as ${user.email}`);
-  setTimeout(() => process.exit(0), 100);
-}, LoginSchema);
+);
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
     try {
-      await loginWithSdk(options);
+      await loginWithSdk({
+        ...options,
+        baseUrl: context.options?.baseUrl,
+        authBaseUrl: context.options?.authBaseUrl,
+        authClientId: context.options?.authClientId
+      });
       success = true;
     } catch (error) {
       success = false;
@@ -697,44 +717,56 @@ var AstTypeGenerator = class {
     });
     const actions = actionsResult.data;
     const actionsWithFields = [];
-    if (authenticationId) {
-      for (const action of actions) {
-        try {
-          const fieldsResult = await sdk.listInputFields({
-            appKey: app.implementation_id,
-            actionKey: action.key,
-            actionType: action.action_type,
-            authenticationId
-          });
-          const fields = fieldsResult.data;
-          actionsWithFields.push({
-            ...action,
-            inputFields: fields,
-            name: action.title || action.key
-          });
-        } catch {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key
-          });
-        }
+    const inputFieldsTasks = actions.map(
+      (action) => () => sdk.listInputFields({
+        appKey: app.implementation_id,
+        actionKey: action.key,
+        actionType: action.action_type,
+        authenticationId
+      })
+    );
+    const results = await zapierSdk.batch(inputFieldsTasks, {
+      concurrency: 50,
+      // Limit to 50 concurrent requests
+      retry: true,
+      // Automatically retry transient failures
+      timeoutMs: 18e4,
+      // 3 minute overall timeout
+      taskTimeoutMs: 3e4
+      // 30 seconds per-task timeout (API calls shouldn't take longer)
+    });
+    const failedActions = [];
+    results.forEach((result, i) => {
+      const action = actions[i];
+      if (result.status === "fulfilled") {
+        actionsWithFields.push({
+          ...action,
+          inputFields: result.value.data,
+          name: action.title || action.key
+        });
+      } else {
+        failedActions.push(
+          `${action.key} (${action.action_type}): ${result.reason?.message || "Unknown error"}`
+        );
+        actionsWithFields.push({
+          ...action,
+          inputFields: [],
+          name: action.title || action.key,
+          app_key: action.app_key || app.implementation_id,
+          action_type: action.action_type || "write",
+          title: action.title || action.key,
+          type: "action",
+          description: action.description || ""
+        });
       }
-    } else {
-      actions.forEach(
-        (action) => {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key,
-            app_key: action.app_key || app.implementation_id,
-            action_type: action.action_type || "write",
-            title: action.title || action.key,
-            type: "action",
-            description: action.description || ""
-          });
-        }
+    });
+    if (failedActions.length > 0) {
+      console.warn(
+        `Failed to fetch input fields for ${failedActions.length} action(s):`
       );
+      failedActions.forEach((failedAction) => {
+        console.warn(`  - ${failedAction}`);
+      });
     }
     const sourceFile = this.createSourceFile(app, actionsWithFields);
     return this.printer.printFile(sourceFile);

package/dist/index.mjs

@@ -1,9 +1,9 @@
-import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, getOsInfo, getPlatformVersions, getCiPlatform, isCi, createZapierSdkWithoutRegistry, registryPlugin, getReleaseId, getCurrentTimestamp, generateEventId, ZapierValidationError, ZapierUnknownError, toSnakeCase } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, getOsInfo, getPlatformVersions, getCiPlatform, isCi, createZapierSdkWithoutRegistry, registryPlugin, getReleaseId, getCurrentTimestamp, generateEventId, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase } from '@zapier/zapier-sdk';
 import open from 'open';
 import crypto from 'crypto';
 import express from 'express';
 import pkceChallenge from 'pkce-challenge';
-import { getLoggedInUser, logout, ZAPIER_BASE, LOGIN_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
+import { getLoggedInUser, logout, getAuthTokenUrl, getAuthAuthorizeUrl, ZAPIER_AUTH_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
 import ora from 'ora';
 import chalk from 'chalk';
 import { z } from 'zod';
@@ -130,7 +130,15 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
-var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
+var login = async ({
+  timeoutMs = LOGIN_TIMEOUT_MS,
+  baseUrl,
+  authBaseUrl,
+  authClientId
+}) => {
+  const authOptions = { baseUrl, authBaseUrl };
+  const tokenUrl = getAuthTokenUrl(authOptions);
+  const authorizeUrl = getAuthAuthorizeUrl(authOptions);
   logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -156,9 +164,9 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge();
-  const authUrl = `${ZAPIER_BASE}/oauth/authorize/?${new URLSearchParams({
+  const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: LOGIN_CLIENT_ID,
+    client_id: authClientId || ZAPIER_AUTH_CLIENT_ID,
     redirect_uri: redirectUri,
     scope: "internal offline_access",
     state: generateRandomString(),
@@ -201,12 +209,12 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   }
   log_default.info("Exchanging authorization code for tokens...");
   const { data } = await client_default.post(
-    `${ZAPIER_BASE}/oauth/token/`,
+    tokenUrl,
     {
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: LOGIN_CLIENT_ID,
+      client_id: authClientId || ZAPIER_AUTH_CLIENT_ID,
       code_verifier: codeVerifier
     },
     {
@@ -227,7 +235,7 @@ var LoginSchema = z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.10"};
+  version: "0.13.12"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -285,23 +293,35 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-var loginWithSdk = createFunction(async function loginWithSdk2(options) {
-  const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-  if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-    throw new Error("Timeout must be a positive number");
+var loginWithSdk = createFunction(
+  async (options) => {
+    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+    if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+      throw new Error("Timeout must be a positive number");
+    }
+    await login_default({
+      timeoutMs: timeoutSeconds * 1e3,
+      baseUrl: options.baseUrl,
+      authBaseUrl: options.authBaseUrl,
+      authClientId: options.authClientId
+    });
+    const user = await getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
+    setTimeout(() => process.exit(0), 100);
   }
-  await login_default(timeoutSeconds * 1e3);
-  const user = await getLoggedInUser();
-  console.log(`\u2705 Successfully logged in as ${user.email}`);
-  setTimeout(() => process.exit(0), 100);
-}, LoginSchema);
+);
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
     try {
-      await loginWithSdk(options);
+      await loginWithSdk({
+        ...options,
+        baseUrl: context.options?.baseUrl,
+        authBaseUrl: context.options?.authBaseUrl,
+        authClientId: context.options?.authClientId
+      });
       success = true;
     } catch (error) {
       success = false;
@@ -666,44 +686,56 @@ var AstTypeGenerator = class {
     });
     const actions = actionsResult.data;
     const actionsWithFields = [];
-    if (authenticationId) {
-      for (const action of actions) {
-        try {
-          const fieldsResult = await sdk.listInputFields({
-            appKey: app.implementation_id,
-            actionKey: action.key,
-            actionType: action.action_type,
-            authenticationId
-          });
-          const fields = fieldsResult.data;
-          actionsWithFields.push({
-            ...action,
-            inputFields: fields,
-            name: action.title || action.key
-          });
-        } catch {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key
-          });
-        }
+    const inputFieldsTasks = actions.map(
+      (action) => () => sdk.listInputFields({
+        appKey: app.implementation_id,
+        actionKey: action.key,
+        actionType: action.action_type,
+        authenticationId
+      })
+    );
+    const results = await batch(inputFieldsTasks, {
+      concurrency: 50,
+      // Limit to 50 concurrent requests
+      retry: true,
+      // Automatically retry transient failures
+      timeoutMs: 18e4,
+      // 3 minute overall timeout
+      taskTimeoutMs: 3e4
+      // 30 seconds per-task timeout (API calls shouldn't take longer)
+    });
+    const failedActions = [];
+    results.forEach((result, i) => {
+      const action = actions[i];
+      if (result.status === "fulfilled") {
+        actionsWithFields.push({
+          ...action,
+          inputFields: result.value.data,
+          name: action.title || action.key
+        });
+      } else {
+        failedActions.push(
+          `${action.key} (${action.action_type}): ${result.reason?.message || "Unknown error"}`
+        );
+        actionsWithFields.push({
+          ...action,
+          inputFields: [],
+          name: action.title || action.key,
+          app_key: action.app_key || app.implementation_id,
+          action_type: action.action_type || "write",
+          title: action.title || action.key,
+          type: "action",
+          description: action.description || ""
+        });
       }
-    } else {
-      actions.forEach(
-        (action) => {
-          actionsWithFields.push({
-            ...action,
-            inputFields: [],
-            name: action.title || action.key,
-            app_key: action.app_key || app.implementation_id,
-            action_type: action.action_type || "write",
-            title: action.title || action.key,
-            type: "action",
-            description: action.description || ""
-          });
-        }
+    });
+    if (failedActions.length > 0) {
+      console.warn(
+        `Failed to fetch input fields for ${failedActions.length} action(s):`
       );
+      failedActions.forEach((failedAction) => {
+        console.warn(`  - ${failedAction}`);
+      });
     }
     const sourceFile = this.createSourceFile(app, actionsWithFields);
     return this.printer.printFile(sourceFile);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zapier/zapier-sdk-cli",
-    "version": "0.13.10",
+    "version": "0.13.12",
     "description": "Command line interface for Zapier SDK",
     "main": "dist/index.cjs",
     "module": "dist/index.mjs",

package/dist/src/cli.js

@@ -8,12 +8,32 @@ program
     .name("zapier-sdk")
     .description("CLI for Zapier SDK")
     .version(packageJson.version, "-v, --version", "display version number")
-    .option("--debug", "Enable debug logging");
-// Check for debug flag early
+    .option("--debug", "Enable debug logging")
+    .option("--base-url <url>", "Base URL for Zapier API endpoints")
+    .option("--auth-base-url <url>", "Base URL for Zapier authentication endpoints")
+    .option("--auth-client-id <id>", "OAuth client ID for Zapier authentication")
+    .option("--tracking-base-url <url>", "Base URL for Zapier tracking endpoints");
+// Check for debug flag early (support both flag and env var)
 const isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
-// Create CLI SDK instance with all plugins
+// Extract URL options from process.argv for early SDK creation
+// We need to create the SDK before parsing to generate commands from schemas
+const baseUrlIndex = process.argv.indexOf("--base-url");
+const authBaseUrlIndex = process.argv.indexOf("--auth-base-url");
+const authClientIdIndex = process.argv.indexOf("--auth-client-id");
+const trackingBaseUrlIndex = process.argv.indexOf("--tracking-base-url");
+const baseUrl = baseUrlIndex !== -1 ? process.argv[baseUrlIndex + 1] : undefined;
+const authBaseUrl = authBaseUrlIndex !== -1 ? process.argv[authBaseUrlIndex + 1] : undefined;
+const authClientId = authClientIdIndex !== -1 ? process.argv[authClientIdIndex + 1] : undefined;
+const trackingBaseUrl = trackingBaseUrlIndex !== -1
+    ? process.argv[trackingBaseUrlIndex + 1]
+    : undefined;
+// Create CLI SDK instance with all plugins and URL options
 const sdk = createZapierCliSdk({
     debug: isDebugMode,
+    baseUrl,
+    authBaseUrl,
+    authClientId,
+    trackingBaseUrl,
 });
 // Auth commands now handled by plugins
 // Generate CLI commands from SDK schemas (including CLI plugins)

package/dist/src/generators/ast-generator.js

@@ -1,5 +1,5 @@
 import * as ts from "typescript";
-import { toSnakeCase } from "@zapier/zapier-sdk";
+import { toSnakeCase, batch } from "@zapier/zapier-sdk";
 /**
  * AST-based TypeScript type generator using the TypeScript Compiler API
  */
@@ -24,35 +24,33 @@ export class AstTypeGenerator {
         const actions = actionsResult.data;
         // Fetch input fields for each action
         const actionsWithFields = [];
-        if (authenticationId) {
-            for (const action of actions) {
-                try {
-                    const fieldsResult = await sdk.listInputFields({
-                        appKey: app.implementation_id,
-                        actionKey: action.key,
-                        actionType: action.action_type,
-                        authenticationId: authenticationId,
-                    });
-                    const fields = fieldsResult.data;
-                    actionsWithFields.push({
-                        ...action,
-                        inputFields: fields,
-                        name: action.title || action.key,
-                    });
-                }
-                catch {
-                    // If we can't get fields for an action, include it without fields
-                    actionsWithFields.push({
-                        ...action,
-                        inputFields: [],
-                        name: action.title || action.key,
-                    });
-                }
+        // Fetch all input fields with concurrency limiting for better reliability
+        // Using batch() instead of Promise.allSettled() prevents overwhelming the API
+        // and triggering rate limits when apps have many actions
+        const inputFieldsTasks = actions.map((action) => () => sdk.listInputFields({
+            appKey: app.implementation_id,
+            actionKey: action.key,
+            actionType: action.action_type,
+            authenticationId: authenticationId,
+        }));
+        const results = await batch(inputFieldsTasks, {
+            concurrency: 50, // Limit to 50 concurrent requests
+            retry: true, // Automatically retry transient failures
+            timeoutMs: 180000, // 3 minute overall timeout
+            taskTimeoutMs: 30000, // 30 seconds per-task timeout (API calls shouldn't take longer)
+        });
+        const failedActions = [];
+        results.forEach((result, i) => {
+            const action = actions[i];
+            if (result.status === "fulfilled") {
+                actionsWithFields.push({
+                    ...action,
+                    inputFields: result.value.data,
+                    name: action.title || action.key,
+                });
             }
-        }
-        else {
-            // Convert actions to have empty input fields (will generate generic types)
-            actions.forEach((action) => {
+            else {
+                failedActions.push(`${action.key} (${action.action_type}): ${result.reason?.message || "Unknown error"}`);
                 actionsWithFields.push({
                     ...action,
                     inputFields: [],
@@ -63,6 +61,12 @@ export class AstTypeGenerator {
                     type: "action",
                     description: action.description || "",
                 });
+            }
+        });
+        if (failedActions.length > 0) {
+            console.warn(`Failed to fetch input fields for ${failedActions.length} action(s):`);
+            failedActions.forEach((failedAction) => {
+                console.warn(`  - ${failedAction}`);
             });
         }
         // Generate TypeScript AST nodes

package/dist/src/plugins/login/index.js

@@ -5,17 +5,24 @@ import { LoginSchema } from "./schemas";
 import { buildCliCommandExecutedEvent } from "../../telemetry/builders";
 import cliPackageJson from "../../../package.json";
 const CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-const loginWithSdk = createFunction(async function loginWithSdk(options) {
-    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+const loginWithSdk = createFunction(async (options) => {
+    const timeoutSeconds = options.timeout
+        ? parseInt(options.timeout, 10)
+        : 300;
     if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
         throw new Error("Timeout must be a positive number");
     }
-    await login(timeoutSeconds * 1000); // Convert to milliseconds
+    await login({
+        timeoutMs: timeoutSeconds * 1000,
+        baseUrl: options.baseUrl,
+        authBaseUrl: options.authBaseUrl,
+        authClientId: options.authClientId,
+    });
     const user = await getLoggedInUser();
     console.log(`✅ Successfully logged in as ${user.email}`);
     // Force immediate exit to prevent hanging (especially in development with tsx)
     setTimeout(() => process.exit(0), 100);
-}, LoginSchema);
+});
 export const loginPlugin = ({ context }) => {
     // Wrap the login function to emit telemetry events
     const loginWithTelemetry = async (options) => {
@@ -23,7 +30,12 @@ export const loginPlugin = ({ context }) => {
         let success = false;
         let errorMessage = null;
         try {
-            await loginWithSdk(options);
+            await loginWithSdk({
+                ...options,
+                baseUrl: context.options?.baseUrl,
+                authBaseUrl: context.options?.authBaseUrl,
+                authClientId: context.options?.authClientId,
+            });
             success = true;
         }
         catch (error) {

package/dist/src/utils/auth/login.d.ts

@@ -1,2 +1,8 @@
-declare const login: (timeoutMs?: number) => Promise<string>;
+interface LoginOptions {
+    timeoutMs?: number;
+    baseUrl?: string;
+    authBaseUrl?: string;
+    authClientId?: string;
+}
+declare const login: ({ timeoutMs, baseUrl, authBaseUrl, authClientId, }: LoginOptions) => Promise<string>;
 export default login;

package/dist/src/utils/auth/login.js

@@ -2,12 +2,12 @@ import open from "open";
 import crypto from "node:crypto";
 import express from "express";
 import pkceChallenge from "pkce-challenge";
-import { AUTH_MODE_HEADER, LOGIN_CLIENT_ID, LOGIN_PORTS, LOGIN_TIMEOUT_MS, ZAPIER_BASE, } from "../constants";
+import { AUTH_MODE_HEADER, ZAPIER_AUTH_CLIENT_ID, LOGIN_PORTS, LOGIN_TIMEOUT_MS, } from "../constants";
 import { spinPromise } from "../spinner";
 import log from "../log";
 import api from "../api/client";
 import getCallablePromise from "../getCallablePromise";
-import { updateLogin, logout } from "@zapier/zapier-sdk-cli-login";
+import { updateLogin, logout, getAuthTokenUrl, getAuthAuthorizeUrl, } from "@zapier/zapier-sdk-cli-login";
 const findAvailablePort = () => {
     return new Promise((resolve, reject) => {
         let portIndex = 0;
@@ -45,7 +45,10 @@ const generateRandomString = () => {
     crypto.getRandomValues(array);
     return Array.from(array, (dec) => ("0" + dec.toString(16)).substring(-2)).join("");
 };
-const login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
+const login = async ({ timeoutMs = LOGIN_TIMEOUT_MS, baseUrl, authBaseUrl, authClientId, }) => {
+    const authOptions = { baseUrl, authBaseUrl };
+    const tokenUrl = getAuthTokenUrl(authOptions);
+    const authorizeUrl = getAuthAuthorizeUrl(authOptions);
     // Force logout
     logout();
     // Find an available port
@@ -76,9 +79,9 @@ const login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);
     const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge();
-    const authUrl = `${ZAPIER_BASE}/oauth/authorize/?${new URLSearchParams({
+    const authUrl = `${authorizeUrl}?${new URLSearchParams({
         response_type: "code",
-        client_id: LOGIN_CLIENT_ID,
+        client_id: authClientId || ZAPIER_AUTH_CLIENT_ID,
         redirect_uri: redirectUri,
         scope: "internal offline_access",
         state: generateRandomString(),
@@ -115,11 +118,11 @@ const login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
         });
     }
     log.info("Exchanging authorization code for tokens...");
-    const { data } = await api.post(`${ZAPIER_BASE}/oauth/token/`, {
+    const { data } = await api.post(tokenUrl, {
         grant_type: "authorization_code",
         code: await promisedCode,
         redirect_uri: redirectUri,
-        client_id: LOGIN_CLIENT_ID,
+        client_id: authClientId || ZAPIER_AUTH_CLIENT_ID,
         code_verifier: codeVerifier,
     }, {
         headers: {

package/dist/src/utils/constants.d.ts

@@ -1,3 +1,3 @@
-export { ZAPIER_BASE, LOGIN_CLIENT_ID, AUTH_MODE_HEADER, } from "@zapier/zapier-sdk-cli-login";
+export { ZAPIER_AUTH_CLIENT_ID, AUTH_MODE_HEADER, } from "@zapier/zapier-sdk-cli-login";
 export declare const LOGIN_PORTS: number[];
 export declare const LOGIN_TIMEOUT_MS = 300000;

package/dist/src/utils/constants.js

@@ -1,5 +1,5 @@
 // Import shared OAuth constants from login package
-export { ZAPIER_BASE, LOGIN_CLIENT_ID, AUTH_MODE_HEADER, } from "@zapier/zapier-sdk-cli-login";
+export { ZAPIER_AUTH_CLIENT_ID, AUTH_MODE_HEADER, } from "@zapier/zapier-sdk-cli-login";
 // CLI-specific constants
 export const LOGIN_PORTS = [49505, 50575, 52804, 55981, 61010, 63851];
 export const LOGIN_TIMEOUT_MS = 300000; // 5 minutes