@zapier/zapier-sdk-cli 0.17.4 → 0.18.2

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @zapier/zapier-sdk-cli
 
+## 0.18.2
+
+### Patch Changes
+
+- Updated dependencies [00ef417]
+  - @zapier/zapier-sdk@1.0.2
+  - @zapier/zapier-sdk-mcp@0.4.13
+
+## 0.18.1
+
+### Patch Changes
+
+- Updated dependencies [aba842a]
+  - @zapier/zapier-sdk@1.0.1
+  - @zapier/zapier-sdk-mcp@0.4.12
+
+## 0.18.0
+
+### Minor Changes
+
+- 97ff6c0: Add support for client credentials.
+
+### Patch Changes
+
+- Updated dependencies [97ff6c0]
+  - @zapier/zapier-sdk-cli-login@0.4.0
+  - @zapier/zapier-sdk@1.0.0
+  - @zapier/zapier-sdk-mcp@0.4.11
+
 ## 0.17.4
 
 ### Patch Changes

package/dist/cli.cjs

@@ -1536,15 +1536,22 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
+function ensureOfflineAccess(scope) {
+  if (scope.includes("offline_access")) {
+    return scope;
+  }
+  return `${scope} offline_access`;
+}
 var login = async ({
   timeoutMs = LOGIN_TIMEOUT_MS,
-  baseUrl: baseUrl2,
-  authBaseUrl: authBaseUrl2,
-  authClientId: authClientId2
+  credentials: credentials2
 }) => {
-  const authOptions = { baseUrl: baseUrl2, authBaseUrl: authBaseUrl2 };
-  const tokenUrl = zapierSdkCliLogin.getAuthTokenUrl(authOptions);
-  const authorizeUrl = zapierSdkCliLogin.getAuthAuthorizeUrl(authOptions);
+  const { clientId, tokenUrl, authorizeUrl } = zapierSdkCliLogin.getPkceLoginConfig({
+    credentials: credentials2
+  });
+  const scope = ensureOfflineAccess(
+    credentials2?.scope || "internal credentials"
+  );
   zapierSdkCliLogin.logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -1576,9 +1583,9 @@ var login = async ({
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge__default.default();
   const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: authClientId2 || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
+    client_id: clientId,
     redirect_uri: redirectUri,
-    scope: "internal offline_access",
+    scope,
     state: generateRandomString(),
     code_challenge: codeChallenge,
     code_challenge_method: "S256"
@@ -1628,7 +1635,7 @@ var login = async ({
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: authClientId2 || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
+      client_id: clientId,
       code_verifier: codeVerifier
     },
     {
@@ -1649,7 +1656,7 @@ var LoginSchema = zod.z.object({
 
 // package.json
 var package_default = {
-  version: "0.17.4"};
+  version: "0.18.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1706,22 +1713,17 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-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}`);
+function toPkceCredentials(credentials2) {
+  if (credentials2 && zapierSdk.isCredentialsObject(credentials2) && !("clientSecret" in credentials2)) {
+    return {
+      type: "pkce",
+      clientId: credentials2.clientId,
+      baseUrl: credentials2.baseUrl,
+      scope: credentials2.scope
+    };
   }
-);
+  return void 0;
+}
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
@@ -1730,17 +1732,21 @@ var loginPlugin = ({ context }) => {
     let accountId = null;
     let customUserId = null;
     try {
-      await loginWithSdk({
-        ...options,
-        baseUrl: context.options?.baseUrl,
-        authBaseUrl: context.options?.authBaseUrl,
-        authClientId: context.options?.authClientId
+      const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+      if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+        throw new Error("Timeout must be a positive number");
+      }
+      const resolvedCredentials = await context.resolveCredentials();
+      const pkceCredentials = toPkceCredentials(resolvedCredentials);
+      await login_default({
+        timeoutMs: timeoutSeconds * 1e3,
+        credentials: pkceCredentials
       });
+      const user = await zapierSdkCliLogin.getLoggedInUser();
+      accountId = user.accountId;
+      customUserId = user.customUserId;
+      console.log(`\u2705 Successfully logged in as ${user.email}`);
       success = true;
-      try {
-        ({ accountId, customUserId } = await zapierSdkCliLogin.getLoggedInUser());
-      } catch {
-      }
     } catch (error) {
       success = false;
       errorMessage = error instanceof Error ? error.message : "Login failed";
@@ -2931,7 +2937,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.17.4"};
+  version: "0.18.2"};
 function detectPackageManager(cwd = process.cwd()) {
   const ua = process.env.npm_config_user_agent;
   if (ua) {
@@ -3138,27 +3144,54 @@ async function checkAndNotifyUpdates({
 
 // src/cli.ts
 var program = new commander.Command();
-program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").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(
+program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging").option("--base-url <url>", "Base URL for Zapier API endpoints").option("--credentials <token>", "Authentication token").option("--credentials-client-id <id>", "OAuth client ID for authentication").option(
+  "--credentials-client-secret <secret>",
+  "OAuth client secret for authentication"
+).option(
+  "--credentials-base-url <url>",
+  "Base URL for authentication endpoints"
+).option(
   "--tracking-base-url <url>",
   "Base URL for Zapier tracking endpoints"
 );
 var isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
-var baseUrlIndex = process.argv.indexOf("--base-url");
-var authBaseUrlIndex = process.argv.indexOf("--auth-base-url");
-var authClientIdIndex = process.argv.indexOf("--auth-client-id");
-var trackingBaseUrlIndex = process.argv.indexOf("--tracking-base-url");
-var baseUrl = baseUrlIndex !== -1 ? process.argv[baseUrlIndex + 1] : void 0;
-var authBaseUrl = authBaseUrlIndex !== -1 ? process.argv[authBaseUrlIndex + 1] : void 0;
-var authClientId = authClientIdIndex !== -1 ? process.argv[authClientIdIndex + 1] : void 0;
-var trackingBaseUrl = trackingBaseUrlIndex !== -1 ? process.argv[trackingBaseUrlIndex + 1] : void 0;
+function getFlagValue(flagName) {
+  const index = process.argv.indexOf(flagName);
+  return index !== -1 ? process.argv[index + 1] : void 0;
+}
+var baseUrl = getFlagValue("--base-url");
+var credentialsToken = getFlagValue("--credentials");
+var credentialsClientId = getFlagValue("--credentials-client-id");
+var credentialsClientSecret = getFlagValue("--credentials-client-secret");
+var credentialsBaseUrl = getFlagValue("--credentials-base-url");
+var trackingBaseUrl = getFlagValue("--tracking-base-url");
+function buildCredentialsFromFlags() {
+  if (credentialsToken) {
+    return credentialsToken;
+  }
+  if (credentialsClientId) {
+    if (credentialsClientSecret) {
+      return {
+        type: "client_credentials",
+        clientId: credentialsClientId,
+        clientSecret: credentialsClientSecret,
+        baseUrl: credentialsBaseUrl
+      };
+    } else {
+      return {
+        type: "pkce",
+        clientId: credentialsClientId,
+        baseUrl: credentialsBaseUrl
+      };
+    }
+  }
+  return void 0;
+}
+var credentials = buildCredentialsFromFlags();
 var sdk = createZapierCliSdk({
   debug: isDebugMode,
+  credentials,
   baseUrl,
-  authBaseUrl,
-  authClientId,
   trackingBaseUrl
 });
 generateCliCommands(program, sdk);

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command, CommanderError } from 'commander';
 import { z } from 'zod';
-import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, createZapierSdkWithoutRegistry, registryPlugin, ZapierError, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, formatErrorMessage, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, createZapierSdkWithoutRegistry, registryPlugin, ZapierError, ZapierValidationError, ZapierUnknownError, batch, toSnakeCase, formatErrorMessage, isCredentialsObject, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import inquirer from 'inquirer';
 import chalk3 from 'chalk';
 import util from 'util';
@@ -9,7 +9,7 @@ import open from 'open';
 import crypto from 'crypto';
 import express from 'express';
 import pkceChallenge from 'pkce-challenge';
-import { getLoggedInUser, logout, getAuthTokenUrl, getAuthAuthorizeUrl, ZAPIER_AUTH_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
+import { logout, getConfigPath, getLoggedInUser, getPkceLoginConfig, AUTH_MODE_HEADER, updateLogin } from '@zapier/zapier-sdk-cli-login';
 import ora from 'ora';
 import { startMcpServer } from '@zapier/zapier-sdk-mcp';
 import { buildSync } from 'esbuild';
@@ -1500,15 +1500,22 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
+function ensureOfflineAccess(scope) {
+  if (scope.includes("offline_access")) {
+    return scope;
+  }
+  return `${scope} offline_access`;
+}
 var login = async ({
   timeoutMs = LOGIN_TIMEOUT_MS,
-  baseUrl: baseUrl2,
-  authBaseUrl: authBaseUrl2,
-  authClientId: authClientId2
+  credentials: credentials2
 }) => {
-  const authOptions = { baseUrl: baseUrl2, authBaseUrl: authBaseUrl2 };
-  const tokenUrl = getAuthTokenUrl(authOptions);
-  const authorizeUrl = getAuthAuthorizeUrl(authOptions);
+  const { clientId, tokenUrl, authorizeUrl } = getPkceLoginConfig({
+    credentials: credentials2
+  });
+  const scope = ensureOfflineAccess(
+    credentials2?.scope || "internal credentials"
+  );
   logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -1540,9 +1547,9 @@ var login = async ({
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge();
   const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: authClientId2 || ZAPIER_AUTH_CLIENT_ID,
+    client_id: clientId,
     redirect_uri: redirectUri,
-    scope: "internal offline_access",
+    scope,
     state: generateRandomString(),
     code_challenge: codeChallenge,
     code_challenge_method: "S256"
@@ -1592,7 +1599,7 @@ var login = async ({
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: authClientId2 || ZAPIER_AUTH_CLIENT_ID,
+      client_id: clientId,
       code_verifier: codeVerifier
     },
     {
@@ -1613,7 +1620,7 @@ var LoginSchema = z.object({
 
 // package.json
 var package_default = {
-  version: "0.17.4"};
+  version: "0.18.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1670,22 +1677,17 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-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}`);
+function toPkceCredentials(credentials2) {
+  if (credentials2 && isCredentialsObject(credentials2) && !("clientSecret" in credentials2)) {
+    return {
+      type: "pkce",
+      clientId: credentials2.clientId,
+      baseUrl: credentials2.baseUrl,
+      scope: credentials2.scope
+    };
   }
-);
+  return void 0;
+}
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
@@ -1694,17 +1696,21 @@ var loginPlugin = ({ context }) => {
     let accountId = null;
     let customUserId = null;
     try {
-      await loginWithSdk({
-        ...options,
-        baseUrl: context.options?.baseUrl,
-        authBaseUrl: context.options?.authBaseUrl,
-        authClientId: context.options?.authClientId
+      const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+      if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+        throw new Error("Timeout must be a positive number");
+      }
+      const resolvedCredentials = await context.resolveCredentials();
+      const pkceCredentials = toPkceCredentials(resolvedCredentials);
+      await login_default({
+        timeoutMs: timeoutSeconds * 1e3,
+        credentials: pkceCredentials
       });
+      const user = await getLoggedInUser();
+      accountId = user.accountId;
+      customUserId = user.customUserId;
+      console.log(`\u2705 Successfully logged in as ${user.email}`);
       success = true;
-      try {
-        ({ accountId, customUserId } = await getLoggedInUser());
-      } catch {
-      }
     } catch (error) {
       success = false;
       errorMessage = error instanceof Error ? error.message : "Login failed";
@@ -2895,7 +2901,7 @@ function createZapierCliSdk(options = {}) {
 // package.json with { type: 'json' }
 var package_default2 = {
   name: "@zapier/zapier-sdk-cli",
-  version: "0.17.4"};
+  version: "0.18.2"};
 function detectPackageManager(cwd = process.cwd()) {
   const ua = process.env.npm_config_user_agent;
   if (ua) {
@@ -3102,27 +3108,54 @@ async function checkAndNotifyUpdates({
 
 // src/cli.ts
 var program = new Command();
-program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").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(
+program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging").option("--base-url <url>", "Base URL for Zapier API endpoints").option("--credentials <token>", "Authentication token").option("--credentials-client-id <id>", "OAuth client ID for authentication").option(
+  "--credentials-client-secret <secret>",
+  "OAuth client secret for authentication"
+).option(
+  "--credentials-base-url <url>",
+  "Base URL for authentication endpoints"
+).option(
   "--tracking-base-url <url>",
   "Base URL for Zapier tracking endpoints"
 );
 var isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
-var baseUrlIndex = process.argv.indexOf("--base-url");
-var authBaseUrlIndex = process.argv.indexOf("--auth-base-url");
-var authClientIdIndex = process.argv.indexOf("--auth-client-id");
-var trackingBaseUrlIndex = process.argv.indexOf("--tracking-base-url");
-var baseUrl = baseUrlIndex !== -1 ? process.argv[baseUrlIndex + 1] : void 0;
-var authBaseUrl = authBaseUrlIndex !== -1 ? process.argv[authBaseUrlIndex + 1] : void 0;
-var authClientId = authClientIdIndex !== -1 ? process.argv[authClientIdIndex + 1] : void 0;
-var trackingBaseUrl = trackingBaseUrlIndex !== -1 ? process.argv[trackingBaseUrlIndex + 1] : void 0;
+function getFlagValue(flagName) {
+  const index = process.argv.indexOf(flagName);
+  return index !== -1 ? process.argv[index + 1] : void 0;
+}
+var baseUrl = getFlagValue("--base-url");
+var credentialsToken = getFlagValue("--credentials");
+var credentialsClientId = getFlagValue("--credentials-client-id");
+var credentialsClientSecret = getFlagValue("--credentials-client-secret");
+var credentialsBaseUrl = getFlagValue("--credentials-base-url");
+var trackingBaseUrl = getFlagValue("--tracking-base-url");
+function buildCredentialsFromFlags() {
+  if (credentialsToken) {
+    return credentialsToken;
+  }
+  if (credentialsClientId) {
+    if (credentialsClientSecret) {
+      return {
+        type: "client_credentials",
+        clientId: credentialsClientId,
+        clientSecret: credentialsClientSecret,
+        baseUrl: credentialsBaseUrl
+      };
+    } else {
+      return {
+        type: "pkce",
+        clientId: credentialsClientId,
+        baseUrl: credentialsBaseUrl
+      };
+    }
+  }
+  return void 0;
+}
+var credentials = buildCredentialsFromFlags();
 var sdk = createZapierCliSdk({
   debug: isDebugMode,
+  credentials,
   baseUrl,
-  authBaseUrl,
-  authClientId,
   trackingBaseUrl
 });
 generateCliCommands(program, sdk);

package/dist/index.cjs

@@ -182,15 +182,22 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
+function ensureOfflineAccess(scope) {
+  if (scope.includes("offline_access")) {
+    return scope;
+  }
+  return `${scope} offline_access`;
+}
 var login = async ({
   timeoutMs = LOGIN_TIMEOUT_MS,
-  baseUrl,
-  authBaseUrl,
-  authClientId
+  credentials
 }) => {
-  const authOptions = { baseUrl, authBaseUrl };
-  const tokenUrl = zapierSdkCliLogin.getAuthTokenUrl(authOptions);
-  const authorizeUrl = zapierSdkCliLogin.getAuthAuthorizeUrl(authOptions);
+  const { clientId, tokenUrl, authorizeUrl } = zapierSdkCliLogin.getPkceLoginConfig({
+    credentials
+  });
+  const scope = ensureOfflineAccess(
+    credentials?.scope || "internal credentials"
+  );
   zapierSdkCliLogin.logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -222,9 +229,9 @@ var login = async ({
   const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge__default.default();
   const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: authClientId || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
+    client_id: clientId,
     redirect_uri: redirectUri,
-    scope: "internal offline_access",
+    scope,
     state: generateRandomString(),
     code_challenge: codeChallenge,
     code_challenge_method: "S256"
@@ -274,7 +281,7 @@ var login = async ({
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: authClientId || zapierSdkCliLogin.ZAPIER_AUTH_CLIENT_ID,
+      client_id: clientId,
       code_verifier: codeVerifier
     },
     {
@@ -295,7 +302,7 @@ var LoginSchema = zod.z.object({
 
 // package.json
 var package_default = {
-  version: "0.17.4"};
+  version: "0.18.2"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -352,22 +359,17 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-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}`);
+function toPkceCredentials(credentials) {
+  if (credentials && zapierSdk.isCredentialsObject(credentials) && !("clientSecret" in credentials)) {
+    return {
+      type: "pkce",
+      clientId: credentials.clientId,
+      baseUrl: credentials.baseUrl,
+      scope: credentials.scope
+    };
   }
-);
+  return void 0;
+}
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
@@ -376,17 +378,21 @@ var loginPlugin = ({ context }) => {
     let accountId = null;
     let customUserId = null;
     try {
-      await loginWithSdk({
-        ...options,
-        baseUrl: context.options?.baseUrl,
-        authBaseUrl: context.options?.authBaseUrl,
-        authClientId: context.options?.authClientId
+      const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+      if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+        throw new Error("Timeout must be a positive number");
+      }
+      const resolvedCredentials = await context.resolveCredentials();
+      const pkceCredentials = toPkceCredentials(resolvedCredentials);
+      await login_default({
+        timeoutMs: timeoutSeconds * 1e3,
+        credentials: pkceCredentials
       });
+      const user = await zapierSdkCliLogin.getLoggedInUser();
+      accountId = user.accountId;
+      customUserId = user.customUserId;
+      console.log(`\u2705 Successfully logged in as ${user.email}`);
       success = true;
-      try {
-        ({ accountId, customUserId } = await zapierSdkCliLogin.getLoggedInUser());
-      } catch {
-      }
     } catch (error) {
       success = false;
       errorMessage = error instanceof Error ? error.message : "Login failed";