@zapier/zapier-sdk 0.32.5 → 0.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +1 -0
- package/dist/constants.d.ts +0 -14
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +0 -14
- package/dist/credentials.d.ts.map +1 -1
- package/dist/credentials.js +19 -20
- package/dist/index.cjs +22 -37
- package/dist/index.d.mts +1 -15
- package/dist/index.mjs +23 -30
- package/dist/plugins/eventEmission/index.test.js +8 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @zapier/zapier-sdk
|
|
2
2
|
|
|
3
|
+
## 0.33.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- f442359: Credential env vars (ZAPIER_CREDENTIALS, ZAPIER_CREDENTIALS_CLIENT_ID, ZAPIER_CREDENTIALS_CLIENT_SECRET, ZAPIER_CREDENTIALS_BASE_URL, ZAPIER_CREDENTIALS_SCOPE) are now read at call time rather than at import time. If you set or modify these env vars after importing the SDK, the updated values will now be picked up correctly. Also fixes baseUrl not being passed through when calling resolveAuthToken with an explicit baseUrl option.
|
|
8
|
+
|
|
3
9
|
## 0.32.5
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
package/dist/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;IACjB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA+BD;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAItC;AA0CD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EAAE,GACf,IAAI,CAIN;AA6HD;;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;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAGD,KAAK,cAAc,GAAG,cAAc,8BAA8B,CAAC,CAAC;AAmCpE;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAE3D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,GAAG,SAAS,CAGzD;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK7B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,
|
|
1
|
+
{"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;IACjB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA+BD;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAItC;AA0CD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EAAE,GACf,IAAI,CAIN;AA6HD;;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;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAGD,KAAK,cAAc,GAAG,cAAc,8BAA8B,CAAC,CAAC;AAmCpE;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAE3D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,GAAG,SAAS,CAGzD;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAK7B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B;AA6ED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhB"}
|
package/dist/auth.js
CHANGED
|
@@ -249,6 +249,7 @@ export async function resolveAuthToken(options = {}) {
|
|
|
249
249
|
const credentials = await resolveCredentials({
|
|
250
250
|
credentials: options.credentials,
|
|
251
251
|
token: options.token,
|
|
252
|
+
baseUrl: options.baseUrl,
|
|
252
253
|
});
|
|
253
254
|
// If we got credentials, process them based on type
|
|
254
255
|
if (credentials !== undefined) {
|
package/dist/constants.d.ts
CHANGED
|
@@ -15,23 +15,9 @@ export declare const MAX_PAGE_LIMIT = 10000;
|
|
|
15
15
|
* Default timeout for action execution (in milliseconds)
|
|
16
16
|
*/
|
|
17
17
|
export declare const DEFAULT_ACTION_TIMEOUT_MS = 180000;
|
|
18
|
-
/**
|
|
19
|
-
* Credentials from environment variables
|
|
20
|
-
*/
|
|
21
|
-
export declare const ZAPIER_CREDENTIALS: string | undefined;
|
|
22
|
-
export declare const ZAPIER_CREDENTIALS_CLIENT_ID: string | undefined;
|
|
23
|
-
export declare const ZAPIER_CREDENTIALS_CLIENT_SECRET: string | undefined;
|
|
24
|
-
export declare const ZAPIER_CREDENTIALS_BASE_URL: string | undefined;
|
|
25
|
-
export declare const ZAPIER_CREDENTIALS_SCOPE: string | undefined;
|
|
26
18
|
/**
|
|
27
19
|
* Network retry configuration from environment variables
|
|
28
20
|
*/
|
|
29
21
|
export declare const ZAPIER_MAX_NETWORK_RETRIES: number;
|
|
30
22
|
export declare const ZAPIER_MAX_NETWORK_RETRY_DELAY_MS: number;
|
|
31
|
-
/**
|
|
32
|
-
* Deprecated environment variables (kept for backwards compatibility)
|
|
33
|
-
*/
|
|
34
|
-
export declare const ZAPIER_TOKEN: string | undefined;
|
|
35
|
-
export declare const ZAPIER_AUTH_BASE_URL: string | undefined;
|
|
36
|
-
export declare const ZAPIER_AUTH_CLIENT_ID: string | undefined;
|
|
37
23
|
//# sourceMappingURL=constants.d.ts.map
|
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,eAAO,MAAM,eAAe,QACyB,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,cAAc,QAAQ,CAAC;AAEpC;;GAEG;AACH,eAAO,MAAM,yBAAyB,SAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,eAAO,MAAM,eAAe,QACyB,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,cAAc,QAAQ,CAAC;AAEpC;;GAEG;AACH,eAAO,MAAM,yBAAyB,SAAU,CAAC;AAejD;;GAEG;AACH,eAAO,MAAM,0BAA0B,QACY,CAAC;AACpD,eAAO,MAAM,iCAAiC,QACiB,CAAC"}
|
package/dist/constants.js
CHANGED
|
@@ -15,14 +15,6 @@ export const MAX_PAGE_LIMIT = 10000;
|
|
|
15
15
|
* Default timeout for action execution (in milliseconds)
|
|
16
16
|
*/
|
|
17
17
|
export const DEFAULT_ACTION_TIMEOUT_MS = 180000;
|
|
18
|
-
/**
|
|
19
|
-
* Credentials from environment variables
|
|
20
|
-
*/
|
|
21
|
-
export const ZAPIER_CREDENTIALS = process.env.ZAPIER_CREDENTIALS;
|
|
22
|
-
export const ZAPIER_CREDENTIALS_CLIENT_ID = process.env.ZAPIER_CREDENTIALS_CLIENT_ID;
|
|
23
|
-
export const ZAPIER_CREDENTIALS_CLIENT_SECRET = process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET;
|
|
24
|
-
export const ZAPIER_CREDENTIALS_BASE_URL = process.env.ZAPIER_CREDENTIALS_BASE_URL;
|
|
25
|
-
export const ZAPIER_CREDENTIALS_SCOPE = process.env.ZAPIER_CREDENTIALS_SCOPE;
|
|
26
18
|
function parseIntEnvVar(name) {
|
|
27
19
|
const value = process.env[name];
|
|
28
20
|
if (value === undefined)
|
|
@@ -39,9 +31,3 @@ function parseIntEnvVar(name) {
|
|
|
39
31
|
*/
|
|
40
32
|
export const ZAPIER_MAX_NETWORK_RETRIES = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRIES") ?? 3;
|
|
41
33
|
export const ZAPIER_MAX_NETWORK_RETRY_DELAY_MS = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRY_DELAY_MS") ?? 60000;
|
|
42
|
-
/**
|
|
43
|
-
* Deprecated environment variables (kept for backwards compatibility)
|
|
44
|
-
*/
|
|
45
|
-
export const ZAPIER_TOKEN = process.env.ZAPIER_TOKEN;
|
|
46
|
-
export const ZAPIER_AUTH_BASE_URL = process.env.ZAPIER_AUTH_BASE_URL;
|
|
47
|
-
export const ZAPIER_AUTH_CLIENT_ID = process.env.ZAPIER_AUTH_CLIENT_ID;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,mBAAmB,EAEpB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,mBAAmB,EAEpB,MAAM,qBAAqB,CAAC;AAY7B;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAqDD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,CAAC,EAAE,MAAM,GAClB,mBAAmB,GAAG,SAAS,CAyDjC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAkD1C;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,mBAAmB,GAAG,SAAS,GAC3C,MAAM,GAAG,SAAS,CAKpB;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,mBAAmB,GAAG,SAAS,GAC3C,MAAM,GAAG,SAAS,CAKpB"}
|
package/dist/credentials.js
CHANGED
|
@@ -10,7 +10,6 @@
|
|
|
10
10
|
import { isCredentialsFunction, isCredentialsObject, } from "./types/credentials";
|
|
11
11
|
import { logDeprecation } from "./utils/logging";
|
|
12
12
|
import { getZapierBaseUrl } from "./utils/url-utils";
|
|
13
|
-
import { ZAPIER_CREDENTIALS, ZAPIER_CREDENTIALS_CLIENT_ID, ZAPIER_CREDENTIALS_CLIENT_SECRET, ZAPIER_CREDENTIALS_BASE_URL, ZAPIER_CREDENTIALS_SCOPE, ZAPIER_TOKEN, ZAPIER_AUTH_BASE_URL, ZAPIER_AUTH_CLIENT_ID, } from "./constants";
|
|
14
13
|
/**
|
|
15
14
|
* Derive the auth base URL from the SDK base URL.
|
|
16
15
|
* Returns the Zapier root domain (e.g., https://zapier.com from https://api.zapier.com).
|
|
@@ -28,9 +27,9 @@ function normalizeCredentialsObject(obj, sdkBaseUrl) {
|
|
|
28
27
|
// Build defaults from env vars for optional fields, then override with explicit credentials.
|
|
29
28
|
// clientId is required in CredentialsObject so it always comes from obj.
|
|
30
29
|
const merged = {
|
|
31
|
-
clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
32
|
-
baseUrl: ZAPIER_CREDENTIALS_BASE_URL,
|
|
33
|
-
scope: ZAPIER_CREDENTIALS_SCOPE,
|
|
30
|
+
clientSecret: process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
31
|
+
baseUrl: process.env.ZAPIER_CREDENTIALS_BASE_URL,
|
|
32
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE,
|
|
34
33
|
...obj,
|
|
35
34
|
};
|
|
36
35
|
// Derive baseUrl from SDK if still not set
|
|
@@ -66,45 +65,45 @@ function normalizeCredentialsObject(obj, sdkBaseUrl) {
|
|
|
66
65
|
*/
|
|
67
66
|
export function resolveCredentialsFromEnv(sdkBaseUrl) {
|
|
68
67
|
// 1. Check ZAPIER_CREDENTIALS (string token only)
|
|
69
|
-
if (ZAPIER_CREDENTIALS) {
|
|
70
|
-
return ZAPIER_CREDENTIALS;
|
|
68
|
+
if (process.env.ZAPIER_CREDENTIALS) {
|
|
69
|
+
return process.env.ZAPIER_CREDENTIALS;
|
|
71
70
|
}
|
|
72
71
|
// 2. Check ZAPIER_CREDENTIALS_* individual vars
|
|
73
|
-
if (ZAPIER_CREDENTIALS_CLIENT_ID) {
|
|
74
|
-
const resolvedBaseUrl = ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
72
|
+
if (process.env.ZAPIER_CREDENTIALS_CLIENT_ID) {
|
|
73
|
+
const resolvedBaseUrl = process.env.ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
75
74
|
// Infer type from presence of clientSecret
|
|
76
|
-
if (ZAPIER_CREDENTIALS_CLIENT_SECRET) {
|
|
75
|
+
if (process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET) {
|
|
77
76
|
return {
|
|
78
77
|
type: "client_credentials",
|
|
79
|
-
clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
80
|
-
clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
78
|
+
clientId: process.env.ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
79
|
+
clientSecret: process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
81
80
|
baseUrl: resolvedBaseUrl,
|
|
82
|
-
scope: ZAPIER_CREDENTIALS_SCOPE,
|
|
81
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE,
|
|
83
82
|
};
|
|
84
83
|
}
|
|
85
84
|
else {
|
|
86
85
|
return {
|
|
87
86
|
type: "pkce",
|
|
88
|
-
clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
87
|
+
clientId: process.env.ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
89
88
|
baseUrl: resolvedBaseUrl,
|
|
90
|
-
scope: ZAPIER_CREDENTIALS_SCOPE,
|
|
89
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE,
|
|
91
90
|
};
|
|
92
91
|
}
|
|
93
92
|
}
|
|
94
93
|
// 3. Check deprecated env vars (with warnings)
|
|
95
|
-
if (ZAPIER_TOKEN) {
|
|
94
|
+
if (process.env.ZAPIER_TOKEN) {
|
|
96
95
|
logDeprecation("ZAPIER_TOKEN is deprecated. Use ZAPIER_CREDENTIALS instead.");
|
|
97
|
-
return ZAPIER_TOKEN;
|
|
96
|
+
return process.env.ZAPIER_TOKEN;
|
|
98
97
|
}
|
|
99
|
-
if (ZAPIER_AUTH_CLIENT_ID) {
|
|
98
|
+
if (process.env.ZAPIER_AUTH_CLIENT_ID) {
|
|
100
99
|
logDeprecation("ZAPIER_AUTH_CLIENT_ID is deprecated. Use ZAPIER_CREDENTIALS_CLIENT_ID instead.");
|
|
101
|
-
if (ZAPIER_AUTH_BASE_URL) {
|
|
100
|
+
if (process.env.ZAPIER_AUTH_BASE_URL) {
|
|
102
101
|
logDeprecation("ZAPIER_AUTH_BASE_URL is deprecated. Use ZAPIER_CREDENTIALS_BASE_URL instead.");
|
|
103
102
|
}
|
|
104
|
-
const resolvedBaseUrl = ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
103
|
+
const resolvedBaseUrl = process.env.ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
105
104
|
return {
|
|
106
105
|
type: "pkce",
|
|
107
|
-
clientId: ZAPIER_AUTH_CLIENT_ID,
|
|
106
|
+
clientId: process.env.ZAPIER_AUTH_CLIENT_ID,
|
|
108
107
|
baseUrl: resolvedBaseUrl,
|
|
109
108
|
};
|
|
110
109
|
}
|
package/dist/index.cjs
CHANGED
|
@@ -65,11 +65,6 @@ function isPositional(schema) {
|
|
|
65
65
|
var ZAPIER_BASE_URL = process.env.ZAPIER_BASE_URL || "https://zapier.com";
|
|
66
66
|
var MAX_PAGE_LIMIT = 1e4;
|
|
67
67
|
var DEFAULT_ACTION_TIMEOUT_MS = 18e4;
|
|
68
|
-
var ZAPIER_CREDENTIALS = process.env.ZAPIER_CREDENTIALS;
|
|
69
|
-
var ZAPIER_CREDENTIALS_CLIENT_ID = process.env.ZAPIER_CREDENTIALS_CLIENT_ID;
|
|
70
|
-
var ZAPIER_CREDENTIALS_CLIENT_SECRET = process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET;
|
|
71
|
-
var ZAPIER_CREDENTIALS_BASE_URL = process.env.ZAPIER_CREDENTIALS_BASE_URL;
|
|
72
|
-
var ZAPIER_CREDENTIALS_SCOPE = process.env.ZAPIER_CREDENTIALS_SCOPE;
|
|
73
68
|
function parseIntEnvVar(name) {
|
|
74
69
|
const value = process.env[name];
|
|
75
70
|
if (value === void 0) return void 0;
|
|
@@ -84,9 +79,6 @@ function parseIntEnvVar(name) {
|
|
|
84
79
|
}
|
|
85
80
|
var ZAPIER_MAX_NETWORK_RETRIES = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRIES") ?? 3;
|
|
86
81
|
var ZAPIER_MAX_NETWORK_RETRY_DELAY_MS = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRY_DELAY_MS") ?? 6e4;
|
|
87
|
-
var ZAPIER_TOKEN = process.env.ZAPIER_TOKEN;
|
|
88
|
-
var ZAPIER_AUTH_BASE_URL = process.env.ZAPIER_AUTH_BASE_URL;
|
|
89
|
-
var ZAPIER_AUTH_CLIENT_ID = process.env.ZAPIER_AUTH_CLIENT_ID;
|
|
90
82
|
|
|
91
83
|
// src/types/properties.ts
|
|
92
84
|
var AppKeyPropertySchema = withPositional(
|
|
@@ -4073,9 +4065,9 @@ function deriveAuthBaseUrl(sdkBaseUrl) {
|
|
|
4073
4065
|
}
|
|
4074
4066
|
function normalizeCredentialsObject(obj, sdkBaseUrl) {
|
|
4075
4067
|
const merged = {
|
|
4076
|
-
clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4077
|
-
baseUrl: ZAPIER_CREDENTIALS_BASE_URL,
|
|
4078
|
-
scope: ZAPIER_CREDENTIALS_SCOPE,
|
|
4068
|
+
clientSecret: process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4069
|
+
baseUrl: process.env.ZAPIER_CREDENTIALS_BASE_URL,
|
|
4070
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE,
|
|
4079
4071
|
...obj
|
|
4080
4072
|
};
|
|
4081
4073
|
const resolvedBaseUrl = merged.baseUrl || deriveAuthBaseUrl(sdkBaseUrl);
|
|
@@ -4096,47 +4088,47 @@ function normalizeCredentialsObject(obj, sdkBaseUrl) {
|
|
|
4096
4088
|
};
|
|
4097
4089
|
}
|
|
4098
4090
|
function resolveCredentialsFromEnv(sdkBaseUrl) {
|
|
4099
|
-
if (ZAPIER_CREDENTIALS) {
|
|
4100
|
-
return ZAPIER_CREDENTIALS;
|
|
4091
|
+
if (process.env.ZAPIER_CREDENTIALS) {
|
|
4092
|
+
return process.env.ZAPIER_CREDENTIALS;
|
|
4101
4093
|
}
|
|
4102
|
-
if (ZAPIER_CREDENTIALS_CLIENT_ID) {
|
|
4103
|
-
const resolvedBaseUrl = ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4104
|
-
if (ZAPIER_CREDENTIALS_CLIENT_SECRET) {
|
|
4094
|
+
if (process.env.ZAPIER_CREDENTIALS_CLIENT_ID) {
|
|
4095
|
+
const resolvedBaseUrl = process.env.ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4096
|
+
if (process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET) {
|
|
4105
4097
|
return {
|
|
4106
4098
|
type: "client_credentials",
|
|
4107
|
-
clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4108
|
-
clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4099
|
+
clientId: process.env.ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4100
|
+
clientSecret: process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4109
4101
|
baseUrl: resolvedBaseUrl,
|
|
4110
|
-
scope: ZAPIER_CREDENTIALS_SCOPE
|
|
4102
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE
|
|
4111
4103
|
};
|
|
4112
4104
|
} else {
|
|
4113
4105
|
return {
|
|
4114
4106
|
type: "pkce",
|
|
4115
|
-
clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4107
|
+
clientId: process.env.ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4116
4108
|
baseUrl: resolvedBaseUrl,
|
|
4117
|
-
scope: ZAPIER_CREDENTIALS_SCOPE
|
|
4109
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE
|
|
4118
4110
|
};
|
|
4119
4111
|
}
|
|
4120
4112
|
}
|
|
4121
|
-
if (ZAPIER_TOKEN) {
|
|
4113
|
+
if (process.env.ZAPIER_TOKEN) {
|
|
4122
4114
|
logDeprecation(
|
|
4123
4115
|
"ZAPIER_TOKEN is deprecated. Use ZAPIER_CREDENTIALS instead."
|
|
4124
4116
|
);
|
|
4125
|
-
return ZAPIER_TOKEN;
|
|
4117
|
+
return process.env.ZAPIER_TOKEN;
|
|
4126
4118
|
}
|
|
4127
|
-
if (ZAPIER_AUTH_CLIENT_ID) {
|
|
4119
|
+
if (process.env.ZAPIER_AUTH_CLIENT_ID) {
|
|
4128
4120
|
logDeprecation(
|
|
4129
4121
|
"ZAPIER_AUTH_CLIENT_ID is deprecated. Use ZAPIER_CREDENTIALS_CLIENT_ID instead."
|
|
4130
4122
|
);
|
|
4131
|
-
if (ZAPIER_AUTH_BASE_URL) {
|
|
4123
|
+
if (process.env.ZAPIER_AUTH_BASE_URL) {
|
|
4132
4124
|
logDeprecation(
|
|
4133
4125
|
"ZAPIER_AUTH_BASE_URL is deprecated. Use ZAPIER_CREDENTIALS_BASE_URL instead."
|
|
4134
4126
|
);
|
|
4135
4127
|
}
|
|
4136
|
-
const resolvedBaseUrl = ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4128
|
+
const resolvedBaseUrl = process.env.ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4137
4129
|
return {
|
|
4138
4130
|
type: "pkce",
|
|
4139
|
-
clientId: ZAPIER_AUTH_CLIENT_ID,
|
|
4131
|
+
clientId: process.env.ZAPIER_AUTH_CLIENT_ID,
|
|
4140
4132
|
baseUrl: resolvedBaseUrl
|
|
4141
4133
|
};
|
|
4142
4134
|
}
|
|
@@ -4335,7 +4327,8 @@ async function getTokenFromCliLogin(options) {
|
|
|
4335
4327
|
async function resolveAuthToken(options = {}) {
|
|
4336
4328
|
const credentials = await resolveCredentials({
|
|
4337
4329
|
credentials: options.credentials,
|
|
4338
|
-
token: options.token
|
|
4330
|
+
token: options.token,
|
|
4331
|
+
baseUrl: options.baseUrl
|
|
4339
4332
|
});
|
|
4340
4333
|
if (credentials !== void 0) {
|
|
4341
4334
|
return resolveAuthTokenFromCredentials(credentials, options);
|
|
@@ -5519,7 +5512,7 @@ function getCpuTime() {
|
|
|
5519
5512
|
}
|
|
5520
5513
|
|
|
5521
5514
|
// src/plugins/eventEmission/builders.ts
|
|
5522
|
-
var SDK_VERSION = "0.
|
|
5515
|
+
var SDK_VERSION = "0.33.0";
|
|
5523
5516
|
function createBaseEvent(context = {}) {
|
|
5524
5517
|
return {
|
|
5525
5518
|
event_id: generateEventId(),
|
|
@@ -6061,17 +6054,9 @@ exports.PkceCredentialsObjectSchema = PkceCredentialsObjectSchema;
|
|
|
6061
6054
|
exports.RelayFetchSchema = RelayFetchSchema;
|
|
6062
6055
|
exports.RelayRequestSchema = RelayRequestSchema;
|
|
6063
6056
|
exports.ResolvedCredentialsSchema = ResolvedCredentialsSchema;
|
|
6064
|
-
exports.ZAPIER_AUTH_BASE_URL = ZAPIER_AUTH_BASE_URL;
|
|
6065
|
-
exports.ZAPIER_AUTH_CLIENT_ID = ZAPIER_AUTH_CLIENT_ID;
|
|
6066
6057
|
exports.ZAPIER_BASE_URL = ZAPIER_BASE_URL;
|
|
6067
|
-
exports.ZAPIER_CREDENTIALS = ZAPIER_CREDENTIALS;
|
|
6068
|
-
exports.ZAPIER_CREDENTIALS_BASE_URL = ZAPIER_CREDENTIALS_BASE_URL;
|
|
6069
|
-
exports.ZAPIER_CREDENTIALS_CLIENT_ID = ZAPIER_CREDENTIALS_CLIENT_ID;
|
|
6070
|
-
exports.ZAPIER_CREDENTIALS_CLIENT_SECRET = ZAPIER_CREDENTIALS_CLIENT_SECRET;
|
|
6071
|
-
exports.ZAPIER_CREDENTIALS_SCOPE = ZAPIER_CREDENTIALS_SCOPE;
|
|
6072
6058
|
exports.ZAPIER_MAX_NETWORK_RETRIES = ZAPIER_MAX_NETWORK_RETRIES;
|
|
6073
6059
|
exports.ZAPIER_MAX_NETWORK_RETRY_DELAY_MS = ZAPIER_MAX_NETWORK_RETRY_DELAY_MS;
|
|
6074
|
-
exports.ZAPIER_TOKEN = ZAPIER_TOKEN;
|
|
6075
6060
|
exports.ZapierActionError = ZapierActionError;
|
|
6076
6061
|
exports.ZapierApiError = ZapierApiError;
|
|
6077
6062
|
exports.ZapierAppNotFoundError = ZapierAppNotFoundError;
|
package/dist/index.d.mts
CHANGED
|
@@ -2768,25 +2768,11 @@ declare const MAX_PAGE_LIMIT = 10000;
|
|
|
2768
2768
|
* Default timeout for action execution (in milliseconds)
|
|
2769
2769
|
*/
|
|
2770
2770
|
declare const DEFAULT_ACTION_TIMEOUT_MS = 180000;
|
|
2771
|
-
/**
|
|
2772
|
-
* Credentials from environment variables
|
|
2773
|
-
*/
|
|
2774
|
-
declare const ZAPIER_CREDENTIALS: string | undefined;
|
|
2775
|
-
declare const ZAPIER_CREDENTIALS_CLIENT_ID: string | undefined;
|
|
2776
|
-
declare const ZAPIER_CREDENTIALS_CLIENT_SECRET: string | undefined;
|
|
2777
|
-
declare const ZAPIER_CREDENTIALS_BASE_URL: string | undefined;
|
|
2778
|
-
declare const ZAPIER_CREDENTIALS_SCOPE: string | undefined;
|
|
2779
2771
|
/**
|
|
2780
2772
|
* Network retry configuration from environment variables
|
|
2781
2773
|
*/
|
|
2782
2774
|
declare const ZAPIER_MAX_NETWORK_RETRIES: number;
|
|
2783
2775
|
declare const ZAPIER_MAX_NETWORK_RETRY_DELAY_MS: number;
|
|
2784
|
-
/**
|
|
2785
|
-
* Deprecated environment variables (kept for backwards compatibility)
|
|
2786
|
-
*/
|
|
2787
|
-
declare const ZAPIER_TOKEN: string | undefined;
|
|
2788
|
-
declare const ZAPIER_AUTH_BASE_URL: string | undefined;
|
|
2789
|
-
declare const ZAPIER_AUTH_CLIENT_ID: string | undefined;
|
|
2790
2776
|
|
|
2791
2777
|
interface ZapierSdkOptions extends BaseSdkOptions {
|
|
2792
2778
|
}
|
|
@@ -2973,4 +2959,4 @@ declare function createZapierSdkWithoutRegistry(options?: ZapierSdkOptions): Sdk
|
|
|
2973
2959
|
}>;
|
|
2974
2960
|
declare function createZapierSdk(options?: ZapierSdkOptions): ZapierSdk;
|
|
2975
2961
|
|
|
2976
|
-
export { type Action, type ActionEntry, type ActionExecutionOptions, type ActionExecutionResult, type ActionField, type ActionFieldChoice, type ActionItem$1 as ActionItem, type ActionKeyProperty, ActionKeyPropertySchema, type ActionTimeoutMsProperty, ActionTimeoutMsPropertySchema, type ActionTypeProperty, ActionTypePropertySchema, type AddActionEntryOptions, type AddActionEntryResult, type ApiError, type ApiEvent, type ApiPluginOptions, type ApiPluginProvides, type App, type AppItem, type AppKeyProperty, AppKeyPropertySchema, type ApplicationLifecycleEventData, type AppsPluginProvides, type AuthEvent, type AuthenticationIdProperty, AuthenticationIdPropertySchema, type BaseEvent, BaseSdkOptionsSchema, type BatchOptions, type Choice, type ClientCredentialsObject, ClientCredentialsObjectSchema, type Connection, type ConnectionIdProperty, ConnectionIdPropertySchema, type ConnectionItem, type ConnectionsResponse, type CreateClientCredentialsPluginProvides, type Credentials, type CredentialsFunction, CredentialsFunctionSchema, type CredentialsObject, CredentialsObjectSchema, CredentialsSchema, DEFAULT_ACTION_TIMEOUT_MS, DEFAULT_CONFIG_PATH, type DebugProperty, DebugPropertySchema, type DeleteClientCredentialsPluginProvides, type DynamicResolver, type EnhancedErrorEventData, type ErrorOptions, type EventCallback, type EventContext, type EventEmissionContext, type FetchPluginProvides, type Field, type FieldsResolver, type FieldsetItem, type FindFirstAuthenticationPluginProvides, type FindFirstConnectionPluginProvides, type FindUniqueAuthenticationPluginProvides, type FindUniqueConnectionPluginProvides, type FormatMetadata, type FormattedItem, type FunctionOptions, type FunctionRegistryEntry, type GetActionPluginProvides, type GetAppPluginProvides, type GetAuthenticationPluginProvides, type GetConnectionPluginProvides, type GetContextType, type GetProfilePluginProvides, type GetSdkType, type InfoFieldItem, type InputFieldItem, type InputsProperty, InputsPropertySchema, type LimitProperty, LimitPropertySchema, type ListActionsPluginProvides, type ListAppsPluginProvides, type ListAuthenticationsPluginProvides, type ListClientCredentialsPluginProvides, type ListConnectionsPluginProvides, type ListInputFieldsPluginProvides, type LoadingEvent, MAX_PAGE_LIMIT, type Manifest, type ManifestEntry, type ManifestPluginOptions, type ManifestPluginProvides, type MethodCalledEvent, type MethodCalledEventData, type Need, type NeedsRequest, type NeedsResponse, type OffsetProperty, OffsetPropertySchema, type OutputProperty, OutputPropertySchema, type PaginatedSdkFunction, type ParamsProperty, ParamsPropertySchema, type PkceCredentialsObject, PkceCredentialsObjectSchema, type Plugin, type PluginDependencies, type PluginOptions, type PluginProvides, type PositionalMetadata, type RateLimitInfo, RelayFetchSchema, RelayRequestSchema, type RequestPluginProvides, type ResolveAuthTokenOptions, type ResolveCredentialsOptions, type ResolvedCredentials, ResolvedCredentialsSchema, type Resolver, type RootFieldItem, type RunActionPluginProvides, type Sdk, type SdkEvent, type StaticResolver, type UpdateManifestEntryOptions, type UpdateManifestEntryResult, type UserProfile, type UserProfileItem,
|
|
2962
|
+
export { type Action, type ActionEntry, type ActionExecutionOptions, type ActionExecutionResult, type ActionField, type ActionFieldChoice, type ActionItem$1 as ActionItem, type ActionKeyProperty, ActionKeyPropertySchema, type ActionTimeoutMsProperty, ActionTimeoutMsPropertySchema, type ActionTypeProperty, ActionTypePropertySchema, type AddActionEntryOptions, type AddActionEntryResult, type ApiError, type ApiEvent, type ApiPluginOptions, type ApiPluginProvides, type App, type AppItem, type AppKeyProperty, AppKeyPropertySchema, type ApplicationLifecycleEventData, type AppsPluginProvides, type AuthEvent, type AuthenticationIdProperty, AuthenticationIdPropertySchema, type BaseEvent, BaseSdkOptionsSchema, type BatchOptions, type Choice, type ClientCredentialsObject, ClientCredentialsObjectSchema, type Connection, type ConnectionIdProperty, ConnectionIdPropertySchema, type ConnectionItem, type ConnectionsResponse, type CreateClientCredentialsPluginProvides, type Credentials, type CredentialsFunction, CredentialsFunctionSchema, type CredentialsObject, CredentialsObjectSchema, CredentialsSchema, DEFAULT_ACTION_TIMEOUT_MS, DEFAULT_CONFIG_PATH, type DebugProperty, DebugPropertySchema, type DeleteClientCredentialsPluginProvides, type DynamicResolver, type EnhancedErrorEventData, type ErrorOptions, type EventCallback, type EventContext, type EventEmissionContext, type FetchPluginProvides, type Field, type FieldsResolver, type FieldsetItem, type FindFirstAuthenticationPluginProvides, type FindFirstConnectionPluginProvides, type FindUniqueAuthenticationPluginProvides, type FindUniqueConnectionPluginProvides, type FormatMetadata, type FormattedItem, type FunctionOptions, type FunctionRegistryEntry, type GetActionPluginProvides, type GetAppPluginProvides, type GetAuthenticationPluginProvides, type GetConnectionPluginProvides, type GetContextType, type GetProfilePluginProvides, type GetSdkType, type InfoFieldItem, type InputFieldItem, type InputsProperty, InputsPropertySchema, type LimitProperty, LimitPropertySchema, type ListActionsPluginProvides, type ListAppsPluginProvides, type ListAuthenticationsPluginProvides, type ListClientCredentialsPluginProvides, type ListConnectionsPluginProvides, type ListInputFieldsPluginProvides, type LoadingEvent, MAX_PAGE_LIMIT, type Manifest, type ManifestEntry, type ManifestPluginOptions, type ManifestPluginProvides, type MethodCalledEvent, type MethodCalledEventData, type Need, type NeedsRequest, type NeedsResponse, type OffsetProperty, OffsetPropertySchema, type OutputProperty, OutputPropertySchema, type PaginatedSdkFunction, type ParamsProperty, ParamsPropertySchema, type PkceCredentialsObject, PkceCredentialsObjectSchema, type Plugin, type PluginDependencies, type PluginOptions, type PluginProvides, type PositionalMetadata, type RateLimitInfo, RelayFetchSchema, RelayRequestSchema, type RequestPluginProvides, type ResolveAuthTokenOptions, type ResolveCredentialsOptions, type ResolvedCredentials, ResolvedCredentialsSchema, type Resolver, type RootFieldItem, type RunActionPluginProvides, type Sdk, type SdkEvent, type StaticResolver, type UpdateManifestEntryOptions, type UpdateManifestEntryResult, type UserProfile, type UserProfileItem, ZAPIER_BASE_URL, ZAPIER_MAX_NETWORK_RETRIES, ZAPIER_MAX_NETWORK_RETRY_DELAY_MS, ZapierActionError, ZapierApiError, ZapierAppNotFoundError, ZapierAuthenticationError, ZapierBundleError, ZapierConfigurationError, ZapierError, type ZapierFetchInitOptions, ZapierNotFoundError, ZapierRateLimitError, ZapierRelayError, ZapierResourceNotFoundError, type ZapierSdk, type ZapierSdkApps, type ZapierSdkOptions, ZapierTimeoutError, ZapierUnknownError, ZapierValidationError, actionKeyResolver, actionTypeResolver, apiPlugin, appKeyResolver, appsPlugin, connectionIdGenericResolver as authenticationIdGenericResolver, connectionIdResolver as authenticationIdResolver, batch, buildApplicationLifecycleEvent, buildErrorEvent, buildErrorEventWithContext, buildMethodCalledEvent, clearTokenCache, clientCredentialsNameResolver, clientIdResolver, connectionIdGenericResolver, connectionIdResolver, createBaseEvent, createClientCredentialsPlugin, createFunction, createSdk, createZapierSdk, createZapierSdkWithoutRegistry, deleteClientCredentialsPlugin, fetchPlugin, findFirstConnectionPlugin, findManifestEntry, findUniqueConnectionPlugin, formatErrorMessage, generateEventId, getActionPlugin, getAppPlugin, getBaseUrlFromCredentials, getCiPlatform, getClientIdFromCredentials, getConnectionPlugin, getCpuTime, getCurrentTimestamp, getMemoryUsage, getOsInfo, getPlatformVersions, getPreferredManifestEntryKey, getProfilePlugin, getReleaseId, getTokenFromCliLogin, injectCliLogin, inputFieldKeyResolver, inputsAllOptionalResolver, inputsResolver, invalidateCachedToken, invalidateCredentialsToken, isCi, isCliLoginAvailable, isClientCredentials, isCredentialsFunction, isCredentialsObject, isPkceCredentials, isPositional, listActionsPlugin, listAppsPlugin, listClientCredentialsPlugin, listConnectionsPlugin, listInputFieldsPlugin, logDeprecation, manifestPlugin, readManifestFromFile, registryPlugin, requestPlugin, resetDeprecationWarnings, resolveAuthToken, resolveCredentials, resolveCredentialsFromEnv, runActionPlugin, toSnakeCase, toTitleCase };
|
package/dist/index.mjs
CHANGED
|
@@ -43,11 +43,6 @@ function isPositional(schema) {
|
|
|
43
43
|
var ZAPIER_BASE_URL = process.env.ZAPIER_BASE_URL || "https://zapier.com";
|
|
44
44
|
var MAX_PAGE_LIMIT = 1e4;
|
|
45
45
|
var DEFAULT_ACTION_TIMEOUT_MS = 18e4;
|
|
46
|
-
var ZAPIER_CREDENTIALS = process.env.ZAPIER_CREDENTIALS;
|
|
47
|
-
var ZAPIER_CREDENTIALS_CLIENT_ID = process.env.ZAPIER_CREDENTIALS_CLIENT_ID;
|
|
48
|
-
var ZAPIER_CREDENTIALS_CLIENT_SECRET = process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET;
|
|
49
|
-
var ZAPIER_CREDENTIALS_BASE_URL = process.env.ZAPIER_CREDENTIALS_BASE_URL;
|
|
50
|
-
var ZAPIER_CREDENTIALS_SCOPE = process.env.ZAPIER_CREDENTIALS_SCOPE;
|
|
51
46
|
function parseIntEnvVar(name) {
|
|
52
47
|
const value = process.env[name];
|
|
53
48
|
if (value === void 0) return void 0;
|
|
@@ -62,9 +57,6 @@ function parseIntEnvVar(name) {
|
|
|
62
57
|
}
|
|
63
58
|
var ZAPIER_MAX_NETWORK_RETRIES = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRIES") ?? 3;
|
|
64
59
|
var ZAPIER_MAX_NETWORK_RETRY_DELAY_MS = parseIntEnvVar("ZAPIER_MAX_NETWORK_RETRY_DELAY_MS") ?? 6e4;
|
|
65
|
-
var ZAPIER_TOKEN = process.env.ZAPIER_TOKEN;
|
|
66
|
-
var ZAPIER_AUTH_BASE_URL = process.env.ZAPIER_AUTH_BASE_URL;
|
|
67
|
-
var ZAPIER_AUTH_CLIENT_ID = process.env.ZAPIER_AUTH_CLIENT_ID;
|
|
68
60
|
|
|
69
61
|
// src/types/properties.ts
|
|
70
62
|
var AppKeyPropertySchema = withPositional(
|
|
@@ -4051,9 +4043,9 @@ function deriveAuthBaseUrl(sdkBaseUrl) {
|
|
|
4051
4043
|
}
|
|
4052
4044
|
function normalizeCredentialsObject(obj, sdkBaseUrl) {
|
|
4053
4045
|
const merged = {
|
|
4054
|
-
clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4055
|
-
baseUrl: ZAPIER_CREDENTIALS_BASE_URL,
|
|
4056
|
-
scope: ZAPIER_CREDENTIALS_SCOPE,
|
|
4046
|
+
clientSecret: process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4047
|
+
baseUrl: process.env.ZAPIER_CREDENTIALS_BASE_URL,
|
|
4048
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE,
|
|
4057
4049
|
...obj
|
|
4058
4050
|
};
|
|
4059
4051
|
const resolvedBaseUrl = merged.baseUrl || deriveAuthBaseUrl(sdkBaseUrl);
|
|
@@ -4074,47 +4066,47 @@ function normalizeCredentialsObject(obj, sdkBaseUrl) {
|
|
|
4074
4066
|
};
|
|
4075
4067
|
}
|
|
4076
4068
|
function resolveCredentialsFromEnv(sdkBaseUrl) {
|
|
4077
|
-
if (ZAPIER_CREDENTIALS) {
|
|
4078
|
-
return ZAPIER_CREDENTIALS;
|
|
4069
|
+
if (process.env.ZAPIER_CREDENTIALS) {
|
|
4070
|
+
return process.env.ZAPIER_CREDENTIALS;
|
|
4079
4071
|
}
|
|
4080
|
-
if (ZAPIER_CREDENTIALS_CLIENT_ID) {
|
|
4081
|
-
const resolvedBaseUrl = ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4082
|
-
if (ZAPIER_CREDENTIALS_CLIENT_SECRET) {
|
|
4072
|
+
if (process.env.ZAPIER_CREDENTIALS_CLIENT_ID) {
|
|
4073
|
+
const resolvedBaseUrl = process.env.ZAPIER_CREDENTIALS_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4074
|
+
if (process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET) {
|
|
4083
4075
|
return {
|
|
4084
4076
|
type: "client_credentials",
|
|
4085
|
-
clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4086
|
-
clientSecret: ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4077
|
+
clientId: process.env.ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4078
|
+
clientSecret: process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET,
|
|
4087
4079
|
baseUrl: resolvedBaseUrl,
|
|
4088
|
-
scope: ZAPIER_CREDENTIALS_SCOPE
|
|
4080
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE
|
|
4089
4081
|
};
|
|
4090
4082
|
} else {
|
|
4091
4083
|
return {
|
|
4092
4084
|
type: "pkce",
|
|
4093
|
-
clientId: ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4085
|
+
clientId: process.env.ZAPIER_CREDENTIALS_CLIENT_ID,
|
|
4094
4086
|
baseUrl: resolvedBaseUrl,
|
|
4095
|
-
scope: ZAPIER_CREDENTIALS_SCOPE
|
|
4087
|
+
scope: process.env.ZAPIER_CREDENTIALS_SCOPE
|
|
4096
4088
|
};
|
|
4097
4089
|
}
|
|
4098
4090
|
}
|
|
4099
|
-
if (ZAPIER_TOKEN) {
|
|
4091
|
+
if (process.env.ZAPIER_TOKEN) {
|
|
4100
4092
|
logDeprecation(
|
|
4101
4093
|
"ZAPIER_TOKEN is deprecated. Use ZAPIER_CREDENTIALS instead."
|
|
4102
4094
|
);
|
|
4103
|
-
return ZAPIER_TOKEN;
|
|
4095
|
+
return process.env.ZAPIER_TOKEN;
|
|
4104
4096
|
}
|
|
4105
|
-
if (ZAPIER_AUTH_CLIENT_ID) {
|
|
4097
|
+
if (process.env.ZAPIER_AUTH_CLIENT_ID) {
|
|
4106
4098
|
logDeprecation(
|
|
4107
4099
|
"ZAPIER_AUTH_CLIENT_ID is deprecated. Use ZAPIER_CREDENTIALS_CLIENT_ID instead."
|
|
4108
4100
|
);
|
|
4109
|
-
if (ZAPIER_AUTH_BASE_URL) {
|
|
4101
|
+
if (process.env.ZAPIER_AUTH_BASE_URL) {
|
|
4110
4102
|
logDeprecation(
|
|
4111
4103
|
"ZAPIER_AUTH_BASE_URL is deprecated. Use ZAPIER_CREDENTIALS_BASE_URL instead."
|
|
4112
4104
|
);
|
|
4113
4105
|
}
|
|
4114
|
-
const resolvedBaseUrl = ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4106
|
+
const resolvedBaseUrl = process.env.ZAPIER_AUTH_BASE_URL || deriveAuthBaseUrl(sdkBaseUrl);
|
|
4115
4107
|
return {
|
|
4116
4108
|
type: "pkce",
|
|
4117
|
-
clientId: ZAPIER_AUTH_CLIENT_ID,
|
|
4109
|
+
clientId: process.env.ZAPIER_AUTH_CLIENT_ID,
|
|
4118
4110
|
baseUrl: resolvedBaseUrl
|
|
4119
4111
|
};
|
|
4120
4112
|
}
|
|
@@ -4313,7 +4305,8 @@ async function getTokenFromCliLogin(options) {
|
|
|
4313
4305
|
async function resolveAuthToken(options = {}) {
|
|
4314
4306
|
const credentials = await resolveCredentials({
|
|
4315
4307
|
credentials: options.credentials,
|
|
4316
|
-
token: options.token
|
|
4308
|
+
token: options.token,
|
|
4309
|
+
baseUrl: options.baseUrl
|
|
4317
4310
|
});
|
|
4318
4311
|
if (credentials !== void 0) {
|
|
4319
4312
|
return resolveAuthTokenFromCredentials(credentials, options);
|
|
@@ -5497,7 +5490,7 @@ function getCpuTime() {
|
|
|
5497
5490
|
}
|
|
5498
5491
|
|
|
5499
5492
|
// src/plugins/eventEmission/builders.ts
|
|
5500
|
-
var SDK_VERSION = "0.
|
|
5493
|
+
var SDK_VERSION = "0.33.0";
|
|
5501
5494
|
function createBaseEvent(context = {}) {
|
|
5502
5495
|
return {
|
|
5503
5496
|
event_id: generateEventId(),
|
|
@@ -6015,4 +6008,4 @@ var BaseSdkOptionsSchema = z.object({
|
|
|
6015
6008
|
// Use credentials instead
|
|
6016
6009
|
});
|
|
6017
6010
|
|
|
6018
|
-
export { ActionKeyPropertySchema, ActionTimeoutMsPropertySchema, ActionTypePropertySchema, AppKeyPropertySchema, AuthenticationIdPropertySchema, BaseSdkOptionsSchema, ClientCredentialsObjectSchema, ConnectionIdPropertySchema, CredentialsFunctionSchema, CredentialsObjectSchema, CredentialsSchema, DEFAULT_ACTION_TIMEOUT_MS, DEFAULT_CONFIG_PATH, DebugPropertySchema, InputsPropertySchema, LimitPropertySchema, MAX_PAGE_LIMIT, OffsetPropertySchema, OutputPropertySchema, ParamsPropertySchema, PkceCredentialsObjectSchema, RelayFetchSchema, RelayRequestSchema, ResolvedCredentialsSchema,
|
|
6011
|
+
export { ActionKeyPropertySchema, ActionTimeoutMsPropertySchema, ActionTypePropertySchema, AppKeyPropertySchema, AuthenticationIdPropertySchema, BaseSdkOptionsSchema, ClientCredentialsObjectSchema, ConnectionIdPropertySchema, CredentialsFunctionSchema, CredentialsObjectSchema, CredentialsSchema, DEFAULT_ACTION_TIMEOUT_MS, DEFAULT_CONFIG_PATH, DebugPropertySchema, InputsPropertySchema, LimitPropertySchema, MAX_PAGE_LIMIT, OffsetPropertySchema, OutputPropertySchema, ParamsPropertySchema, PkceCredentialsObjectSchema, RelayFetchSchema, RelayRequestSchema, ResolvedCredentialsSchema, ZAPIER_BASE_URL, ZAPIER_MAX_NETWORK_RETRIES, ZAPIER_MAX_NETWORK_RETRY_DELAY_MS, ZapierActionError, ZapierApiError, ZapierAppNotFoundError, ZapierAuthenticationError, ZapierBundleError, ZapierConfigurationError, ZapierError, ZapierNotFoundError, ZapierRateLimitError, ZapierRelayError, ZapierResourceNotFoundError, ZapierTimeoutError, ZapierUnknownError, ZapierValidationError, actionKeyResolver, actionTypeResolver, apiPlugin, appKeyResolver, appsPlugin, connectionIdGenericResolver as authenticationIdGenericResolver, connectionIdResolver as authenticationIdResolver, batch, buildApplicationLifecycleEvent, buildErrorEvent, buildErrorEventWithContext, buildMethodCalledEvent, clearTokenCache, clientCredentialsNameResolver, clientIdResolver, connectionIdGenericResolver, connectionIdResolver, createBaseEvent, createClientCredentialsPlugin, createFunction, createSdk, createZapierSdk, createZapierSdkWithoutRegistry, deleteClientCredentialsPlugin, fetchPlugin, findFirstConnectionPlugin, findManifestEntry, findUniqueConnectionPlugin, formatErrorMessage, generateEventId, getActionPlugin, getAppPlugin, getBaseUrlFromCredentials, getCiPlatform, getClientIdFromCredentials, getConnectionPlugin, getCpuTime, getCurrentTimestamp, getMemoryUsage, getOsInfo, getPlatformVersions, getPreferredManifestEntryKey, getProfilePlugin, getReleaseId, getTokenFromCliLogin, injectCliLogin, inputFieldKeyResolver, inputsAllOptionalResolver, inputsResolver, invalidateCachedToken, invalidateCredentialsToken, isCi, isCliLoginAvailable, isClientCredentials, isCredentialsFunction, isCredentialsObject, isPkceCredentials, isPositional, listActionsPlugin, listAppsPlugin, listClientCredentialsPlugin, listConnectionsPlugin, listInputFieldsPlugin, logDeprecation, manifestPlugin, readManifestFromFile, registryPlugin, requestPlugin, resetDeprecationWarnings, resolveAuthToken, resolveCredentials, resolveCredentialsFromEnv, runActionPlugin, toSnakeCase, toTitleCase };
|
|
@@ -29,6 +29,14 @@ describe("eventEmissionPlugin", () => {
|
|
|
29
29
|
clearTokenCache();
|
|
30
30
|
// Reset to default behavior - no token available
|
|
31
31
|
mockGetToken.mockResolvedValue(undefined);
|
|
32
|
+
delete process.env.ZAPIER_CREDENTIALS;
|
|
33
|
+
delete process.env.ZAPIER_CREDENTIALS_CLIENT_ID;
|
|
34
|
+
delete process.env.ZAPIER_CREDENTIALS_CLIENT_SECRET;
|
|
35
|
+
delete process.env.ZAPIER_CREDENTIALS_BASE_URL;
|
|
36
|
+
delete process.env.ZAPIER_CREDENTIALS_SCOPE;
|
|
37
|
+
delete process.env.ZAPIER_TOKEN;
|
|
38
|
+
delete process.env.ZAPIER_AUTH_CLIENT_ID;
|
|
39
|
+
delete process.env.ZAPIER_AUTH_BASE_URL;
|
|
32
40
|
});
|
|
33
41
|
it("should create plugin with default configuration", () => {
|
|
34
42
|
const plugin = eventEmissionPlugin({
|