@zapier/zapier-sdk-cli 0.13.10 → 0.13.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk-cli",
-  "version": "0.13.10",
+  "version": "0.13.11",
   "description": "Command line interface for Zapier SDK",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -43,9 +43,9 @@
     "pkce-challenge": "^5.0.0",
     "typescript": "^5.8.3",
     "zod": "^3.25.67",
-    "@zapier/zapier-sdk": "0.13.7",
-    "@zapier/zapier-sdk-cli-login": "0.3.3",
-    "@zapier/zapier-sdk-mcp": "0.3.20"
+    "@zapier/zapier-sdk-cli-login": "0.3.4",
+    "@zapier/zapier-sdk-mcp": "0.3.21",
+    "@zapier/zapier-sdk": "0.13.8"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",

package/src/cli.test.ts

@@ -11,4 +11,14 @@ describe("CLI", () => {
     expect(result).toContain("Options:");
     expect(result).toContain("Commands:");
   });
+
+  it("should include authClientId option in help", () => {
+    const result = execSync("npx tsx src/cli.ts --help", {
+      encoding: "utf-8",
+      cwd: __dirname + "/..",
+    });
+
+    expect(result).toContain("--auth-client-id <id>");
+    expect(result).toContain("OAuth client ID for Zapier authentication");
+  });
 });

package/src/cli.ts

@@ -11,15 +11,47 @@ program
   .name("zapier-sdk")
   .description("CLI for Zapier SDK")
   .version(packageJson.version, "-v, --version", "display version number")
-  .option("--debug", "Enable debug logging");
+  .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
+// 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

package/src/plugins/login/index.ts

@@ -29,22 +29,36 @@ interface LoginPluginProvides {
 const CLI_COMMAND_EXECUTED_EVENT_SUBJECT =
   "platform.sdk.CliCommandExecutedEvent";
 
-const loginWithSdk = createFunction(async function loginWithSdk(
-  options: LoginOptions,
-): Promise<void> {
-  const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-  if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-    throw new Error("Timeout must be a positive number");
-  }
+// Internal type for loginWithSdk that includes SDK URL options
+interface LoginWithSdkOptions extends LoginOptions {
+  baseUrl?: string;
+  authBaseUrl?: string;
+  authClientId?: string;
+}
+
+const loginWithSdk = createFunction(
+  async (options: LoginWithSdkOptions): Promise<void> => {
+    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
-  const user = await getLoggedInUser();
+    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}`);
+    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);
+    // Force immediate exit to prevent hanging (especially in development with tsx)
+    setTimeout(() => process.exit(0), 100);
+  },
+);
 
 export const loginPlugin: Plugin<
   {},
@@ -58,7 +72,12 @@ export const loginPlugin: Plugin<
     let errorMessage: string | null = 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;

package/src/utils/auth/login.ts

@@ -6,16 +6,20 @@ import type { Socket } from "net";
 
 import {
   AUTH_MODE_HEADER,
-  LOGIN_CLIENT_ID,
+  ZAPIER_AUTH_CLIENT_ID,
   LOGIN_PORTS,
   LOGIN_TIMEOUT_MS,
-  ZAPIER_BASE,
 } 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 = (): Promise<number> => {
   return new Promise((resolve, reject) => {
@@ -62,7 +66,22 @@ const generateRandomString = () => {
   ).join("");
 };
 
-const login = async (timeoutMs: number = LOGIN_TIMEOUT_MS): Promise<string> => {
+interface LoginOptions {
+  timeoutMs?: number;
+  baseUrl?: string;
+  authBaseUrl?: string;
+  authClientId?: string;
+}
+
+const login = async ({
+  timeoutMs = LOGIN_TIMEOUT_MS,
+  baseUrl,
+  authBaseUrl,
+  authClientId,
+}: LoginOptions): Promise<string> => {
+  const authOptions = { baseUrl, authBaseUrl };
+  const tokenUrl = getAuthTokenUrl(authOptions);
+  const authorizeUrl = getAuthAuthorizeUrl(authOptions);
   // Force logout
   logout();
 
@@ -106,9 +125,9 @@ const login = async (timeoutMs: number = LOGIN_TIMEOUT_MS): Promise<string> => {
   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(),
@@ -165,12 +184,12 @@ const login = async (timeoutMs: number = LOGIN_TIMEOUT_MS): Promise<string> => {
     refresh_token: string;
     expires_in: number;
   }>(
-    `${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,
     },
     {

package/src/utils/constants.ts

@@ -1,7 +1,6 @@
 // Import shared OAuth constants from login package
 export {
-  ZAPIER_BASE,
-  LOGIN_CLIENT_ID,
+  ZAPIER_AUTH_CLIENT_ID,
   AUTH_MODE_HEADER,
 } from "@zapier/zapier-sdk-cli-login";