@zapier/zapier-sdk 0.18.4 → 1.0.2

package/dist/index.mjs

@@ -36,6 +36,14 @@ function isPositional(schema) {
 // src/constants.ts
 var ZAPIER_BASE_URL = process.env.ZAPIER_BASE_URL || "https://zapier.com";
 var MAX_PAGE_LIMIT = 1e4;
+var ZAPIER_CREDENTIALS = process.env.ZAPIER_CREDENTIALS;
+var ZAPIER_CREDENTIALS_CLIENT_ID = process.env.ZAPIER_CREDENTIALS_CLIENT_ID;
+var ZAPIER_CREDENTIALS_CLIENT_SECRET = process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET;
+var ZAPIER_CREDENTIALS_BASE_URL = process.env.ZAPIER_CREDENTIALS_BASE_URL;
+var ZAPIER_CREDENTIALS_SCOPE = process.env.ZAPIER_CREDENTIALS_SCOPE;
+var ZAPIER_TOKEN = process.env.ZAPIER_TOKEN;
+var ZAPIER_AUTH_BASE_URL = process.env.ZAPIER_AUTH_BASE_URL;
+var ZAPIER_AUTH_CLIENT_ID = process.env.ZAPIER_AUTH_CLIENT_ID;
 
 // src/types/properties.ts
 var AppKeyPropertySchema = withPositional(
@@ -2729,8 +2737,11 @@ async function readManifestFromFile(filePath) {
     const resolvedPath = await resolve(filePath);
     const content = await readFile(resolvedPath);
     return parseManifestContent(content, resolvedPath);
-  } catch {
-    console.warn(`\u26A0\uFE0F Failed to read manifest from ${filePath}`);
+  } catch (error) {
+    const isFileNotFound = error && typeof error === "object" && "code" in error && error.code === "ENOENT" || error instanceof Error && error.message.includes("File not found");
+    if (!isFileNotFound) {
+      console.warn(`\u26A0\uFE0F Failed to read manifest from ${filePath}`);
+    }
     return null;
   }
 }
@@ -3443,36 +3454,29 @@ async function pollUntilComplete(options) {
   }
 }
 
-// src/auth.ts
-function getTokenFromEnv() {
-  return process.env.ZAPIER_TOKEN;
+// src/types/credentials.ts
+function isClientCredentials(credentials) {
+  return typeof credentials === "object" && credentials !== null && "clientId" in credentials && "clientSecret" in credentials;
 }
-async function getTokenFromCliLogin(options = {}) {
-  try {
-    const { getToken } = await import('@zapier/zapier-sdk-cli-login');
-    return await getToken(options);
-  } catch {
-    return void 0;
-  }
+function isPkceCredentials(credentials) {
+  return typeof credentials === "object" && credentials !== null && "clientId" in credentials && !("clientSecret" in credentials);
 }
-async function getTokenFromEnvOrConfig(options = {}) {
-  const envToken = getTokenFromEnv();
-  if (envToken) {
-    return envToken;
-  }
-  return getTokenFromCliLogin(options);
+function isCredentialsObject(credentials) {
+  return typeof credentials === "object" && credentials !== null && "clientId" in credentials;
 }
-async function resolveAuthToken(options = {}) {
-  if (options.token) {
-    return options.token;
-  }
-  if (options.getToken) {
-    const token = await options.getToken();
-    if (token) {
-      return token;
-    }
-  }
-  return getTokenFromEnvOrConfig(options);
+function isCredentialsFunction(credentials) {
+  return typeof credentials === "function";
+}
+
+// src/utils/logging.ts
+var loggedDeprecations = /* @__PURE__ */ new Set();
+function logDeprecation(message) {
+  if (loggedDeprecations.has(message)) return;
+  loggedDeprecations.add(message);
+  console.warn(`[zapier-sdk] Deprecation: ${message}`);
+}
+function resetDeprecationWarnings() {
+  loggedDeprecations.clear();
 }
 
 // src/utils/url-utils.ts
@@ -3521,6 +3525,278 @@ function getTrackingBaseUrl({
   return ZAPIER_BASE_URL;
 }
 
+// src/credentials.ts
+function deriveAuthBaseUrl(sdkBaseUrl) {
+  if (!sdkBaseUrl) return void 0;
+  return getZapierBaseUrl(sdkBaseUrl);
+}
+function normalizeCredentialsObject(obj, sdkBaseUrl) {
+  const resolvedBaseUrl = obj.baseUrl || deriveAuthBaseUrl(sdkBaseUrl);
+  if (obj.type === "client_credentials" || "clientSecret" in obj && obj.clientSecret) {
+    return {
+      type: "client_credentials",
+      clientId: obj.clientId,
+      clientSecret: obj.clientSecret,
+      baseUrl: resolvedBaseUrl,
+      scope: obj.scope
+    };
+  }
+  return {
+    type: "pkce",
+    clientId: obj.clientId,
+    baseUrl: resolvedBaseUrl,
+    scope: obj.scope
+  };
+}
+function resolveCredentialsFromEnv(sdkBaseUrl) {
+  if (ZAPIER_CREDENTIALS) {
+    return ZAPIER_CREDENTIALS;
+  }
+  if (ZAPIER_CREDENTIALS_CLIENT_ID) {
+    const resolvedBaseUrl = ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
+    if (ZAPIER_CREDENTIALS_CLIENT_SECRET) {
+      return {
+        type: "client_credentials",
+        clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
+        clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
+        baseUrl: resolvedBaseUrl,
+        scope: ZAPIER_CREDENTIALS_SCOPE
+      };
+    } else {
+      return {
+        type: "pkce",
+        clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
+        baseUrl: resolvedBaseUrl,
+        scope: ZAPIER_CREDENTIALS_SCOPE
+      };
+    }
+  }
+  if (ZAPIER_TOKEN) {
+    logDeprecation(
+      "ZAPIER_TOKEN is deprecated. Use ZAPIER_CREDENTIALS instead."
+    );
+    return ZAPIER_TOKEN;
+  }
+  if (ZAPIER_AUTH_CLIENT_ID) {
+    logDeprecation(
+      "ZAPIER_AUTH_CLIENT_ID is deprecated. Use ZAPIER_CREDENTIALS_CLIENT_ID instead."
+    );
+    if (ZAPIER_AUTH_BASE_URL) {
+      logDeprecation(
+        "ZAPIER_AUTH_BASE_URL is deprecated. Use ZAPIER_CREDENTIALS_BASE_URL instead."
+      );
+    }
+    const resolvedBaseUrl = ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
+    return {
+      type: "pkce",
+      clientId: ZAPIER_AUTH_CLIENT_ID,
+      baseUrl: resolvedBaseUrl
+    };
+  }
+  return void 0;
+}
+async function resolveCredentials(options = {}) {
+  const { baseUrl } = options;
+  if (options.credentials !== void 0) {
+    if (isCredentialsFunction(options.credentials)) {
+      const resolved = await options.credentials();
+      if (typeof resolved === "function") {
+        throw new Error(
+          "Credentials function returned another function. Credentials functions must return a string or credentials object."
+        );
+      }
+      if (isCredentialsObject(resolved)) {
+        return normalizeCredentialsObject(resolved, baseUrl);
+      }
+      return resolved;
+    }
+    if (isCredentialsObject(options.credentials)) {
+      return normalizeCredentialsObject(options.credentials, baseUrl);
+    }
+    return options.credentials;
+  }
+  if (options.token !== void 0) {
+    logDeprecation(
+      "The `token` option is deprecated. Use `credentials` instead."
+    );
+    return options.token;
+  }
+  const envCredentials = resolveCredentialsFromEnv(baseUrl);
+  if (envCredentials !== void 0) {
+    return envCredentials;
+  }
+  return void 0;
+}
+function getBaseUrlFromCredentials(credentials) {
+  if (credentials && isCredentialsObject(credentials)) {
+    return credentials.baseUrl;
+  }
+  return void 0;
+}
+function getClientIdFromCredentials(credentials) {
+  if (credentials && isCredentialsObject(credentials)) {
+    return credentials.clientId;
+  }
+  return void 0;
+}
+
+// src/auth.ts
+var tokenCache = /* @__PURE__ */ new Map();
+var pendingExchanges = /* @__PURE__ */ new Map();
+function clearTokenCache() {
+  tokenCache.clear();
+  pendingExchanges.clear();
+}
+var TOKEN_EXPIRATION_BUFFER = 5 * 60 * 1e3;
+function getCachedToken(clientId) {
+  const cached = tokenCache.get(clientId);
+  if (!cached) return void 0;
+  if (cached.expiresAt > Date.now() + TOKEN_EXPIRATION_BUFFER) {
+    return cached.accessToken;
+  }
+  tokenCache.delete(clientId);
+  return void 0;
+}
+function cacheToken(clientId, accessToken, expiresIn) {
+  tokenCache.set(clientId, {
+    accessToken,
+    expiresAt: Date.now() + expiresIn * 1e3
+  });
+}
+function invalidateCachedToken(clientId) {
+  tokenCache.delete(clientId);
+}
+function getTokenEndpointUrl(baseUrl) {
+  const base = baseUrl || ZAPIER_BASE_URL;
+  return `${base}/oauth/token/`;
+}
+async function exchangeClientCredentials(options) {
+  const { clientId, clientSecret, baseUrl, scope, onEvent } = options;
+  const fetchFn = options.fetch || globalThis.fetch;
+  const tokenUrl = getTokenEndpointUrl(baseUrl);
+  onEvent?.({
+    type: "auth_exchanging",
+    payload: {
+      message: "Exchanging client credentials for token...",
+      operation: "client_credentials"
+    },
+    timestamp: Date.now()
+  });
+  const response = await fetchFn(tokenUrl, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    body: new URLSearchParams({
+      grant_type: "client_credentials",
+      client_id: clientId,
+      client_secret: clientSecret,
+      scope: scope || "external",
+      audience: "zapier.com"
+    })
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    onEvent?.({
+      type: "auth_error",
+      payload: {
+        message: `Client credentials exchange failed: ${response.status}`,
+        error: errorText,
+        operation: "client_credentials"
+      },
+      timestamp: Date.now()
+    });
+    throw new Error(
+      `Client credentials exchange failed: ${response.status} ${response.statusText}`
+    );
+  }
+  const data = await response.json();
+  if (!data.access_token) {
+    throw new Error("Client credentials response missing access_token");
+  }
+  const expiresIn = data.expires_in || 3600;
+  cacheToken(clientId, data.access_token, expiresIn);
+  onEvent?.({
+    type: "auth_success",
+    payload: {
+      message: "Client credentials exchange successful",
+      operation: "client_credentials"
+    },
+    timestamp: Date.now()
+  });
+  return data.access_token;
+}
+async function getTokenFromCliLogin(options) {
+  try {
+    const cliLogin = await import('@zapier/zapier-sdk-cli-login');
+    return await cliLogin.getToken(options);
+  } catch {
+    return void 0;
+  }
+}
+async function resolveAuthToken(options = {}) {
+  const credentials = await resolveCredentials({
+    credentials: options.credentials,
+    token: options.token
+  });
+  if (credentials !== void 0) {
+    return resolveAuthTokenFromCredentials(credentials, options);
+  }
+  return getTokenFromCliLogin({
+    onEvent: options.onEvent,
+    fetch: options.fetch
+  });
+}
+async function resolveAuthTokenFromCredentials(credentials, options) {
+  if (typeof credentials === "string") {
+    return credentials;
+  }
+  if (isClientCredentials(credentials)) {
+    const { clientId } = credentials;
+    const cached = getCachedToken(clientId);
+    if (cached) {
+      return cached;
+    }
+    const pending = pendingExchanges.get(clientId);
+    if (pending) {
+      return pending;
+    }
+    const exchangePromise = exchangeClientCredentials({
+      clientId: credentials.clientId,
+      clientSecret: credentials.clientSecret,
+      baseUrl: credentials.baseUrl || options.baseUrl,
+      scope: credentials.scope,
+      fetch: options.fetch,
+      onEvent: options.onEvent
+    }).finally(() => {
+      pendingExchanges.delete(clientId);
+    });
+    pendingExchanges.set(clientId, exchangePromise);
+    return exchangePromise;
+  }
+  if (isPkceCredentials(credentials)) {
+    const storedToken = await getTokenFromCliLogin({
+      onEvent: options.onEvent,
+      fetch: options.fetch,
+      credentials
+    });
+    if (storedToken) {
+      return storedToken;
+    }
+    throw new Error(
+      "PKCE credentials require interactive login. Please run the 'login' command with the CLI first, or use client_credentials flow."
+    );
+  }
+  throw new Error("Unknown credentials type");
+}
+async function invalidateCredentialsToken(options) {
+  const resolved = await resolveCredentials(options);
+  const clientId = getClientIdFromCredentials(resolved);
+  if (clientId) {
+    invalidateCachedToken(clientId);
+  }
+}
+
 // src/api/client.ts
 var pathConfig = {
   // e.g. /relay -> https://sdkapi.zapier.com/api/v0/sdk/relay/...
@@ -3578,13 +3854,11 @@ var ZapierApiClient = class {
   // Helper to get a token from the different places it could be gotten
   async getAuthToken() {
     return resolveAuthToken({
+      credentials: this.options.credentials,
       token: this.options.token,
-      getToken: this.options.getToken,
       onEvent: this.options.onEvent,
       fetch: this.options.fetch,
-      baseUrl: this.options.baseUrl,
-      authBaseUrl: this.options.authBaseUrl,
-      authClientId: this.options.authClientId
+      baseUrl: this.options.baseUrl
     });
   }
   // Helper to handle responses
@@ -3622,10 +3896,16 @@ var ZapierApiClient = class {
     if (response.status === 401 || response.status === 403) {
       if (wasMissingAuthToken) {
         throw new ZapierAuthenticationError(
-          `Authentication required (HTTP ${response.status}). Please provide a token in options or set ZAPIER_TOKEN environment variable.`,
+          `Authentication required (HTTP ${response.status}). Please provide credentials in options or set ZAPIER_CREDENTIALS environment variable.`,
           errorOptions
         );
       }
+      if (response.status === 401) {
+        await invalidateCredentialsToken({
+          credentials: this.options.credentials,
+          token: this.options.token
+        });
+      }
       throw new ZapierAuthenticationError(message, errorOptions);
     }
     if (response.status === 400) {
@@ -3761,7 +4041,7 @@ var ZapierApiClient = class {
     if (options.authRequired) {
       if (headers.get("Authorization") == null && authToken == null) {
         throw new ZapierAuthenticationError(
-          `Authentication required but no token available. Please set ZAPIER_TOKEN, or run the 'login' command with the CLI.`
+          `Authentication required but no credentials available. Please set ZAPIER_CREDENTIALS, or run the 'login' command with the CLI.`
         );
       }
     }
@@ -3837,27 +4117,28 @@ var apiPlugin = (params) => {
   const {
     fetch: customFetch = globalThis.fetch,
     baseUrl = ZAPIER_BASE_URL,
-    authBaseUrl,
-    authClientId,
+    credentials,
     token,
-    getToken,
     onEvent,
     debug = false
   } = params.context.options;
   const api = createZapierApi({
     baseUrl,
-    authBaseUrl,
-    authClientId,
+    credentials,
     token,
-    getToken,
     debug,
     fetch: customFetch,
     onEvent
   });
   return {
     context: {
-      api
+      api,
       // Provide API client in context for other plugins to use
+      resolveCredentials: () => resolveCredentials({
+        credentials,
+        token,
+        baseUrl
+      })
     }
   };
 };
@@ -4451,7 +4732,7 @@ function getCpuTime() {
 
 // package.json
 var package_default = {
-  version: "0.18.4"};
+  version: "1.0.2"};
 
 // src/plugins/eventEmission/builders.ts
 function createBaseEvent(context = {}) {
@@ -4624,11 +4905,9 @@ var eventEmissionPlugin = ({ context }) => {
   const getUserContext = (async () => {
     try {
       const token = await resolveAuthToken({
+        credentials: context.options.credentials,
         token: context.options.token,
-        getToken: context.options.getToken,
         baseUrl: context.options.baseUrl,
-        authBaseUrl: context.options.authBaseUrl,
-        authClientId: context.options.authClientId,
         onEvent: context.options.onEvent,
         fetch: context.options.fetch
       });
@@ -4893,4 +5172,4 @@ function createZapierSdk(options = {}) {
   return createZapierSdkWithoutRegistry(options).addPlugin(registryPlugin);
 }
 
-export { ActionKeyPropertySchema, ActionTypePropertySchema, AppKeyPropertySchema, AuthenticationIdPropertySchema, DEFAULT_CONFIG_PATH, DebugPropertySchema, InputsPropertySchema, LimitPropertySchema, MAX_PAGE_LIMIT, OffsetPropertySchema, OutputPropertySchema, ParamsPropertySchema, RelayFetchSchema, RelayRequestSchema, ZAPIER_BASE_URL, ZapierActionError, ZapierApiError, ZapierAppNotFoundError, ZapierAuthenticationError, ZapierBundleError, ZapierConfigurationError, ZapierError, ZapierNotFoundError, ZapierResourceNotFoundError, ZapierTimeoutError, ZapierUnknownError, ZapierValidationError, actionKeyResolver, actionTypeResolver, apiPlugin, appKeyResolver, appsPlugin, authenticationIdGenericResolver, authenticationIdResolver, batch, buildApplicationLifecycleEvent, buildErrorEvent, buildErrorEventWithContext, buildMethodCalledEvent, createBaseEvent, createFunction, createSdk, createZapierSdk, createZapierSdkWithoutRegistry, fetchPlugin, findFirstAuthenticationPlugin, findManifestEntry, findUniqueAuthenticationPlugin, formatErrorMessage, generateEventId, getActionPlugin, getAppPlugin, getAuthenticationPlugin, getCiPlatform, getCpuTime, getCurrentTimestamp, getMemoryUsage, getOsInfo, getPlatformVersions, getPreferredManifestEntryKey, getProfilePlugin, getReleaseId, getTokenFromCliLogin, getTokenFromEnv, getTokenFromEnvOrConfig, inputFieldKeyResolver, inputsAllOptionalResolver, inputsResolver, isCi, isPositional, listActionsPlugin, listAppsPlugin, listAuthenticationsPlugin, listInputFieldsPlugin, manifestPlugin, readManifestFromFile, registryPlugin, requestPlugin, resolveAuthToken, runActionPlugin, toSnakeCase, toTitleCase };
+export { ActionKeyPropertySchema, ActionTypePropertySchema, AppKeyPropertySchema, AuthenticationIdPropertySchema, DEFAULT_CONFIG_PATH, DebugPropertySchema, InputsPropertySchema, LimitPropertySchema, MAX_PAGE_LIMIT, OffsetPropertySchema, OutputPropertySchema, ParamsPropertySchema, RelayFetchSchema, RelayRequestSchema, ZAPIER_AUTH_BASE_URL, ZAPIER_AUTH_CLIENT_ID, ZAPIER_BASE_URL, ZAPIER_CREDENTIALS, ZAPIER_CREDENTIALS_BASE_URL, ZAPIER_CREDENTIALS_CLIENT_ID, ZAPIER_CREDENTIALS_CLIENT_SECRET, ZAPIER_CREDENTIALS_SCOPE, ZAPIER_TOKEN, ZapierActionError, ZapierApiError, ZapierAppNotFoundError, ZapierAuthenticationError, ZapierBundleError, ZapierConfigurationError, ZapierError, ZapierNotFoundError, ZapierResourceNotFoundError, ZapierTimeoutError, ZapierUnknownError, ZapierValidationError, actionKeyResolver, actionTypeResolver, apiPlugin, appKeyResolver, appsPlugin, authenticationIdGenericResolver, authenticationIdResolver, batch, buildApplicationLifecycleEvent, buildErrorEvent, buildErrorEventWithContext, buildMethodCalledEvent, clearTokenCache, createBaseEvent, createFunction, createSdk, createZapierSdk, createZapierSdkWithoutRegistry, fetchPlugin, findFirstAuthenticationPlugin, findManifestEntry, findUniqueAuthenticationPlugin, formatErrorMessage, generateEventId, getActionPlugin, getAppPlugin, getAuthenticationPlugin, getBaseUrlFromCredentials, getCiPlatform, getClientIdFromCredentials, getCpuTime, getCurrentTimestamp, getMemoryUsage, getOsInfo, getPlatformVersions, getPreferredManifestEntryKey, getProfilePlugin, getReleaseId, getTokenFromCliLogin, inputFieldKeyResolver, inputsAllOptionalResolver, inputsResolver, invalidateCachedToken, invalidateCredentialsToken, isCi, isClientCredentials, isCredentialsFunction, isCredentialsObject, isPkceCredentials, isPositional, listActionsPlugin, listAppsPlugin, listAuthenticationsPlugin, listInputFieldsPlugin, logDeprecation, manifestPlugin, readManifestFromFile, registryPlugin, requestPlugin, resetDeprecationWarnings, resolveAuthToken, resolveCredentials, resolveCredentialsFromEnv, runActionPlugin, toSnakeCase, toTitleCase };

package/dist/plugins/api/index.d.ts

@@ -1,11 +1,13 @@
 import type { ApiClient } from "../../api/types";
 import type { BaseSdkOptions } from "../../types/sdk";
 import type { Plugin } from "../../types/plugin";
+import type { ResolvedCredentials } from "../../types/credentials";
 export interface ApiPluginOptions extends BaseSdkOptions {
 }
 export interface ApiPluginProvides {
     context: {
         api: ApiClient;
+        resolveCredentials: () => Promise<ResolvedCredentials | undefined>;
     };
 }
 export declare const apiPlugin: Plugin<{}, {}, ApiPluginProvides>;

package/dist/plugins/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/api/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;CAAG;AAG3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE;QACP,GAAG,EAAE,SAAS,CAAC;KAChB,CAAC;CACH;AAGD,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,iBAAiB,CA+BvD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/api/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,MAAM,WAAW,gBAAiB,SAAQ,cAAc;CAAG;AAG3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE;QACP,GAAG,EAAE,SAAS,CAAC;QACf,kBAAkB,EAAE,MAAM,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;KACpE,CAAC;CACH;AAGD,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,iBAAiB,CAiCvD,CAAC"}

package/dist/plugins/api/index.js

@@ -1,16 +1,15 @@
 import { createZapierApi } from "../../api";
+import { resolveCredentials } from "../../credentials";
 import { ZAPIER_BASE_URL } from "../../constants";
 // API plugin requires no context and provides api in context
 export const apiPlugin = (params) => {
     // Extract all options - everything passed to the plugin
-    const { fetch: customFetch = globalThis.fetch, baseUrl = ZAPIER_BASE_URL, authBaseUrl, authClientId, token, getToken, onEvent, debug = false, } = params.context.options;
+    const { fetch: customFetch = globalThis.fetch, baseUrl = ZAPIER_BASE_URL, credentials, token, onEvent, debug = false, } = params.context.options;
     // Create the API client - it will handle token resolution internally
     const api = createZapierApi({
         baseUrl,
-        authBaseUrl,
-        authClientId,
+        credentials,
         token,
-        getToken,
         debug,
         fetch: customFetch,
         onEvent,
@@ -19,6 +18,11 @@ export const apiPlugin = (params) => {
     return {
         context: {
             api, // Provide API client in context for other plugins to use
+            resolveCredentials: () => resolveCredentials({
+                credentials,
+                token,
+                baseUrl,
+            }),
         },
     };
 };

package/dist/plugins/eventEmission/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAMnE,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;KACrD,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA6FD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,EAAE,EACF;IACE,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,EACD,qBAAqB,CAkStB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/eventEmission/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAWnE,OAAO,KAAK,EAAgB,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAMnE,MAAM,WAAW,mBAAmB;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAGD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE;QACb,SAAS,EAAE,cAAc,CAAC;QAC1B,MAAM,EAAE,mBAAmB,CAAC;QAE5B,IAAI,CAAC,CAAC,SAAS,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;QAErD,eAAe,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC;KACrD,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA6FD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CACtC,EAAE,EACF;IACE,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,EACD,qBAAqB,CAgStB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}

package/dist/plugins/eventEmission/index.js

@@ -97,11 +97,9 @@ export const eventEmissionPlugin = ({ context }) => {
     const getUserContext = (async () => {
         try {
             const token = await resolveAuthToken({
+                credentials: context.options.credentials,
                 token: context.options.token,
-                getToken: context.options.getToken,
                 baseUrl: context.options.baseUrl,
-                authBaseUrl: context.options.authBaseUrl,
-                authClientId: context.options.authClientId,
                 onEvent: context.options.onEvent,
                 fetch: context.options.fetch,
             });

package/dist/plugins/eventEmission/index.test.js

@@ -448,7 +448,7 @@ describe("eventEmissionPlugin", () => {
         // CLI login package should not be called when token is in options
         expect(mockGetToken).not.toHaveBeenCalled();
     });
-    it("should extract user IDs from getToken function in SDK options", async () => {
+    it("should extract user IDs from credentials function in SDK options", async () => {
         // Create a test JWT token
         const header = { alg: "HS256", typ: "JWT" };
         const payload = {
@@ -459,13 +459,13 @@ describe("eventEmissionPlugin", () => {
         const encodedHeader = Buffer.from(JSON.stringify(header)).toString("base64url");
         const encodedPayload = Buffer.from(JSON.stringify(payload)).toString("base64url");
         const testJwt = `${encodedHeader}.${encodedPayload}.custom-signature`;
-        const customGetToken = vi.fn().mockResolvedValue(testJwt);
+        const credentialsFn = vi.fn().mockResolvedValue(testJwt);
         const plugin = eventEmissionPlugin({
             sdk: {},
             context: {
                 meta: {},
                 options: {
-                    getToken: customGetToken,
+                    credentials: credentialsFn,
                     eventEmission: {
                         enabled: true,
                         transport: { type: "console" },
@@ -474,14 +474,14 @@ describe("eventEmissionPlugin", () => {
             },
         });
         const baseEvent = await plugin.context.eventEmission.createBaseEvent();
-        // Should extract from custom getToken function
+        // Should extract from custom credentials function
         expect(baseEvent.customuser_id).toBe(44444);
         expect(baseEvent.account_id).toBe(33333);
-        expect(customGetToken).toHaveBeenCalled();
-        // CLI login package should not be called when getToken is in options
+        expect(credentialsFn).toHaveBeenCalled();
+        // CLI login package should not be called when credentials is in options
         expect(mockGetToken).not.toHaveBeenCalled();
     });
-    it("should prioritize static token over getToken function", async () => {
+    it("should prioritize string credentials over credentials function", async () => {
         // Create test JWT tokens
         const staticHeader = { alg: "HS256", typ: "JWT" };
         const staticPayload = {
@@ -492,14 +492,12 @@ describe("eventEmissionPlugin", () => {
         const staticEncodedHeader = Buffer.from(JSON.stringify(staticHeader)).toString("base64url");
         const staticEncodedPayload = Buffer.from(JSON.stringify(staticPayload)).toString("base64url");
         const staticJwt = `${staticEncodedHeader}.${staticEncodedPayload}.static-sig`;
-        const customGetToken = vi.fn().mockResolvedValue("should-not-be-used");
         const plugin = eventEmissionPlugin({
             sdk: {},
             context: {
                 meta: {},
                 options: {
-                    token: staticJwt,
-                    getToken: customGetToken,
+                    credentials: staticJwt,
                     eventEmission: {
                         enabled: true,
                         transport: { type: "console" },
@@ -508,10 +506,9 @@ describe("eventEmissionPlugin", () => {
             },
         });
         const baseEvent = await plugin.context.eventEmission.createBaseEvent();
-        // Should use static token, not getToken
+        // Should use string credentials
         expect(baseEvent.customuser_id).toBe(66666);
         expect(baseEvent.account_id).toBe(55555);
-        expect(customGetToken).not.toHaveBeenCalled();
         expect(mockGetToken).not.toHaveBeenCalled();
     });
     it("should fall back to CLI login when SDK options have no token", async () => {
@@ -545,8 +542,8 @@ describe("eventEmissionPlugin", () => {
         expect(baseEvent.account_id).toBe(77777);
         expect(mockGetToken).toHaveBeenCalled();
     });
-    it("should handle custom getToken returning undefined", async () => {
-        const customGetToken = vi.fn().mockResolvedValue(undefined);
+    it("should handle credentials function returning undefined and fall back to CLI login", async () => {
+        const credentialsFn = vi.fn().mockResolvedValue(undefined);
         // Also mock CLI login to return a token
         const header = { alg: "HS256", typ: "JWT" };
         const payload = {
@@ -563,7 +560,7 @@ describe("eventEmissionPlugin", () => {
             context: {
                 meta: {},
                 options: {
-                    getToken: customGetToken,
+                    credentials: credentialsFn,
                     eventEmission: {
                         enabled: true,
                         transport: { type: "console" },
@@ -572,10 +569,10 @@ describe("eventEmissionPlugin", () => {
             },
         });
         const baseEvent = await plugin.context.eventEmission.createBaseEvent();
-        // Should fall back to CLI login when custom getToken returns undefined
+        // Since credentials function returns undefined, SDK falls back to CLI login
         expect(baseEvent.customuser_id).toBe(10101);
         expect(baseEvent.account_id).toBe(99999);
-        expect(customGetToken).toHaveBeenCalled();
+        expect(credentialsFn).toHaveBeenCalled();
         expect(mockGetToken).toHaveBeenCalled();
     });
 });

package/dist/plugins/getAction/schemas.d.ts

@@ -6,8 +6,8 @@ export declare const GetActionSchema: z.ZodObject<{
         _def: z.core.$ZodStringDef & import("../..").PositionalMetadata;
     };
     actionType: z.ZodEnum<{
-        search: "search";
         filter: "filter";
+        search: "search";
         read: "read";
         read_bulk: "read_bulk";
         run: "run";

package/dist/plugins/getInputFieldsSchema/schemas.d.ts

@@ -5,8 +5,8 @@ export declare const GetInputFieldsSchemaSchema: z.ZodObject<{
         _def: z.core.$ZodStringDef & import("../..").PositionalMetadata;
     };
     actionType: z.ZodEnum<{
-        search: "search";
         filter: "filter";
+        search: "search";
         read: "read";
         read_bulk: "read_bulk";
         run: "run";