@zapier/zapier-sdk 0.18.4 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @zapier/zapier-sdk
 
+## 1.0.0
+
+### Minor Changes
+
+- 97ff6c0: Add support for client credentials.
+
+### Patch Changes
+
+- Updated dependencies [97ff6c0]
+  - @zapier/zapier-sdk-cli-login@0.4.0
+
 ## 0.18.4
 
 ### Patch Changes

package/dist/api/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAGjB,MAAM,SAAS,CAAC;AA4ejB,eAAO,MAAM,eAAe,GAAI,SAAS,gBAAgB,KAAG,SAW3D,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAGjB,MAAM,SAAS,CAAC;AAmfjB,eAAO,MAAM,eAAe,GAAI,SAAS,gBAAgB,KAAG,SAW3D,CAAC"}

package/dist/api/client.js

@@ -7,7 +7,7 @@
 import { getAuthorizationHeader } from "./auth";
 import { createDebugLogger, createDebugFetch } from "./debug";
 import { pollUntilComplete } from "./polling";
-import { resolveAuthToken } from "../auth";
+import { resolveAuthToken, invalidateCredentialsToken } from "../auth";
 import { getZapierBaseUrl } from "../utils/url-utils";
 import { ZapierApiError, ZapierAuthenticationError, ZapierValidationError, ZapierNotFoundError, } from "../types/errors";
 // Configuration for paths
@@ -68,13 +68,11 @@ class ZapierApiClient {
     // 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,
         });
     }
     // Helper to handle responses
@@ -115,7 +113,14 @@ class ZapierApiClient {
         if (response.status === 401 || response.status === 403) {
             // If we get a 401/403 error and no auth token was provided, give helpful message
             if (wasMissingAuthToken) {
-                throw new ZapierAuthenticationError(`Authentication required (HTTP ${response.status}). Please provide a token in options or set ZAPIER_TOKEN environment variable.`, errorOptions);
+                throw new ZapierAuthenticationError(`Authentication required (HTTP ${response.status}). Please provide credentials in options or set ZAPIER_CREDENTIALS environment variable.`, errorOptions);
+            }
+            // On 401, invalidate cached token so next request gets a fresh one
+            if (response.status === 401) {
+                await invalidateCredentialsToken({
+                    credentials: this.options.credentials,
+                    token: this.options.token,
+                });
             }
             throw new ZapierAuthenticationError(message, errorOptions);
         }
@@ -289,7 +294,7 @@ class ZapierApiClient {
         // before we even make a request.
         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.`);
+                throw new ZapierAuthenticationError(`Authentication required but no credentials available. Please set ZAPIER_CREDENTIALS, or run the 'login' command with the CLI.`);
             }
         }
         return headers;

package/dist/api/client.test.js

@@ -4,6 +4,7 @@ import * as auth from "../auth";
 vi.mock("../auth");
 describe("ApiClient", () => {
     const mockResolveAuthToken = vi.mocked(auth.resolveAuthToken);
+    const mockInvalidateCredentialsToken = vi.mocked(auth.invalidateCredentialsToken);
     beforeEach(() => {
         vi.clearAllMocks();
         // Prevent any actual HTTP calls
@@ -14,83 +15,137 @@ describe("ApiClient", () => {
         });
     });
     describe("authentication token resolution", () => {
-        it("should pass authBaseUrl to resolveAuthToken when provided", async () => {
+        it("should pass credentials to resolveAuthToken when provided", async () => {
             mockResolveAuthToken.mockResolvedValue("test-token");
+            const credentials = {
+                type: "client_credentials",
+                clientId: "my-client",
+                clientSecret: "my-secret",
+            };
             const client = createZapierApi({
                 baseUrl: "https://api.custom.zapier.dev",
-                authBaseUrl: "https://auth.custom.zapier.dev",
+                credentials,
                 debug: false,
             });
             // Make a request that would trigger token resolution
             await client.get("/test", { authRequired: true });
             expect(mockResolveAuthToken).toHaveBeenCalledWith({
+                credentials,
                 token: undefined,
-                getToken: undefined,
                 onEvent: undefined,
                 fetch: expect.any(Function),
                 baseUrl: "https://api.custom.zapier.dev",
-                authBaseUrl: "https://auth.custom.zapier.dev",
-                authClientId: undefined,
             });
         });
-        it("should pass undefined authBaseUrl when not provided", async () => {
+        it("should pass undefined credentials when not provided", async () => {
             mockResolveAuthToken.mockResolvedValue("test-token");
             const client = createZapierApi({
                 baseUrl: "https://api.custom.zapier.dev",
-                // authBaseUrl intentionally omitted
                 debug: false,
             });
             // Make a request that would trigger token resolution
             await client.get("/test", { authRequired: true });
             expect(mockResolveAuthToken).toHaveBeenCalledWith({
+                credentials: undefined,
                 token: undefined,
-                getToken: undefined,
                 onEvent: undefined,
                 fetch: expect.any(Function),
                 baseUrl: "https://api.custom.zapier.dev",
-                authBaseUrl: undefined,
-                authClientId: undefined,
             });
         });
-        it("should pass authClientId to resolveAuthToken when provided", async () => {
-            mockResolveAuthToken.mockResolvedValue("test-token");
+        it("should pass deprecated token option to resolveAuthToken", async () => {
+            mockResolveAuthToken.mockResolvedValue("direct-token");
             const client = createZapierApi({
+                token: "direct-token",
                 baseUrl: "https://api.custom.zapier.dev",
-                authClientId: "custom-client-id",
                 debug: false,
             });
-            // Make a request that would trigger token resolution
+            // Make a request that would use the direct token
             await client.get("/test", { authRequired: true });
+            // resolveAuthToken is still called, but it returns the direct token immediately
             expect(mockResolveAuthToken).toHaveBeenCalledWith({
+                credentials: undefined,
+                token: "direct-token",
+                onEvent: undefined,
+                fetch: expect.any(Function),
+                baseUrl: "https://api.custom.zapier.dev",
+            });
+        });
+        it("should pass string credentials to resolveAuthToken", async () => {
+            mockResolveAuthToken.mockResolvedValue("string-token");
+            const client = createZapierApi({
+                credentials: "string-token",
+                baseUrl: "https://api.custom.zapier.dev",
+                debug: false,
+            });
+            await client.get("/test", { authRequired: true });
+            expect(mockResolveAuthToken).toHaveBeenCalledWith({
+                credentials: "string-token",
                 token: undefined,
-                getToken: undefined,
                 onEvent: undefined,
                 fetch: expect.any(Function),
                 baseUrl: "https://api.custom.zapier.dev",
-                authBaseUrl: undefined,
-                authClientId: "custom-client-id",
             });
         });
-        it("should not call resolveAuthToken when token is provided directly", async () => {
-            mockResolveAuthToken.mockResolvedValue("direct-token");
+        it("should pass credentials function to resolveAuthToken", async () => {
+            mockResolveAuthToken.mockResolvedValue("function-token");
+            const credentialsFn = () => Promise.resolve("dynamic-token");
             const client = createZapierApi({
-                token: "direct-token",
+                credentials: credentialsFn,
                 baseUrl: "https://api.custom.zapier.dev",
-                authBaseUrl: "https://auth.custom.zapier.dev",
                 debug: false,
             });
-            // Make a request that would use the direct token
             await client.get("/test", { authRequired: true });
-            // resolveAuthToken is still called, but it returns the direct token immediately
             expect(mockResolveAuthToken).toHaveBeenCalledWith({
-                token: "direct-token",
-                getToken: undefined,
+                credentials: credentialsFn,
+                token: undefined,
                 onEvent: undefined,
                 fetch: expect.any(Function),
                 baseUrl: "https://api.custom.zapier.dev",
-                authBaseUrl: "https://auth.custom.zapier.dev",
-                authClientId: undefined,
             });
         });
     });
+    describe("401 cache invalidation", () => {
+        it("should invalidate credentials token on 401 response", async () => {
+            mockResolveAuthToken.mockResolvedValue("test-token");
+            mockInvalidateCredentialsToken.mockResolvedValue(undefined);
+            const clientCredentials = {
+                type: "client_credentials",
+                clientId: "my-client-id",
+                clientSecret: "my-secret",
+            };
+            global.fetch = vi.fn().mockResolvedValue({
+                ok: false,
+                status: 401,
+                statusText: "Unauthorized",
+                json: () => Promise.resolve({ message: "Invalid token" }),
+            });
+            const client = createZapierApi({
+                credentials: clientCredentials,
+                baseUrl: "https://api.custom.zapier.dev",
+                debug: false,
+            });
+            await expect(client.get("/test")).rejects.toThrow();
+            expect(mockInvalidateCredentialsToken).toHaveBeenCalledWith({
+                credentials: clientCredentials,
+                token: undefined,
+            });
+        });
+        it("should not invalidate cache on 403 response", async () => {
+            mockResolveAuthToken.mockResolvedValue("test-token");
+            global.fetch = vi.fn().mockResolvedValue({
+                ok: false,
+                status: 403,
+                statusText: "Forbidden",
+                json: () => Promise.resolve({ message: "Access denied" }),
+            });
+            const client = createZapierApi({
+                credentials: "test-token",
+                baseUrl: "https://api.custom.zapier.dev",
+                debug: false,
+            });
+            await expect(client.get("/test")).rejects.toThrow();
+            expect(mockInvalidateCredentialsToken).not.toHaveBeenCalled();
+        });
+    });
 });

package/dist/api/index.d.ts

@@ -7,6 +7,7 @@
  */
 export type { ApiClient, ApiClientOptions, RequestOptions, PollOptions, DebugLogger, Action, Field, Choice, ActionExecutionResult, ActionField, ActionFieldChoice, NeedsRequest, NeedsResponse, Authentication, AuthenticationsResponse, Implementation, ImplementationsResponse, } from "./types";
 import type { ApiClient } from "./types";
+import type { Credentials } from "../types/credentials";
 export { isJwt, getAuthorizationHeader } from "./auth";
 export { createDebugLogger, createDebugFetch } from "./debug";
 export { pollUntilComplete } from "./polling";
@@ -20,9 +21,9 @@ export declare function generateRequestId(): string;
  */
 export declare function getOrCreateApiClient(config: {
     baseUrl?: string;
-    authBaseUrl?: string;
+    credentials?: Credentials;
+    /** @deprecated Use `credentials` instead */
     token?: string;
-    getToken?: () => Promise<string | undefined>;
     api?: ApiClient;
     debug?: boolean;
     fetch?: typeof globalThis.fetch;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,YAAY,EAEV,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,WAAW,EAEX,MAAM,EACN,KAAK,EACL,MAAM,EACN,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,cAAc,EACd,uBAAuB,GACxB,MAAM,SAAS,CAAC;AAGjB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIzC,OAAO,EAAE,KAAK,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAGvD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7C,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC,GAAG,SAAS,CAwBZ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,YAAY,EAEV,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,WAAW,EAEX,MAAM,EACN,KAAK,EACL,MAAM,EACN,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,cAAc,EACd,uBAAuB,GACxB,MAAM,SAAS,CAAC;AAGjB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAIxD,OAAO,EAAE,KAAK,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAGvD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC,GAAG,SAAS,CAsBZ"}

package/dist/api/index.js

@@ -27,16 +27,15 @@ export function generateRequestId() {
  * @returns ApiClient instance
  */
 export function getOrCreateApiClient(config) {
-    const { baseUrl = ZAPIER_BASE_URL, authBaseUrl, token, getToken, api: providedApi, debug = false, fetch: customFetch, } = config;
+    const { baseUrl = ZAPIER_BASE_URL, credentials, token, api: providedApi, debug = false, fetch: customFetch, } = config;
     // Use provided API client or create a new one
     if (providedApi) {
         return providedApi;
     }
     return createZapierApi({
         baseUrl,
-        authBaseUrl,
+        credentials,
         token,
-        getToken,
         debug,
         fetch: customFetch,
     });

package/dist/api/schemas.d.ts

@@ -42,6 +42,7 @@ export declare const NeedSchema: z.ZodObject<{
     type: z.ZodOptional<z.ZodEnum<{
         string: "string";
         boolean: "boolean";
+        filter: "filter";
         file: "file";
         integer: "integer";
         text: "text";
@@ -51,7 +52,6 @@ export declare const NeedSchema: z.ZodObject<{
         password: "password";
         dict: "dict";
         code: "code";
-        filter: "filter";
         json: "json";
     }>>;
     list: z.ZodOptional<z.ZodBoolean>;
@@ -65,8 +65,8 @@ export declare const ActionPermissionsSchema: z.ZodObject<{
 export declare const ActionSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodString>;
     type: z.ZodEnum<{
-        search: "search";
         filter: "filter";
+        search: "search";
         read: "read";
         read_bulk: "read_bulk";
         run: "run";
@@ -286,6 +286,7 @@ export declare const NeedsResponseSchema: z.ZodObject<{
         type: z.ZodOptional<z.ZodEnum<{
             string: "string";
             boolean: "boolean";
+            filter: "filter";
             file: "file";
             integer: "integer";
             text: "text";
@@ -295,7 +296,6 @@ export declare const NeedsResponseSchema: z.ZodObject<{
             password: "password";
             dict: "dict";
             code: "code";
-            filter: "filter";
             json: "json";
         }>>;
         list: z.ZodOptional<z.ZodBoolean>;
@@ -312,8 +312,8 @@ export declare const ImplementationSchema: z.ZodObject<{
     actions: z.ZodOptional<z.ZodArray<z.ZodObject<{
         id: z.ZodOptional<z.ZodString>;
         type: z.ZodEnum<{
-            search: "search";
             filter: "filter";
+            search: "search";
             read: "read";
             read_bulk: "read_bulk";
             run: "run";
@@ -354,8 +354,8 @@ export declare const ImplementationsResponseSchema: z.ZodObject<{
         actions: z.ZodOptional<z.ZodArray<z.ZodObject<{
             id: z.ZodOptional<z.ZodString>;
             type: z.ZodEnum<{
-                search: "search";
                 filter: "filter";
+                search: "search";
                 read: "read";
                 read_bulk: "read_bulk";
                 run: "run";

package/dist/api/types.d.ts

@@ -11,14 +11,19 @@
 import type { AuthenticationSchema, AuthenticationsResponseSchema } from "@zapier/zapier-sdk-core/v0/schemas/authentications";
 import type { ImplementationMetaSchema, ImplementationsMetaResponseSchema } from "@zapier/zapier-sdk-core/v0/schemas/implementations";
 import type { SdkEvent } from "../types/events";
+import type { Credentials } from "../types/credentials";
 import type { z } from "zod";
 import type { NeedChoicesSchema, NeedSchema, ActionLinksSchema, ActionPermissionsSchema, ActionSchema, ChoiceSchema, FieldSchema, ActionExecutionResultSchema, ActionFieldChoiceSchema, ActionFieldSchema, UserProfileSchema, AppSchema, NeedsRequestSchema, NeedsResponseSchema, ImplementationSchema, ImplementationsResponseSchema, ServiceSchema, ServicesResponseSchema, NeedChoicesRequestSchema, NeedChoicesResponseSchema, NeedChoicesResponseMetaSchema, NeedChoicesResponseLinksSchema } from "./schemas";
 export interface ApiClientOptions {
     baseUrl: string;
-    authBaseUrl?: string;
-    authClientId?: string;
+    /**
+     * Authentication credentials.
+     */
+    credentials?: Credentials;
+    /**
+     * @deprecated Use `credentials` instead.
+     */
     token?: string;
-    getToken?: () => Promise<string | undefined>;
     debug?: boolean;
     fetch?: typeof globalThis.fetch;
     onEvent?: (event: SdkEvent) => void;

package/dist/api/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/api/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/api/types.ts"],"names":[],"mappings":"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"}

package/dist/auth.d.ts

@@ -2,51 +2,79 @@
  * SDK Authentication Utilities
  *
  * This module provides SDK-level authentication utilities focused
- * solely on token acquisition. CLI-specific functionality like login/logout
- * is handled by the @zapier/zapier-sdk-cli-login package.
+ * on token acquisition. It uses the credentials system for resolution
+ * and handles different credential types appropriately.
+ *
+ * CLI-specific functionality like login/logout is handled by the
+ * @zapier/zapier-sdk-cli-login package.
  */
 import type { EventCallback } from "./types/events";
+import type { Credentials } from "./types/credentials";
 export type { SdkEvent, AuthEvent, ApiEvent, LoadingEvent, EventCallback, } from "./types/events";
-export interface AuthOptions {
+export type { Credentials, ResolvedCredentials, CredentialsObject, ClientCredentialsObject, PkceCredentialsObject, } from "./types/credentials";
+export { isClientCredentials, isPkceCredentials, isCredentialsObject, isCredentialsFunction, } from "./types/credentials";
+/**
+ * Options for resolving auth tokens.
+ */
+export interface ResolveAuthTokenOptions {
+    credentials?: Credentials;
+    /** @deprecated Use `credentials` instead */
+    token?: string;
     onEvent?: EventCallback;
     fetch?: typeof globalThis.fetch;
     baseUrl?: string;
-    authBaseUrl?: string;
-    authClientId?: string;
-}
-export interface ResolveAuthTokenOptions extends AuthOptions {
-    token?: string;
-    getToken?: () => Promise<string | undefined> | string | undefined;
 }
 /**
- * Gets the ZAPIER_TOKEN from environment variables.
- * Returns undefined if not set.
+ * Clear the token cache. Useful for testing or forcing re-authentication.
+ */
+export declare function clearTokenCache(): void;
+/**
+ * Invalidate a cached token. Called when we get a 401 response.
+ */
+export declare function invalidateCachedToken(clientId: string): void;
+/**
+ * Options for getTokenFromCliLogin.
  */
-export declare function getTokenFromEnv(): string | undefined;
+interface CliLoginOptions {
+    onEvent?: EventCallback;
+    fetch?: typeof globalThis.fetch;
+    credentials?: {
+        type?: "pkce";
+        clientId: string;
+        baseUrl?: string;
+        scope?: string;
+    };
+}
 /**
  * Attempts to get a token by optionally importing from CLI login package.
  * This provides a graceful fallback when the CLI login package is not available.
  *
  * Returns undefined if no valid token is found or CLI package is not available.
  */
-export declare function getTokenFromCliLogin(options?: AuthOptions): Promise<string | undefined>;
+export declare function getTokenFromCliLogin(options: CliLoginOptions): Promise<string | undefined>;
 /**
- * Attempts to get a token with the following precedence:
- * 1. ZAPIER_TOKEN environment variable
- * 2. CLI login package (if available) with auto-refresh
+ * Resolves an auth token from wherever it can be found.
  *
- * Returns undefined if no valid token is found.
- */
-export declare function getTokenFromEnvOrConfig(options?: AuthOptions): Promise<string | undefined>;
-/**
- * Resolves an auth token from all possible sources with the following precedence:
- * 1. Explicitly provided token in options
- * 2. Token from getToken callback in options
- * 3. ZAPIER_TOKEN environment variable
- * 4. CLI login package (if available)
+ * Resolution order:
+ * 1. Explicit credentials option (or deprecated token option)
+ * 2. Environment variables
+ * 3. CLI login package (if available)
+ *
+ * For different credential types:
+ * - String: Used directly as the token
+ * - Client credentials: Exchanged for an access token (with caching)
+ * - PKCE: Delegates to CLI login (throws if not available)
  *
- * This is the canonical token resolution logic used throughout the SDK.
  * Returns undefined if no valid token is found.
  */
 export declare function resolveAuthToken(options?: ResolveAuthTokenOptions): Promise<string | undefined>;
+/**
+ * Invalidate the cached token for the given credentials, if applicable.
+ * This is called when we receive a 401 response, indicating the token
+ * is no longer valid. Only affects client_credentials flow tokens.
+ */
+export declare function invalidateCredentialsToken(options: {
+    credentials?: Credentials;
+    token?: string;
+}): Promise<void>;
 //# sourceMappingURL=auth.d.ts.map

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpD,YAAY,EACV,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,aAAa,GACd,MAAM,gBAAgB,CAAC;AAGxB,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAwB,SAAQ,WAAW;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC;CACnE;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,MAAM,GAAG,SAAS,CAEpD;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,GAAE,WAAgB,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS7B;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,GAAE,WAAgB,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAS7B;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAgB7B"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AAM5E,YAAY,EACV,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,aAAa,GACd,MAAM,gBAAgB,CAAC;AAGxB,YAAY,EACV,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAsBD;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAoCD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE5D;AAsFD;;GAEG;AACH,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,WAAW,CAAC,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAiB7B;AAuED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhB"}