@zapier/zapier-sdk-cli 0.13.9 → 0.13.11

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