@zapier/zapier-sdk 0.15.4 → 0.15.8

package/dist/index.mjs

@@ -2283,49 +2283,68 @@ var getActionPlugin = ({ sdk }) => {
     }
   };
 };
-var GetAuthenticationSchema = z.object({
+var AuthenticationSchema2 = z.object({
+  id: z.number(),
+  date: z.string(),
+  lastchanged: z.string().optional(),
+  account_id: z.number(),
+  customuser_id: z.number().optional(),
+  selected_api: z.string(),
+  destination_selected_api: z.string().nullable().optional(),
+  is_invite_only: z.boolean(),
+  is_private: z.boolean(),
+  shared_with_all: z.boolean(),
+  is_stale: z.string().optional(),
+  is_shared: z.string().optional(),
+  marked_stale_at: z.string().nullable().optional(),
+  label: z.string().nullable().optional(),
+  identifier: z.string().nullable().optional(),
+  title: z.string().nullable().optional(),
+  url: z.string().optional(),
+  groups: z.string().optional(),
+  members: z.string().optional(),
+  permissions: z.record(z.boolean()).optional()
+});
+z.object({
+  count: z.number(),
+  next: z.string().nullable().optional(),
+  previous: z.string().nullable().optional(),
+  results: z.array(AuthenticationSchema2)
+});
+var AuthenticationItemSchema2 = AuthenticationSchema2.omit({
+  selected_api: true,
+  customuser_id: true
+}).extend({
+  // Renamed fields
+  implementation_id: z.string().optional(),
+  user_id: z.number().optional(),
+  // Mapped fields (originals preserved in ...restOfAuth)
+  is_expired: z.string().optional(),
+  expired_at: z.string().nullable().optional(),
+  // Computed fields
+  app_key: z.string().optional(),
+  app_version: z.string().optional()
+});
+var GetAuthenticationOptionsSchema = z.object({
   authenticationId: z.number().int().positive().describe("Authentication ID to retrieve")
 }).describe("Get a specific authentication by ID");
+var GetAuthenticationHandlerRequestSchema = z.object({
+  authenticationId: z.union([z.string(), z.number()]).describe("Authentication ID - string from searchParams or number")
+}).transform((data) => ({
+  authenticationId: typeof data.authenticationId === "string" ? parseInt(data.authenticationId, 10) : data.authenticationId
+}));
+z.object({
+  data: z.lazy(() => AuthenticationItemSchema2)
+});
 
 // src/plugins/getAuthentication/index.ts
 var getAuthenticationPlugin = ({ context }) => {
   const getAuthentication = createFunction(async function getAuthentication2(options) {
     const { api } = context;
-    const { authenticationId } = options;
-    const data = await api.get(
-      `/zapier/api/v4/authentications/${authenticationId}/`,
-      {
-        customErrorHandler: ({ status }) => {
-          if (status === 401) {
-            return new ZapierAuthenticationError(
-              `Authentication failed. Your token may not have permission to access authentications or may be expired. (HTTP ${status})`,
-              { statusCode: status }
-            );
-          }
-          if (status === 403) {
-            return new ZapierAuthenticationError(
-              `Access forbidden. Your token may not have the required scopes to get authentication ${authenticationId}. (HTTP ${status})`,
-              { statusCode: status }
-            );
-          }
-          if (status === 404) {
-            return new ZapierResourceNotFoundError(
-              `Authentication ${authenticationId} not found. It may not exist or you may not have access to it. (HTTP ${status})`,
-              {
-                resourceType: "Authentication",
-                resourceId: String(authenticationId)
-              }
-            );
-          }
-          return void 0;
-        },
-        authRequired: true
-      }
+    return await api.get(
+      `/api/v0/authentications/${options.authenticationId}`
     );
-    return {
-      data: normalizeAuthenticationItem(data)
-    };
-  }, GetAuthenticationSchema);
+  }, GetAuthenticationOptionsSchema);
   return {
     getAuthentication,
     context: {
@@ -2334,7 +2353,7 @@ var getAuthenticationPlugin = ({ context }) => {
           categories: ["authentication"],
           type: "item",
           itemType: "Authentication",
-          inputSchema: GetAuthenticationSchema,
+          inputSchema: GetAuthenticationOptionsSchema,
           outputSchema: AuthenticationItemSchema,
           resolvers: {
             authenticationId: authenticationIdGenericResolver
@@ -3171,6 +3190,12 @@ function isJwt(token) {
   const base64UrlPattern = /^[A-Za-z0-9_-]+$/;
   return parts.every((part) => part.length > 0 && base64UrlPattern.test(part));
 }
+function parseJwt(token) {
+  if (!isJwt(token)) {
+    return null;
+  }
+  return token.split(".");
+}
 function getAuthorizationHeader(token) {
   if (isJwt(token)) {
     return `JWT ${token}`;
@@ -3178,11 +3203,11 @@ function getAuthorizationHeader(token) {
   return `Bearer ${token}`;
 }
 function extractUserIdsFromJwt(token) {
+  const parts = parseJwt(token);
+  if (!parts) {
+    return { customuser_id: null, account_id: null };
+  }
   try {
-    const parts = token.split(".");
-    if (parts.length !== 3) {
-      return { customuser_id: null, account_id: null };
-    }
     const payload = JSON.parse(
       Buffer.from(parts[1], "base64url").toString("utf-8")
     );
@@ -3489,6 +3514,18 @@ async function getTokenFromEnvOrConfig(options = {}) {
   }
   return getTokenFromCliLogin(options);
 }
+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);
+}
 
 // src/utils/url-utils.ts
 function getZapierBaseUrl(baseUrl) {
@@ -3536,7 +3573,7 @@ function getTrackingBaseUrl({
   return ZAPIER_BASE_URL;
 }
 
-// src/temporary-internal-core/utils/app-locators.ts
+// src/temporary-internal-core/utils/string-utils.ts
 function splitVersionedKey2(versionedKey) {
   const parts = versionedKey.split("@");
   if (parts.length >= 2) {
@@ -3571,6 +3608,44 @@ function extractPaginationCursor(response) {
     return void 0;
   }
 }
+function normalizeAuthenticationItem2(auth, options = {}) {
+  let appKey = options.app_key;
+  let appVersion = options.app_version;
+  if (auth.selected_api) {
+    const [extractedAppKey, extractedVersion] = splitVersionedKey2(
+      auth.selected_api
+    );
+    if (!appKey) {
+      appKey = extractedAppKey;
+    }
+    if (!appVersion) {
+      appVersion = extractedVersion;
+    }
+  }
+  const {
+    selected_api: selectedApi,
+    customuser_id: userId,
+    ...restOfAuth
+  } = auth;
+  return {
+    ...restOfAuth,
+    // Pass through all other API response fields except selected_api
+    implementation_id: selectedApi,
+    // Rename selected_api to implementation_id
+    title: auth.title || auth.label || void 0,
+    // Coerce title from label if missing
+    is_expired: auth.is_stale,
+    // Map is_stale to is_expired
+    expired_at: auth.marked_stale_at,
+    // Map marked_stale_at to expired_at
+    app_key: appKey,
+    // App key from implementations endpoint or parsed from selected_api
+    app_version: appVersion,
+    // Version from selected_api or provided
+    user_id: userId
+    // Map customuser_id to user_id
+  };
+}
 
 // src/temporary-internal-core/handlers/listApps.ts
 var DEFAULT_PAGE_SIZE = 20;
@@ -3665,6 +3740,111 @@ var handleListApps = async ({ request, deps }) => {
   };
 };
 
+// src/temporary-internal-core/schemas/errors/index.ts
+var ZapierError2 = class extends Error {
+  constructor(message, options = {}) {
+    super(message);
+    this.statusCode = options.statusCode;
+    this.errors = options.errors;
+    this.cause = options.cause;
+    this.response = options.response;
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+};
+var ZapierAuthenticationError2 = class extends ZapierError2 {
+  constructor(message, options = {}) {
+    super(message, options);
+    this.name = "ZapierAuthenticationError";
+  }
+};
+var ZapierResourceNotFoundError2 = class extends ZapierError2 {
+  constructor(message, options = {}) {
+    super(message, options);
+    this.name = "ZapierResourceNotFoundError";
+    this.resourceType = options.resourceType;
+    this.resourceId = options.resourceId;
+  }
+};
+
+// src/temporary-internal-core/handlers/getAuthentication.ts
+var handleGetAuthentication = async ({ request, deps }) => {
+  const validatedRequest = GetAuthenticationHandlerRequestSchema.parse(request);
+  const { httpClient } = deps;
+  const { authenticationId } = validatedRequest;
+  const authentication = await httpClient.get(
+    `/zapier/api/v4/authentications/${authenticationId}/`,
+    {
+      authRequired: true,
+      customErrorHandler: ({ status }) => {
+        if (status === 401) {
+          return new ZapierAuthenticationError2(
+            `Authentication failed. Your token may not have permission to access authentications or may be expired. (HTTP ${status})`,
+            { statusCode: status }
+          );
+        }
+        if (status === 403) {
+          return new ZapierAuthenticationError2(
+            `Access forbidden. Your token may not have the required scopes to get authentication ${authenticationId}. (HTTP ${status})`,
+            { statusCode: status }
+          );
+        }
+        if (status === 404) {
+          return new ZapierResourceNotFoundError2(
+            `Authentication ${authenticationId} not found. It may not exist or you may not have access to it. (HTTP ${status})`,
+            {
+              resourceType: "Authentication",
+              resourceId: String(authenticationId)
+            }
+          );
+        }
+        return void 0;
+      }
+    }
+  );
+  const normalizedAuthentication = normalizeAuthenticationItem2(authentication);
+  return {
+    data: normalizedAuthentication
+  };
+};
+
+// src/api/router.ts
+var routes = [
+  {
+    method: "GET",
+    pattern: /^\/api\/v0\/apps$/,
+    handler: handleListApps,
+    paramMap: []
+  },
+  {
+    method: "GET",
+    pattern: /^\/api\/v0\/authentications\/([^\/]+)$/,
+    handler: handleGetAuthentication,
+    paramMap: ["authenticationId"]
+  }
+];
+function findMatchingRoute(routeList, method, path) {
+  for (const route of routeList) {
+    if (route.method !== method) {
+      continue;
+    }
+    const match = path.match(route.pattern);
+    if (match) {
+      const params = {};
+      route.paramMap.forEach((name, index) => {
+        params[name] = match[index + 1];
+      });
+      return {
+        handler: route.handler,
+        params
+      };
+    }
+  }
+  return null;
+}
+function matchRoute(method, path) {
+  return findMatchingRoute(routes, method, path);
+}
+
 // src/api/client.ts
 var pathConfig = {
   // e.g. /relay -> https://sdkapi.zapier.com/api/v0/sdk/relay/...
@@ -3676,9 +3856,6 @@ var pathConfig = {
   "/zapier": {
     authHeader: "Authorization",
     pathPrefix: "/api/v0/sdk/zapier"
-  },
-  "/api/v0/apps": {
-    handlerOverride: handleListApps
   }
 };
 var ZapierApiClient = class {
@@ -3724,16 +3901,9 @@ var ZapierApiClient = class {
   }
   // Helper to get a token from the different places it could be gotten
   async getAuthToken() {
-    if (this.options.token) {
-      return this.options.token;
-    }
-    if (this.options.getToken) {
-      const token = await this.options.getToken();
-      if (token) {
-        return token;
-      }
-    }
-    return getTokenFromEnvOrConfig({
+    return resolveAuthToken({
+      token: this.options.token,
+      getToken: this.options.getToken,
       onEvent: this.options.onEvent,
       fetch: this.options.fetch,
       baseUrl: this.options.baseUrl,
@@ -3836,14 +4006,6 @@ var ZapierApiClient = class {
     }
     return void 0;
   }
-  // Helper to check if a path config has a handler override
-  hasHandlerOverride(pathConfig2) {
-    return pathConfig2 !== void 0 && "handlerOverride" in pathConfig2 && typeof pathConfig2.handlerOverride === "function";
-  }
-  // Helper to check if a path config is a standard path config
-  isStandardPathConfig(pathConfig2) {
-    return pathConfig2 !== void 0 && !this.hasHandlerOverride(pathConfig2);
-  }
   // Helper to parse API error response
   parseErrorResponse(errorInfo) {
     const fallbackMessage = `HTTP ${errorInfo.status}: ${errorInfo.statusText}`;
@@ -3895,8 +4057,10 @@ var ZapierApiClient = class {
         pathConfig: config
       };
     }
+    const baseUrl = new URL(this.options.baseUrl);
+    const fullPath = baseUrl.pathname.replace(/\/$/, "") + path;
     return {
-      url: new URL(path, this.options.baseUrl),
+      url: new URL(fullPath, baseUrl.origin),
       pathConfig: config
     };
   }
@@ -3915,7 +4079,7 @@ var ZapierApiClient = class {
     const headers = new Headers(options.headers ?? {});
     const authToken = await this.getAuthToken();
     if (authToken) {
-      const authHeaderName = this.isStandardPathConfig(pathConfig2) && pathConfig2.authHeader ? pathConfig2.authHeader : "Authorization";
+      const authHeaderName = pathConfig2 && pathConfig2.authHeader ? pathConfig2.authHeader : "Authorization";
       headers.set(authHeaderName, getAuthorizationHeader(authToken));
     }
     if (options.authRequired) {
@@ -3929,10 +4093,14 @@ var ZapierApiClient = class {
   }
   // Helper to perform HTTP requests with JSON handling
   async fetchJson(method, path, data, options = {}) {
-    const { pathConfig: pathConfig2 } = this.buildUrl(path, options.searchParams);
-    if (this.hasHandlerOverride(pathConfig2)) {
-      const handlerRequest = method === "GET" ? options.searchParams : data;
-      return pathConfig2.handlerOverride({
+    const routeMatch = matchRoute(method, path);
+    if (routeMatch) {
+      const handlerRequest = {
+        ...typeof data === "object" ? data : {},
+        ...options.searchParams,
+        ...routeMatch.params
+      };
+      return routeMatch.handler({
         request: handlerRequest,
         deps: {
           httpClient: this
@@ -4601,7 +4769,7 @@ function getCpuTime() {
 
 // package.json
 var package_default = {
-  version: "0.15.4"};
+  version: "0.15.8"};
 
 // src/plugins/eventEmission/builders.ts
 function createBaseEvent(context = {}) {
@@ -4741,9 +4909,14 @@ var eventEmissionPlugin = ({ context }) => {
   };
   const getUserContext = (async () => {
     try {
-      const { getToken } = await import('@zapier/zapier-sdk-cli-login');
-      const token = await getToken({
-        baseUrl: context.options.baseUrl
+      const token = await resolveAuthToken({
+        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
       });
       if (token) {
         return extractUserIdsFromJwt(token);
@@ -4984,4 +5157,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, 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, runActionPlugin, toSnakeCase, toTitleCase };
+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, 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 };

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;AAenE,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;KACvC,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA4FD,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,CAyQtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,GAChB,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;AAgBnE,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;KACvC,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AA4FD,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,CA6QtB,CAAC;AAGF,YAAY,EACV,YAAY,EACZ,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,cAAc,SAAS,CAAC"}

package/dist/plugins/eventEmission/index.js

@@ -7,6 +7,7 @@
 import { createTransport } from "./transport";
 import { generateEventId, getCurrentTimestamp, getReleaseId } from "./utils";
 import { extractUserIdsFromJwt } from "../../api/auth";
+import { resolveAuthToken } from "../../auth";
 import { buildApplicationLifecycleEvent, buildErrorEventWithContext, } from "./builders";
 import { getTrackingBaseUrl } from "../../utils/url-utils";
 // Maximum time to wait for telemetry emission before allowing process to exit
@@ -94,18 +95,21 @@ export const eventEmissionPlugin = ({ context }) => {
     // Create getUserContext promise for dynamic user context injection
     const getUserContext = (async () => {
         try {
-            // Dynamically import the CLI login package if available
-            const { getToken } = await import("@zapier/zapier-sdk-cli-login");
-            // Pass baseUrl for potential token refresh operations
-            const token = await getToken({
+            const token = await resolveAuthToken({
+                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,
             });
             if (token) {
                 return extractUserIdsFromJwt(token);
             }
         }
         catch {
-            // CLI login package not available or getToken failed, fall back to null context
+            // Fall back to null context on any error
         }
         return { customuser_id: null, account_id: null };
     })();

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

@@ -417,4 +417,165 @@ describe("eventEmissionPlugin", () => {
         expect(baseEvent.customuser_id).toBe(null);
         expect(baseEvent.account_id).toBe(null);
     });
+    it("should extract user IDs from static token in SDK options", async () => {
+        // Create a test JWT token
+        const header = { alg: "HS256", typ: "JWT" };
+        const payload = {
+            "zap:acc": "11111",
+            sub: "22222",
+            sub_type: "customuser",
+        };
+        const encodedHeader = Buffer.from(JSON.stringify(header)).toString("base64url");
+        const encodedPayload = Buffer.from(JSON.stringify(payload)).toString("base64url");
+        const testJwt = `${encodedHeader}.${encodedPayload}.static-signature`;
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    token: testJwt,
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        const baseEvent = await plugin.context.eventEmission.createBaseEvent();
+        // Should extract from static token in options
+        expect(baseEvent.customuser_id).toBe(22222);
+        expect(baseEvent.account_id).toBe(11111);
+        // 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 () => {
+        // Create a test JWT token
+        const header = { alg: "HS256", typ: "JWT" };
+        const payload = {
+            "zap:acc": "33333",
+            sub: "44444",
+            sub_type: "customuser",
+        };
+        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 plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    getToken: customGetToken,
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        const baseEvent = await plugin.context.eventEmission.createBaseEvent();
+        // Should extract from custom getToken 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(mockGetToken).not.toHaveBeenCalled();
+    });
+    it("should prioritize static token over getToken function", async () => {
+        // Create test JWT tokens
+        const staticHeader = { alg: "HS256", typ: "JWT" };
+        const staticPayload = {
+            "zap:acc": "55555",
+            sub: "66666",
+            sub_type: "customuser",
+        };
+        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,
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        const baseEvent = await plugin.context.eventEmission.createBaseEvent();
+        // Should use static token, not getToken
+        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 () => {
+        // Create a test JWT token for CLI login
+        const header = { alg: "HS256", typ: "JWT" };
+        const payload = {
+            "zap:acc": "77777",
+            sub: "88888",
+            sub_type: "customuser",
+        };
+        const encodedHeader = Buffer.from(JSON.stringify(header)).toString("base64url");
+        const encodedPayload = Buffer.from(JSON.stringify(payload)).toString("base64url");
+        const testJwt = `${encodedHeader}.${encodedPayload}.cli-signature`;
+        mockGetToken.mockResolvedValue(testJwt);
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    // No token or getToken in options
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        const baseEvent = await plugin.context.eventEmission.createBaseEvent();
+        // Should fall back to CLI login package
+        expect(baseEvent.customuser_id).toBe(88888);
+        expect(baseEvent.account_id).toBe(77777);
+        expect(mockGetToken).toHaveBeenCalled();
+    });
+    it("should handle custom getToken returning undefined", async () => {
+        const customGetToken = vi.fn().mockResolvedValue(undefined);
+        // Also mock CLI login to return a token
+        const header = { alg: "HS256", typ: "JWT" };
+        const payload = {
+            "zap:acc": "99999",
+            sub: "10101",
+            sub_type: "customuser",
+        };
+        const encodedHeader = Buffer.from(JSON.stringify(header)).toString("base64url");
+        const encodedPayload = Buffer.from(JSON.stringify(payload)).toString("base64url");
+        const testJwt = `${encodedHeader}.${encodedPayload}.fallback-signature`;
+        mockGetToken.mockResolvedValue(testJwt);
+        const plugin = eventEmissionPlugin({
+            sdk: {},
+            context: {
+                meta: {},
+                options: {
+                    getToken: customGetToken,
+                    eventEmission: {
+                        enabled: true,
+                        transport: { type: "console" },
+                    },
+                },
+            },
+        });
+        const baseEvent = await plugin.context.eventEmission.createBaseEvent();
+        // Should fall back to CLI login when custom getToken returns undefined
+        expect(baseEvent.customuser_id).toBe(10101);
+        expect(baseEvent.account_id).toBe(99999);
+        expect(customGetToken).toHaveBeenCalled();
+        expect(mockGetToken).toHaveBeenCalled();
+    });
 });

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

@@ -1,11 +1,8 @@
 import type { Plugin } from "../../types/plugin";
 import type { ApiClient } from "../../api";
-import type { AuthenticationItem } from "../../types/domain";
-import { GetAuthenticationSchema, type GetAuthenticationOptions } from "./schemas";
+import { GetAuthenticationSchema, type GetAuthenticationOptions, type GetAuthenticationResponse } from "./schemas";
 export interface GetAuthenticationPluginProvides {
-    getAuthentication: (options: GetAuthenticationOptions) => Promise<{
-        data: AuthenticationItem;
-    }>;
+    getAuthentication: (options: GetAuthenticationOptions) => Promise<GetAuthenticationResponse>;
     context: {
         meta: {
             getAuthentication: {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/getAuthentication/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EACL,uBAAuB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,WAAW,CAAC;AAUnB,MAAM,WAAW,+BAA+B;IAC9C,iBAAiB,EAAE,CACjB,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC;QAAE,IAAI,EAAE,kBAAkB,CAAA;KAAE,CAAC,CAAC;IAC3C,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,iBAAiB,EAAE;gBACjB,WAAW,EAAE,OAAO,uBAAuB,CAAC;aAC7C,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAED,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAC1C,EAAE,EAAE,sBAAsB;AAC1B;IAAE,GAAG,EAAE,SAAS,CAAA;CAAE,EAAE,0BAA0B;AAC9C,+BAA+B,CA6DhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/getAuthentication/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EACL,uBAAuB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC/B,MAAM,WAAW,CAAC;AAKnB,MAAM,WAAW,+BAA+B;IAC9C,iBAAiB,EAAE,CACjB,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACxC,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,iBAAiB,EAAE;gBACjB,WAAW,EAAE,OAAO,uBAAuB,CAAC;aAC7C,CAAC;SACH,CAAC;KACH,CAAC;CACH;AAED,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAC1C,EAAE,EAAE,sBAAsB;AAC1B;IAAE,GAAG,EAAE,SAAS,CAAA;CAAE,EAAE,0BAA0B;AAC9C,+BAA+B,CA+BhC,CAAC"}