n8n-core 2.26.2 → 2.27.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/dist/binary-data/binary-data.service.js +2 -2
- package/dist/binary-data/binary-data.service.js.map +1 -1
- package/dist/binary-data/index.d.ts +1 -1
- package/dist/binary-data/index.js +1 -2
- package/dist/binary-data/index.js.map +1 -1
- package/dist/binary-data/object-store/object-store.service.ee.d.ts +2 -1
- package/dist/binary-data/object-store/object-store.service.ee.js +37 -16
- package/dist/binary-data/object-store/object-store.service.ee.js.map +1 -1
- package/dist/binary-data/object-store.manager.js +2 -2
- package/dist/binary-data/object-store.manager.js.map +1 -1
- package/dist/binary-data/utils.d.ts +1 -3
- package/dist/binary-data/utils.js +0 -20
- package/dist/binary-data/utils.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/credentials.js +1 -1
- package/dist/credentials.js.map +1 -1
- package/dist/execution-engine/active-workflow-triggers.d.ts +30 -0
- package/dist/execution-engine/active-workflow-triggers.js +272 -0
- package/dist/execution-engine/active-workflow-triggers.js.map +1 -0
- package/dist/execution-engine/index.d.ts +12 -11
- package/dist/execution-engine/index.js +14 -13
- package/dist/execution-engine/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/base-execute-context.d.ts +2 -2
- package/dist/execution-engine/node-execution-context/base-execute-context.js +3 -3
- package/dist/execution-engine/node-execution-context/base-execute-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/execute-context.js +2 -2
- package/dist/execution-engine/node-execution-context/execute-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/execute-single-context.js +1 -1
- package/dist/execution-engine/node-execution-context/execute-single-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/hook-context.js +2 -2
- package/dist/execution-engine/node-execution-context/hook-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/index.d.ts +1 -1
- package/dist/execution-engine/node-execution-context/index.js +2 -2
- package/dist/execution-engine/node-execution-context/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/node-execution-context.d.ts +3 -3
- package/dist/execution-engine/node-execution-context/node-execution-context.js +2 -2
- package/dist/execution-engine/node-execution-context/node-execution-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/poll-context.js +2 -2
- package/dist/execution-engine/node-execution-context/poll-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/trigger-context.js +3 -3
- package/dist/execution-engine/node-execution-context/trigger-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/binary-helper-functions.d.ts +0 -1
- package/dist/execution-engine/node-execution-context/utils/binary-helper-functions.js +4 -15
- package/dist/execution-engine/node-execution-context/utils/binary-helper-functions.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/extract-value.js +10 -8
- package/dist/execution-engine/node-execution-context/utils/extract-value.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js +1 -1
- package/dist/execution-engine/node-execution-context/utils/get-input-connection-data.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/normalize-items.js +3 -3
- package/dist/execution-engine/node-execution-context/utils/normalize-items.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/authentication.js +5 -5
- package/dist/execution-engine/node-execution-context/utils/request-helpers/authentication.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/factory.js +2 -2
- package/dist/execution-engine/node-execution-context/utils/request-helpers/factory.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/index.d.ts +0 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/index.js +2 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.d.ts +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.js +18 -22
- package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/oauth.js +19 -11
- package/dist/execution-engine/node-execution-context/utils/request-helpers/oauth.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/pagination.js +4 -5
- package/dist/execution-engine/node-execution-context/utils/request-helpers/pagination.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/webhook-helper-functions.js +7 -4
- package/dist/execution-engine/node-execution-context/utils/webhook-helper-functions.js.map +1 -1
- package/dist/execution-engine/node-execution-context/webhook-context.d.ts +2 -1
- package/dist/execution-engine/node-execution-context/webhook-context.js +11 -4
- package/dist/execution-engine/node-execution-context/webhook-context.js.map +1 -1
- package/dist/execution-engine/scheduled-task-manager.d.ts +5 -1
- package/dist/execution-engine/scheduled-task-manager.js +42 -1
- package/dist/execution-engine/scheduled-task-manager.js.map +1 -1
- package/dist/execution-engine/ssh-clients-manager.js +1 -1
- package/dist/execution-engine/ssh-clients-manager.js.map +1 -1
- package/dist/execution-engine/triggers-and-pollers.js +3 -3
- package/dist/execution-engine/triggers-and-pollers.js.map +1 -1
- package/dist/execution-engine/workflow-active-triggers-state.d.ts +11 -0
- package/dist/execution-engine/workflow-active-triggers-state.js +31 -0
- package/dist/execution-engine/workflow-active-triggers-state.js.map +1 -0
- package/dist/execution-engine/workflow-execute.d.ts +2 -0
- package/dist/execution-engine/workflow-execute.js +45 -18
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/dist/index.d.ts +0 -2
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/instance-settings/instance-settings.js +1 -1
- package/dist/instance-settings/instance-settings.js.map +1 -1
- package/dist/interfaces.d.ts +1 -4
- package/dist/nodes-loader/directory-loader.js +4 -2
- package/dist/nodes-loader/directory-loader.js.map +1 -1
- package/dist/nodes-loader/package-directory-loader.js +1 -1
- package/dist/nodes-loader/package-directory-loader.js.map +1 -1
- package/dist/storage.config.d.ts +3 -3
- package/dist/storage.config.js +3 -2
- package/dist/storage.config.js.map +1 -1
- package/package.json +15 -21
- package/dist/execution-engine/active-workflows.d.ts +0 -26
- package/dist/execution-engine/active-workflows.js +0 -180
- package/dist/execution-engine/active-workflows.js.map +0 -1
- package/dist/execution-engine/node-execution-context/utils/parse-incoming-message.d.ts +0 -16
- package/dist/execution-engine/node-execution-context/utils/parse-incoming-message.js +0 -75
- package/dist/execution-engine/node-execution-context/utils/parse-incoming-message.js.map +0 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/axios-config.d.ts +0 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/axios-config.js +0 -35
- package/dist/execution-engine/node-execution-context/utils/request-helpers/axios-config.js.map +0 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/axios-utils.d.ts +0 -24
- package/dist/execution-engine/node-execution-context/utils/request-helpers/axios-utils.js +0 -257
- package/dist/execution-engine/node-execution-context/utils/request-helpers/axios-utils.js.map +0 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/http-request.d.ts +0 -7
- package/dist/execution-engine/node-execution-context/utils/request-helpers/http-request.js +0 -146
- package/dist/execution-engine/node-execution-context/utils/request-helpers/http-request.js.map +0 -1
- package/dist/execution-engine/node-execution-context/utils/request-helpers/outbound-user-agent.d.ts +0 -4
- package/dist/execution-engine/node-execution-context/utils/request-helpers/outbound-user-agent.js +0 -40
- package/dist/execution-engine/node-execution-context/utils/request-helpers/outbound-user-agent.js.map +0 -1
- package/dist/http-proxy.d.ts +0 -6
- package/dist/http-proxy.js +0 -109
- package/dist/http-proxy.js.map +0 -1
- package/dist/ssrf/dns-resolver.d.ts +0 -13
- package/dist/ssrf/dns-resolver.js +0 -93
- package/dist/ssrf/dns-resolver.js.map +0 -1
- package/dist/ssrf/hostname-matcher.d.ts +0 -6
- package/dist/ssrf/hostname-matcher.js +0 -38
- package/dist/ssrf/hostname-matcher.js.map +0 -1
- package/dist/ssrf/in-memory-dns-cache.service.d.ts +0 -11
- package/dist/ssrf/in-memory-dns-cache.service.js +0 -61
- package/dist/ssrf/in-memory-dns-cache.service.js.map +0 -1
- package/dist/ssrf/index.d.ts +0 -5
- package/dist/ssrf/index.js +0 -10
- package/dist/ssrf/index.js.map +0 -1
- package/dist/ssrf/ip-range-builder.d.ts +0 -10
- package/dist/ssrf/ip-range-builder.js +0 -52
- package/dist/ssrf/ip-range-builder.js.map +0 -1
- package/dist/ssrf/ssrf-blocked-ip.error.d.ts +0 -6
- package/dist/ssrf/ssrf-blocked-ip.error.js +0 -21
- package/dist/ssrf/ssrf-blocked-ip.error.js.map +0 -1
- package/dist/ssrf/ssrf-protection.service.d.ts +0 -30
- package/dist/ssrf/ssrf-protection.service.js +0 -159
- package/dist/ssrf/ssrf-protection.service.js.map +0 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getRequestHelperFunctions = void 0;
|
|
4
|
-
require("
|
|
4
|
+
const backend_network_1 = require("@n8n/backend-network");
|
|
5
|
+
(0, backend_network_1.configureGlobalAxiosDefaults)();
|
|
5
6
|
var factory_1 = require("./factory");
|
|
6
7
|
Object.defineProperty(exports, "getRequestHelperFunctions", { enumerable: true, get: function () { return factory_1.getRequestHelperFunctions; } });
|
|
7
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/index.ts"],"names":[],"mappings":";;;AAAA,0DAAoE;AAGpE,IAAA,8CAA4B,GAAE,CAAC;AAE/B,qCAAsD;AAA7C,oHAAA,yBAAyB,OAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { type SsrfBridge } from '@n8n/backend-network';
|
|
1
2
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
3
|
import type { INode, IRequestOptions, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow';
|
|
3
|
-
import type { SsrfBridge } from '../../../../ssrf';
|
|
4
4
|
export declare function parseRequestObject(requestObject: IRequestOptions, ssrfBridge?: SsrfBridge): Promise<AxiosRequestConfig<any>>;
|
|
5
5
|
export declare function proxyRequestToAxios(workflow: Workflow | undefined, additionalData: IWorkflowExecuteAdditionalData | undefined, node: INode | undefined, uriOrObject: string | IRequestOptions, options?: IRequestOptions): Promise<any>;
|
package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.parseRequestObject = parseRequestObject;
|
|
7
7
|
exports.proxyRequestToAxios = proxyRequestToAxios;
|
|
8
8
|
const backend_common_1 = require("@n8n/backend-common");
|
|
9
|
+
const backend_network_1 = require("@n8n/backend-network");
|
|
9
10
|
const di_1 = require("@n8n/di");
|
|
10
11
|
const crypto_1 = __importDefault(require("crypto"));
|
|
11
12
|
const http_1 = require("http");
|
|
@@ -13,11 +14,6 @@ const pick_1 = __importDefault(require("lodash/pick"));
|
|
|
13
14
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
15
|
const qs_1 = require("qs");
|
|
15
16
|
const stream_1 = require("stream");
|
|
16
|
-
const binary_helper_functions_1 = require("../binary-helper-functions");
|
|
17
|
-
const parse_incoming_message_1 = require("../parse-incoming-message");
|
|
18
|
-
const axios_utils_1 = require("./axios-utils");
|
|
19
|
-
const http_request_1 = require("./http-request");
|
|
20
|
-
const outbound_user_agent_1 = require("./outbound-user-agent");
|
|
21
17
|
async function parseRequestObject(requestObject, ssrfBridge) {
|
|
22
18
|
const axiosConfig = {};
|
|
23
19
|
if (requestObject.headers !== undefined) {
|
|
@@ -42,7 +38,7 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
42
38
|
}
|
|
43
39
|
}
|
|
44
40
|
else if (contentType?.includes('multipart/form-data')) {
|
|
45
|
-
if (requestObject.formData !== undefined && (0,
|
|
41
|
+
if (requestObject.formData !== undefined && (0, backend_network_1.isFormDataInstance)(requestObject.formData)) {
|
|
46
42
|
axiosConfig.data = requestObject.formData;
|
|
47
43
|
}
|
|
48
44
|
else {
|
|
@@ -50,12 +46,12 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
50
46
|
...requestObject.body,
|
|
51
47
|
...requestObject.formData,
|
|
52
48
|
};
|
|
53
|
-
axiosConfig.data = (0,
|
|
49
|
+
axiosConfig.data = (0, backend_network_1.createFormDataObject)(allData);
|
|
54
50
|
}
|
|
55
51
|
delete axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
56
52
|
const headers = axiosConfig.data.getHeaders();
|
|
57
53
|
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
58
|
-
await (0,
|
|
54
|
+
await (0, backend_network_1.generateContentLengthHeader)(axiosConfig);
|
|
59
55
|
}
|
|
60
56
|
else {
|
|
61
57
|
if (requestObject.form !== undefined && requestObject.body === undefined) {
|
|
@@ -64,7 +60,7 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
64
60
|
? (0, qs_1.stringify)(requestObject.form, { format: 'RFC3986' })
|
|
65
61
|
: (0, qs_1.stringify)(requestObject.form).toString();
|
|
66
62
|
if (axiosConfig.headers !== undefined) {
|
|
67
|
-
const headerName = (0,
|
|
63
|
+
const headerName = (0, backend_network_1.searchForHeader)(axiosConfig, 'content-type');
|
|
68
64
|
if (headerName) {
|
|
69
65
|
delete axiosConfig.headers[headerName];
|
|
70
66
|
}
|
|
@@ -85,15 +81,15 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
85
81
|
}
|
|
86
82
|
});
|
|
87
83
|
}
|
|
88
|
-
if ((0,
|
|
84
|
+
if ((0, backend_network_1.isFormDataInstance)(requestObject.formData)) {
|
|
89
85
|
axiosConfig.data = requestObject.formData;
|
|
90
86
|
}
|
|
91
87
|
else {
|
|
92
|
-
axiosConfig.data = (0,
|
|
88
|
+
axiosConfig.data = (0, backend_network_1.createFormDataObject)(requestObject.formData);
|
|
93
89
|
}
|
|
94
90
|
const headers = axiosConfig.data.getHeaders();
|
|
95
91
|
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
96
|
-
await (0,
|
|
92
|
+
await (0, backend_network_1.generateContentLengthHeader)(axiosConfig);
|
|
97
93
|
}
|
|
98
94
|
else if (requestObject.body !== undefined) {
|
|
99
95
|
if (requestObject.form !== undefined && requestObject.body) {
|
|
@@ -182,7 +178,7 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
182
178
|
else {
|
|
183
179
|
axiosConfig.maxRedirects = 0;
|
|
184
180
|
}
|
|
185
|
-
const host = (0,
|
|
181
|
+
const host = (0, backend_network_1.getHostFromRequestObject)(requestObject);
|
|
186
182
|
const agentOptions = { ...requestObject.agentOptions };
|
|
187
183
|
if (host) {
|
|
188
184
|
agentOptions.servername = host;
|
|
@@ -195,8 +191,8 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
195
191
|
axiosConfig.timeout = requestObject.timeout;
|
|
196
192
|
}
|
|
197
193
|
const secureLookup = ssrfBridge?.createSecureLookup();
|
|
198
|
-
(0,
|
|
199
|
-
axiosConfig.beforeRedirect = (0,
|
|
194
|
+
(0, backend_network_1.setAxiosAgents)(axiosConfig, agentOptions, requestObject.proxy, secureLookup);
|
|
195
|
+
axiosConfig.beforeRedirect = (0, backend_network_1.getBeforeRedirectFn)(agentOptions, axiosConfig, requestObject.proxy, requestObject.sendCredentialsOnCrossOriginRedirect ?? true, requestObject.allowedDomains, ssrfBridge);
|
|
200
196
|
if (requestObject.useStream) {
|
|
201
197
|
axiosConfig.responseType = 'stream';
|
|
202
198
|
}
|
|
@@ -219,7 +215,7 @@ async function parseRequestObject(requestObject, ssrfBridge) {
|
|
|
219
215
|
if (requestObject.simple === false) {
|
|
220
216
|
axiosConfig.validateStatus = () => true;
|
|
221
217
|
}
|
|
222
|
-
(0,
|
|
218
|
+
(0, backend_network_1.applyDefaultOutboundUserAgent)(axiosConfig);
|
|
223
219
|
return axiosConfig;
|
|
224
220
|
}
|
|
225
221
|
async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject, options) {
|
|
@@ -235,15 +231,15 @@ async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject,
|
|
|
235
231
|
configObject = uriOrObject ?? {};
|
|
236
232
|
}
|
|
237
233
|
const ssrfBridge = additionalData?.ssrfBridge;
|
|
238
|
-
const url = (0,
|
|
239
|
-
await (0,
|
|
234
|
+
const url = (0, backend_network_1.resolveLegacyRequestUrl)(configObject);
|
|
235
|
+
await (0, backend_network_1.validateUrlSsrf)(url, ssrfBridge);
|
|
240
236
|
axiosConfig = Object.assign(axiosConfig, await parseRequestObject(configObject, ssrfBridge));
|
|
241
|
-
(0,
|
|
237
|
+
(0, backend_network_1.throwIfDomainNotAllowed)(axiosConfig, configObject.allowedDomains);
|
|
242
238
|
try {
|
|
243
|
-
const response = await (0,
|
|
239
|
+
const response = await (0, backend_network_1.invokeAxios)(axiosConfig, configObject.auth);
|
|
244
240
|
let body = response.data;
|
|
245
241
|
if (body instanceof http_1.IncomingMessage && axiosConfig.responseType === 'stream') {
|
|
246
|
-
(0,
|
|
242
|
+
(0, backend_network_1.parseIncomingMessage)(body);
|
|
247
243
|
}
|
|
248
244
|
else if (body === '') {
|
|
249
245
|
body = axiosConfig.responseType === 'arraybuffer' ? Buffer.alloc(0) : undefined;
|
|
@@ -268,7 +264,7 @@ async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject,
|
|
|
268
264
|
di_1.Container.get(backend_common_1.Logger).debug('Request proxied to Axios failed', { status: response.status });
|
|
269
265
|
let responseData = response.data;
|
|
270
266
|
if (Buffer.isBuffer(responseData) || responseData instanceof stream_1.Readable) {
|
|
271
|
-
responseData = await (0,
|
|
267
|
+
responseData = await (0, backend_network_1.binaryToString)(responseData);
|
|
272
268
|
}
|
|
273
269
|
if (configObject.simple === false) {
|
|
274
270
|
if (configObject.resolveWithFullResponse) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-request-adapter.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"legacy-request-adapter.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.requestOAuth2 = requestOAuth2;
|
|
7
7
|
exports.requestOAuth1 = requestOAuth1;
|
|
8
8
|
exports.refreshOAuth2Token = refreshOAuth2Token;
|
|
9
|
+
const backend_network_1 = require("@n8n/backend-network");
|
|
9
10
|
const client_oauth2_1 = require("@n8n/client-oauth2");
|
|
10
11
|
const crypto_1 = require("crypto");
|
|
11
12
|
const get_1 = __importDefault(require("lodash/get"));
|
|
12
13
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
13
14
|
const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
|
|
14
|
-
const http_request_1 = require("./http-request");
|
|
15
15
|
function createOAuth2Client(credentials) {
|
|
16
16
|
const scopes = credentials.scope
|
|
17
17
|
?.split(' ')
|
|
@@ -76,6 +76,10 @@ async function refreshOrFetchToken(ctx) {
|
|
|
76
76
|
tokenRefreshOptions.headers = { Authorization: '' };
|
|
77
77
|
}
|
|
78
78
|
logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Revalidating.`);
|
|
79
|
+
const refreshResource = credentials.oauthTokenData?.resource;
|
|
80
|
+
if (typeof refreshResource === 'string' && refreshResource.length > 0) {
|
|
81
|
+
tokenRefreshOptions.resource = refreshResource;
|
|
82
|
+
}
|
|
79
83
|
let newToken;
|
|
80
84
|
try {
|
|
81
85
|
if (credentials.grantType === 'clientCredentials') {
|
|
@@ -92,7 +96,11 @@ async function refreshOrFetchToken(ctx) {
|
|
|
92
96
|
throw error;
|
|
93
97
|
}
|
|
94
98
|
logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
|
|
95
|
-
const
|
|
99
|
+
const newOAuthTokenData = { ...token.data, ...newToken.data };
|
|
100
|
+
if (!newOAuthTokenData.resource && token.data.resource) {
|
|
101
|
+
newOAuthTokenData.resource = token.data.resource;
|
|
102
|
+
}
|
|
103
|
+
const refreshedTokenData = await decryptOAuth2TokenDataIfConfigured(additionalData, newOAuthTokenData, credentials.jweEnabled === true);
|
|
96
104
|
credentials.oauthTokenData = refreshedTokenData;
|
|
97
105
|
const preAuthData = await additionalData.credentialsHelper.runPreAuthentication({ helpers }, credentials, credentialsType);
|
|
98
106
|
let signingToken = newToken;
|
|
@@ -101,7 +109,7 @@ async function refreshOrFetchToken(ctx) {
|
|
|
101
109
|
signingToken = buildSigningToken(token.client, credentials.oauthTokenData, oAuth2Options);
|
|
102
110
|
}
|
|
103
111
|
if (!node.credentials?.[credentialsType]) {
|
|
104
|
-
throw new n8n_workflow_1.
|
|
112
|
+
throw new n8n_workflow_1.UserError('Node does not have credential type', {
|
|
105
113
|
extra: { nodeName: node.name, credentialType: credentialsType },
|
|
106
114
|
});
|
|
107
115
|
}
|
|
@@ -113,10 +121,10 @@ function resolveTokenExpiredStatusCode(oAuth2Options, credentials) {
|
|
|
113
121
|
return credentials?.tokenExpiredStatusCode ?? oAuth2Options?.tokenExpiredStatusCode ?? 401;
|
|
114
122
|
}
|
|
115
123
|
async function requestOAuth2(credentialsType, requestOptions, node, additionalData, oAuth2Options, isN8nRequest = false) {
|
|
116
|
-
(0,
|
|
124
|
+
(0, backend_network_1.removeEmptyBody)(requestOptions);
|
|
117
125
|
const credentials = (await this.getCredentials(credentialsType));
|
|
118
126
|
if (credentials.grantType === 'authorizationCode' && credentials.oauthTokenData === undefined) {
|
|
119
|
-
throw new n8n_workflow_1.
|
|
127
|
+
throw new n8n_workflow_1.UserError('OAuth credentials not connected');
|
|
120
128
|
}
|
|
121
129
|
const oAuthClient = createOAuth2Client(credentials);
|
|
122
130
|
let oauthTokenData = credentials.oauthTokenData;
|
|
@@ -130,13 +138,13 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
|
|
|
130
138
|
}
|
|
131
139
|
catch (error) {
|
|
132
140
|
const message = error instanceof Error ? error.message : String(error);
|
|
133
|
-
throw new n8n_workflow_1.
|
|
141
|
+
throw new n8n_workflow_1.OperationalError(`Failed to acquire OAuth2 access token: ${message}`, {
|
|
134
142
|
cause: error,
|
|
135
143
|
});
|
|
136
144
|
}
|
|
137
145
|
const { data } = tokenResult;
|
|
138
146
|
if (!node.credentials?.[credentialsType]) {
|
|
139
|
-
throw new n8n_workflow_1.
|
|
147
|
+
throw new n8n_workflow_1.UserError('Node does not have credential type', {
|
|
140
148
|
extra: { nodeName: node.name },
|
|
141
149
|
tags: { credentialType: credentialsType },
|
|
142
150
|
});
|
|
@@ -215,13 +223,13 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
|
|
|
215
223
|
});
|
|
216
224
|
}
|
|
217
225
|
async function requestOAuth1(credentialsType, requestOptions, isN8nRequest = false) {
|
|
218
|
-
(0,
|
|
226
|
+
(0, backend_network_1.removeEmptyBody)(requestOptions);
|
|
219
227
|
const credentials = await this.getCredentials(credentialsType);
|
|
220
228
|
if (credentials === undefined) {
|
|
221
|
-
throw new n8n_workflow_1.
|
|
229
|
+
throw new n8n_workflow_1.UserError('No credentials were returned');
|
|
222
230
|
}
|
|
223
231
|
if (credentials.oauthTokenData === undefined) {
|
|
224
|
-
throw new n8n_workflow_1.
|
|
232
|
+
throw new n8n_workflow_1.UserError('OAuth credentials not connected');
|
|
225
233
|
}
|
|
226
234
|
const oauth = new oauth_1_0a_1.default({
|
|
227
235
|
consumer: {
|
|
@@ -268,7 +276,7 @@ async function requestOAuth1(credentialsType, requestOptions, isN8nRequest = fal
|
|
|
268
276
|
async function refreshOAuth2Token(credentialsType, node, additionalData, oAuth2Options) {
|
|
269
277
|
const credentials = (await this.getCredentials(credentialsType));
|
|
270
278
|
if (credentials.grantType === 'authorizationCode' && credentials.oauthTokenData === undefined) {
|
|
271
|
-
throw new n8n_workflow_1.
|
|
279
|
+
throw new n8n_workflow_1.UserError('OAuth credentials not connected');
|
|
272
280
|
}
|
|
273
281
|
const oAuthClient = createOAuth2Client(credentials);
|
|
274
282
|
const oauthTokenData = credentials.oauthTokenData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/oauth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/oauth.ts"],"names":[],"mappings":";;;;;AAoOA,sCA4JC;AAGD,sCAsEC;AAED,gDA8BC;AAneD,0DAAuD;AAQvD,sDAA6D;AAE7D,mCAAoC;AACpC,qDAA6B;AAY7B,+CAA0F;AAE1F,4DAAsC;AAItC,SAAS,kBAAkB,CAAC,WAAiC;IAE5D,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK;QAC/B,EAAE,KAAK,CAAC,GAAG,CAAC;SACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;IAClB,OAAO,IAAI,4BAAY,CAAC;QACvB,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,YAAY,EAAE,WAAW,CAAC,YAAY;QACtC,cAAc,EAAE,WAAW,CAAC,cAAc;QAC1C,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;QAC3C,eAAe,EAAE,WAAW,CAAC,eAAe;QAC5C,cAAc,EAAE,WAAW,CAAC,cAAc,IAAI,QAAQ;QACtD,GAAG,CAAC,WAAW,CAAC,wBAAwB,IAAI;YAC3C,wBAAwB,EAAE,IAAA,wBAAS,EAAC,WAAW,CAAC,wBAAwB,EAAE;gBACzE,aAAa,EAAE,EAAE;aACjB,CAAC;SACF,CAAC;KACF,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACzB,MAAoB,EACpB,SAAgC,EAChC,aAA8B;IAE9B,MAAM,WAAW,GAAG,IAAA,aAAG,EAAC,SAAS,EAAE,aAAa,EAAE,QAAkB,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC;IAC/F,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;IAC5C,OAAO,MAAM,CAAC,WAAW,CACxB;QACC,GAAG,SAAS;QACZ,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,EACD,aAAa,EAAE,SAAS,IAAI,SAAS,CAAC,SAAS,CAC/C,CAAC;AACH,CAAC;AAaD,KAAK,UAAU,kCAAkC,CAChD,cAA8C,EAC9C,SAAY,EACZ,UAAmB;IAEnB,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,EAAE,qBAAqB,CAAC;IACjE,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,OAAO,MAAM,KAAK,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAc;IAChD,IAAI,CAAC,CAAC,KAAK,YAAY,yBAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAuC,CAAC;IAC3D,OAAO,IAAI,EAAE,KAAK,KAAK,eAAe,CAAC;AACxC,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAW,EAAE,eAAuB;IACtE,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;IACjE,MAAM,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC,YAAY,eAAe,GAAG,CAAC;IAChG,OAAO,IAAI,iCAAkB,CAC5B,IAAI,EACJ,kBAAkB,eAAe,2BAA2B,EAC5D;QACC,WAAW,EACV,8MAA8M;QAC/M,KAAK,EAAE,SAAS;KAChB,CACD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,GAA8B;IAChE,MAAM,EACL,WAAW,EACX,KAAK,EACL,eAAe,EACf,IAAI,EACJ,cAAc,EACd,aAAa,EACb,MAAM,EACN,OAAO,GACP,GAAG,GAAG,CAAC;IACR,MAAM,mBAAmB,GAAgB,EAAE,CAAC;IAC5C,IAAI,aAAa,EAAE,iCAAiC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAgB;YACzB,SAAS,EAAE,WAAW,CAAC,QAAQ;YAC/B,GAAG,CAAC,WAAW,CAAC,SAAS,KAAK,mBAAmB,IAAI;gBACpD,aAAa,EAAE,WAAW,CAAC,YAAsB;aACjD,CAAC;SACF,CAAC;QACF,mBAAmB,CAAC,IAAI,GAAG,IAAI,CAAC;QAChC,mBAAmB,CAAC,OAAO,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,KAAK,CACX,qBAAqB,eAAe,mBAAmB,IAAI,CAAC,IAAI,0BAA0B,CAC1F,CAAC;IAEF,MAAM,eAAe,GAAG,WAAW,CAAC,cAAc,EAAE,QAAQ,CAAC;IAC7D,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvE,mBAAmB,CAAC,QAAQ,GAAG,eAAe,CAAC;IAChD,CAAC;IAED,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC;QACJ,IAAI,WAAW,CAAC,SAAS,KAAK,mBAAmB,EAAE,CAAC;YACnD,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACtD,CAAC;aAAM,CAAC;YACP,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,mBAAqD,CAAC,CAAC;QACvF,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,yBAAyB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,KAAK,CAAC;IACb,CAAC;IAED,MAAM,CAAC,KAAK,CACX,qBAAqB,eAAe,mBAAmB,IAAI,CAAC,IAAI,qBAAqB,CACrF,CAAC;IAKF,MAAM,iBAAiB,GAAG,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAI9D,IAAI,CAAC,iBAAiB,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxD,iBAAiB,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;IAClD,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,kCAAkC,CAClE,cAAc,EACd,iBAAiB,EACjB,WAAW,CAAC,UAAU,KAAK,IAAI,CAC/B,CAAC;IAEF,WAAW,CAAC,cAAc,GAAG,kBAAuD,CAAC;IAMrF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,oBAAoB,CAC9E,EAAE,OAAO,EAAE,EACX,WAAwD,EACxD,eAAe,CACf,CAAC;IACF,IAAI,YAAY,GAAG,QAAQ,CAAC;IAC5B,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACxC,YAAY,GAAG,iBAAiB,CAC/B,KAAK,CAAC,MAAM,EACZ,WAAW,CAAC,cAAuC,EACnD,aAAa,CACb,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,wBAAS,CAAC,oCAAoC,EAAE;YACzD,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE;SAC/D,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAC1D,MAAM,cAAc,CAAC,iBAAiB,CAAC,+BAA+B,CACrE,eAAe,EACf,eAAe,EACf,WAAwD,EACxD,cAAc,CACd,CAAC;IAEF,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,SAAS,6BAA6B,CACrC,aAA8B,EAC9B,WAAkC;IAElC,OAAO,WAAW,EAAE,sBAAsB,IAAI,aAAa,EAAE,sBAAsB,IAAI,GAAG,CAAC;AAC5F,CAAC;AAGM,KAAK,UAAU,aAAa,CAElC,eAAuB,EACvB,cAAqD,EACrD,IAAW,EACX,cAA8C,EAC9C,aAA8B,EAC9B,YAAY,GAAG,KAAK;IAEpB,IAAA,iCAAe,EAAC,cAAc,CAAC,CAAC;IAEhC,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAC7C,eAAe,CACf,CAAoC,CAAC;IAGtC,IAAI,WAAW,CAAC,SAAS,KAAK,mBAAmB,IAAI,WAAW,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/F,MAAM,IAAI,wBAAS,CAAC,iCAAiC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEpD,IAAI,cAAc,GAAG,WAAW,CAAC,cAAuC,CAAC;IAEzE,IACC,WAAW,CAAC,SAAS,KAAK,mBAAmB;QAC7C,CAAC,cAAc,KAAK,SAAS;YAC5B,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,KAAK,CAAC;YACxC,cAAc,CAAC,YAAY,KAAK,EAAE,CAAC,EACnC,CAAC;QACF,IAAI,WAAyE,CAAC;QAC9E,IAAI,CAAC;YACJ,WAAW,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,MAAM,IAAI,+BAAgB,CAAC,0CAA0C,OAAO,EAAE,EAAE;gBAC/E,KAAK,EAAE,KAAK;aACZ,CAAC,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAE7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,wBAAS,CAAC,oCAAoC,EAAE;gBACzD,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE;gBAC9B,IAAI,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE;aACzC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAC1D,MAAM,gBAAgB,GAAG,CAAC,MAAM,kCAAkC,CACjE,cAAc,EACd,IAAI,EACJ,WAAW,CAAC,UAAU,KAAK,IAAI,CAC/B,CAA0B,CAAC;QAC5B,WAAW,CAAC,cAAc,GAAG,gBAAgB,CAAC;QAG9C,MAAM,cAAc,CAAC,iBAAiB,CAAC,+BAA+B,CACrE,eAAe,EACf,eAAe,EACf,WAAwD,EACxD,cAAc,CACd,CAAC;QAEF,cAAc,GAAG,gBAAgB,CAAC;IACnC,CAAC;IAKD,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,oBAAoB,CAC9E,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EACzB,WAAwD,EACxD,eAAe,CACf,CAAC;IACF,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACxC,cAAc,GAAG,WAAW,CAAC,cAAuC,CAAC;IACtE,CAAC;IAED,MAAM,KAAK,GAAG,iBAAiB,CAAC,WAAW,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAE3E,cAAkC,CAAC,kBAAkB,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC;IAItF,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,cAA2C,CAAC,CAAC;IAClF,MAAM,iBAAiB,GAAG,CAAC,iBAAiB,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAExF,IAAI,aAAa,EAAE,UAAU,KAAK,KAAK,IAAI,OAAO,iBAAiB,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QAChG,iBAAiB,CAAC,aAAa,GAAG,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,aAAa,EAAE,+BAA+B,EAAE,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAChC,CAAC,aAAa,CAAC,+BAA+B,CAAC,EAAE,KAAK,CAAC,WAAW;SAClE,CAAC,CAAC;IACJ,CAAC;IACD,MAAM,sBAAsB,GAAG,6BAA6B,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IACzF,MAAM,sBAAsB,GAAG,aAAa,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAExE,MAAM,UAAU,GAA8B;QAC7C,WAAW;QACX,KAAK;QACL,eAAe;QACf,IAAI;QACJ,cAAc;QACd,aAAa;QACb,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;KACrB,CAAC;IAEF,MAAM,iBAAiB,GAAG,KAAK,EAC9B,WAA8D,EAC7D,EAAE;QACH,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,uBAAuB,GAAG,QAAQ,CAAC,IAAI,CAAC,cAA2C,CAAC,CAAC;QAC3F,uBAAuB,CAAC,OAAO,GAAG,uBAAuB,CAAC,OAAO,IAAI,EAAE,CAAC;QACxE,IAAI,aAAa,EAAE,+BAA+B,EAAE,CAAC;YACpD,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE;gBAC9C,CAAC,aAAa,CAAC,+BAA+B,CAAC,EAAE,QAAQ,CAAC,WAAW;aACrE,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,WAAW,CAAC,uBAAuB,CAAC,CAAC;IACnD,CAAC,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QAClB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAiB,EAAE,EAAE;YAC1F,IAAI,CAAC,sBAAsB,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,KAAK,sBAAsB,EAAE,CAAC;gBAClF,OAAO,MAAM,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,OAAO;SACvB,OAAO,CAAC,iBAAoC,CAAC;SAC7C,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,iBAAwB,CAAC;QAChD,IACC,CAAC,sBAAsB;YACvB,cAAc,CAAC,uBAAuB,KAAK,IAAI;YAC/C,cAAc,CAAC,MAAM,KAAK,KAAK;YAC/B,QAAQ,CAAC,UAAU,KAAK,sBAAsB,EAC7C,CAAC;YACF,MAAM,QAAQ,CAAC;QAChB,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,EAAE,KAAqB,EAAE,EAAE;QACtC,IAAI,CAAC,sBAAsB,IAAI,KAAK,CAAC,UAAU,KAAK,sBAAsB,EAAE,CAAC;YAC5E,OAAO,MAAM,iBAAiB,CAC7B,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAuB,CAAC,CACnE,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC;AAGM,KAAK,UAAU,aAAa,CAElC,eAAuB,EACvB,cAAqD,EACrD,YAAY,GAAG,KAAK;IAEpB,IAAA,iCAAe,EAAC,cAAc,CAAC,CAAC;IAEhC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAE/D,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,wBAAS,CAAC,8BAA8B,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,WAAW,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC9C,MAAM,IAAI,wBAAS,CAAC,iCAAiC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,oBAAY,CAAC;QAC9B,QAAQ,EAAE;YACT,GAAG,EAAE,WAAW,CAAC,WAAqB;YACtC,MAAM,EAAE,WAAW,CAAC,cAAwB;SAC5C;QACD,gBAAgB,EAAE,WAAW,CAAC,eAAyB;QACvD,aAAa,CAAC,IAAI,EAAE,GAAG;YACtB,IAAI,SAAiB,CAAC;YACtB,QAAQ,WAAW,CAAC,eAAe,EAAE,CAAC;gBACrC,KAAK,aAAa;oBACjB,SAAS,GAAG,QAAQ,CAAC;oBACrB,MAAM;gBACP,KAAK,aAAa;oBACjB,SAAS,GAAG,QAAQ,CAAC;oBACrB,MAAM;gBACP;oBACC,SAAS,GAAG,MAAM,CAAC;oBACnB,MAAM;YACR,CAAC;YACD,OAAO,IAAA,mBAAU,EAAC,SAAS,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjE,CAAC;KACD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,WAAW,CAAC,cAA6B,CAAC;IAEjE,MAAM,KAAK,GAAU;QACpB,GAAG,EAAE,cAAc,CAAC,WAAqB;QACzC,MAAM,EAAE,cAAc,CAAC,kBAA4B;KACnD,CAAC;IAGF,cAAc,CAAC,IAAI,GAAG,EAAE,GAAG,cAAc,CAAC,EAAE,EAAE,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;IAGvE,IAAI,KAAK,IAAI,cAAc,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;QACpD,cAAc,CAAC,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC;QACxC,OAAO,cAAc,CAAC,GAAG,CAAC;IAC3B,CAAC;IAED,cAAc,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,CACtC,KAAK,CAAC,SAAS,CAAC,cAAwD,EAAE,KAAK,CAAC,CAC3C,CAAC;IACvC,IAAI,YAAY,EAAE,CAAC;QAClB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,cAAqC,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,MAAM,IAAI,CAAC,OAAO;SACvB,OAAO,CAAC,cAAiC,CAAC;SAC1C,KAAK,CAAC,KAAK,EAAE,KAAqB,EAAE,EAAE;QAEtC,MAAM,KAAK,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAEvC,eAAuB,EACvB,IAAW,EACX,cAA8C,EAC9C,aAA8B;IAE9B,MAAM,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAC7C,eAAe,CACf,CAAoC,CAAC;IACtC,IAAI,WAAW,CAAC,SAAS,KAAK,mBAAmB,IAAI,WAAW,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/F,MAAM,IAAI,wBAAS,CAAC,iCAAiC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,WAAW,CAAC,cAAuC,CAAC;IAC3E,MAAM,KAAK,GAAG,iBAAiB,CAAC,WAAW,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC;QAC1C,WAAW;QACX,KAAK;QACL,eAAe;QACf,IAAI;QACJ,cAAc;QACd,aAAa;QACb,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;KACrB,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,IAAI,CAAC;AACtB,CAAC"}
|
|
@@ -5,13 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.applyPaginationRequestData = applyPaginationRequestData;
|
|
7
7
|
exports.requestWithAuthenticationPaginated = requestWithAuthenticationPaginated;
|
|
8
|
+
const backend_network_1 = require("@n8n/backend-network");
|
|
8
9
|
const crypto_1 = __importDefault(require("crypto"));
|
|
9
10
|
const merge_1 = __importDefault(require("lodash/merge"));
|
|
10
11
|
const pick_1 = __importDefault(require("lodash/pick"));
|
|
11
12
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
12
13
|
const stream_1 = require("stream");
|
|
13
|
-
const binary_helper_functions_1 = require("../binary-helper-functions");
|
|
14
|
-
const axios_utils_1 = require("./axios-utils");
|
|
15
14
|
function applyPaginationRequestData(requestData, paginationRequestData) {
|
|
16
15
|
const preparedPaginationData = {
|
|
17
16
|
...paginationRequestData,
|
|
@@ -57,7 +56,7 @@ async function requestWithAuthenticationPaginated(requestOptions, itemIndex, pag
|
|
|
57
56
|
do {
|
|
58
57
|
paginateRequestData = resolveValue(paginationOptions.request, itemIndex, runIndex, executeData, additionalKeys, false);
|
|
59
58
|
const tempRequestOptions = applyPaginationRequestData(requestOptions, paginateRequestData);
|
|
60
|
-
if (!(0,
|
|
59
|
+
if (!(0, backend_network_1.tryParseUrl)(tempRequestOptions.uri)) {
|
|
61
60
|
throw new n8n_workflow_1.NodeOperationError(node, `'${paginateRequestData.url}' is not a valid URL.`, {
|
|
62
61
|
itemIndex,
|
|
63
62
|
runIndex,
|
|
@@ -77,7 +76,7 @@ async function requestWithAuthenticationPaginated(requestOptions, itemIndex, pag
|
|
|
77
76
|
}, (0, pick_1.default)(tempResponseData, ['body', 'headers', 'statusCode']));
|
|
78
77
|
let contentBody;
|
|
79
78
|
if (newResponse.body instanceof stream_1.Readable && paginationOptions.binaryResult !== true) {
|
|
80
|
-
contentBody = await (0,
|
|
79
|
+
contentBody = await (0, backend_network_1.binaryToString)(newResponse.body);
|
|
81
80
|
const responseContentType = newResponse.headers['content-type']?.toString() ?? '';
|
|
82
81
|
if (responseContentType.includes('application/json')) {
|
|
83
82
|
newResponse.body = (0, n8n_workflow_1.jsonParse)(contentBody, { fallbackValue: {} });
|
|
@@ -142,7 +141,7 @@ async function requestWithAuthenticationPaginated(requestOptions, itemIndex, pag
|
|
|
142
141
|
if (tempResponseData.statusCode < 200 || tempResponseData.statusCode >= 300) {
|
|
143
142
|
let data = tempResponseData.body;
|
|
144
143
|
if (data instanceof stream_1.Readable && paginationOptions.binaryResult !== true) {
|
|
145
|
-
data = await (0,
|
|
144
|
+
data = await (0, backend_network_1.binaryToString)(data);
|
|
146
145
|
}
|
|
147
146
|
else if (typeof data === 'object') {
|
|
148
147
|
data = JSON.stringify(data);
|
package/dist/execution-engine/node-execution-context/utils/request-helpers/pagination.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/pagination.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/pagination.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,13 +15,16 @@ function getWebhookDescription(name, workflow, node) {
|
|
|
15
15
|
return undefined;
|
|
16
16
|
}
|
|
17
17
|
function getNodeWebhookUrl(name, workflow, node, additionalData, mode, additionalKeys, isTest) {
|
|
18
|
-
let baseUrl = additionalData.webhookBaseUrl;
|
|
19
|
-
if (isTest === true) {
|
|
20
|
-
baseUrl = additionalData.webhookTestBaseUrl;
|
|
21
|
-
}
|
|
22
18
|
const webhookDescription = getWebhookDescription(name, workflow, node);
|
|
23
19
|
if (webhookDescription === undefined)
|
|
24
20
|
return;
|
|
21
|
+
let baseUrl;
|
|
22
|
+
if (webhookDescription.nodeType === 'mcp') {
|
|
23
|
+
baseUrl = isTest === true ? additionalData.mcpTestBaseUrl : additionalData.mcpBaseUrl;
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
baseUrl = isTest === true ? additionalData.webhookTestBaseUrl : additionalData.webhookBaseUrl;
|
|
27
|
+
}
|
|
25
28
|
const path = workflow.expression.getSimpleParameterValue(node, webhookDescription.path, mode, additionalKeys);
|
|
26
29
|
if (path === undefined)
|
|
27
30
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/webhook-helper-functions.ts"],"names":[],"mappings":";;AAYA,sDAiBC;AAGD,
|
|
1
|
+
{"version":3,"file":"webhook-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/webhook-helper-functions.ts"],"names":[],"mappings":";;AAYA,sDAiBC;AAGD,8CAoCC;AA3DD,+CAA2C;AAG3C,SAAgB,qBAAqB,CACpC,IAAiB,EACjB,QAAkB,EAClB,IAAW;IAEX,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAGrF,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO;IAExD,KAAK,MAAM,kBAAkB,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAChE,IAAI,kBAAkB,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACtC,OAAO,kBAAkB,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAGD,SAAgB,iBAAiB,CAChC,IAAiB,EACjB,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,IAAyB,EACzB,cAAgD,EAChD,MAAgB;IAEhB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACvE,IAAI,kBAAkB,KAAK,SAAS;QAAE,OAAO;IAE7C,IAAI,OAAe,CAAC;IACpB,IAAI,kBAAkB,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC3C,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC;IACvF,CAAC;SAAM,CAAC;QACP,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC;IAC/F,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CACvD,IAAI,EACJ,kBAAkB,CAAC,IAAI,EACvB,IAAI,EACJ,cAAc,CACd,CAAC;IACF,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO;IAE/B,MAAM,UAAU,GAAY,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CACtE,IAAI,EACJ,kBAAkB,CAAC,UAAU,EAC7B,IAAI,EACJ,cAAc,EACd,SAAS,EACT,KAAK,CACM,CAAC;IACb,OAAO,0BAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC;AAC/F,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Request, Response } from 'express';
|
|
2
|
-
import type { AINodeConnectionType, CloseFunction, ICredentialDataDecryptedObject, IDataObject, INode, IRunExecutionData, IUser, IWebhookData, IWebhookFunctions, IWorkflowExecuteAdditionalData, WebhookType, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
|
+
import type { AINodeConnectionType, CloseFunction, ICredentialDataDecryptedObject, IDataObject, INode, IRunExecutionData, IUser, IWebhookData, IWebhookFunctions, IWorkflowExecuteAdditionalData, N8nOAuth2ValidationResult, WebhookType, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
|
|
3
3
|
import { NodeExecutionContext } from './node-execution-context';
|
|
4
4
|
export declare class WebhookContext extends NodeExecutionContext implements IWebhookFunctions {
|
|
5
5
|
private readonly webhookData;
|
|
@@ -18,5 +18,6 @@ export declare class WebhookContext extends NodeExecutionContext implements IWeb
|
|
|
18
18
|
getNodeWebhookUrl(name: WebhookType): string | undefined;
|
|
19
19
|
getWebhookName(): WebhookType;
|
|
20
20
|
validateCookieAuth(cookieValue: string): Promise<IUser>;
|
|
21
|
+
validateN8nOAuth2Token(token: string, resourceUrl: string): Promise<N8nOAuth2ValidationResult>;
|
|
21
22
|
getInputConnectionData(connectionType: AINodeConnectionType, itemIndex: number): Promise<unknown>;
|
|
22
23
|
}
|
|
@@ -51,29 +51,36 @@ class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
51
51
|
}
|
|
52
52
|
getResponseObject() {
|
|
53
53
|
if (this.additionalData.httpResponse === undefined) {
|
|
54
|
-
throw new n8n_workflow_1.
|
|
54
|
+
throw new n8n_workflow_1.UnexpectedError('Response is missing');
|
|
55
55
|
}
|
|
56
56
|
return this.additionalData.httpResponse;
|
|
57
57
|
}
|
|
58
58
|
assertHttpRequest() {
|
|
59
59
|
const { httpRequest } = this.additionalData;
|
|
60
60
|
if (httpRequest === undefined) {
|
|
61
|
-
throw new n8n_workflow_1.
|
|
61
|
+
throw new n8n_workflow_1.UnexpectedError('Request is missing');
|
|
62
62
|
}
|
|
63
63
|
return httpRequest;
|
|
64
64
|
}
|
|
65
65
|
getNodeWebhookUrl(name) {
|
|
66
|
-
|
|
66
|
+
const isTest = this.webhookData.webhookDescription.nodeType === 'mcp' ? this.webhookData.isTest : undefined;
|
|
67
|
+
return (0, webhook_helper_functions_1.getNodeWebhookUrl)(name, this.workflow, this.node, this.additionalData, this.mode, this.additionalKeys, isTest);
|
|
67
68
|
}
|
|
68
69
|
getWebhookName() {
|
|
69
70
|
return this.webhookData.webhookDescription.name;
|
|
70
71
|
}
|
|
71
72
|
async validateCookieAuth(cookieValue) {
|
|
72
73
|
if (!this.additionalData.validateCookieAuth) {
|
|
73
|
-
throw new n8n_workflow_1.
|
|
74
|
+
throw new n8n_workflow_1.UnexpectedError('Cookie auth validation is not available');
|
|
74
75
|
}
|
|
75
76
|
return await this.additionalData.validateCookieAuth(cookieValue);
|
|
76
77
|
}
|
|
78
|
+
async validateN8nOAuth2Token(token, resourceUrl) {
|
|
79
|
+
if (!this.additionalData.validateN8nOAuth2Token) {
|
|
80
|
+
throw new n8n_workflow_1.UnexpectedError('OAuth2 token validation is not available');
|
|
81
|
+
}
|
|
82
|
+
return await this.additionalData.validateN8nOAuth2Token(token, resourceUrl);
|
|
83
|
+
}
|
|
77
84
|
async getInputConnectionData(connectionType, itemIndex) {
|
|
78
85
|
const connectionInputData = [
|
|
79
86
|
{ json: this.additionalData.httpRequest?.body || {} },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/webhook-context.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/webhook-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,11 @@ export declare class ScheduledTaskManager {
|
|
|
20
20
|
private get loggableCrons();
|
|
21
21
|
constructor(instanceSettings: InstanceSettings, logger: Logger, { activeInterval }: CronLoggingConfig, errorReporter: ErrorReporter);
|
|
22
22
|
registerCron(ctx: CronContext, onTick: (scheduledTime: Date) => void): void;
|
|
23
|
-
deregisterCrons(workflowId: string):
|
|
23
|
+
deregisterCrons(workflowId: string): boolean;
|
|
24
|
+
getWorkflowIdsWithCrons(): string[];
|
|
25
|
+
getCronNodeIds(workflowId: string): string[];
|
|
26
|
+
deregisterCron(workflowId: string, nodeId: string): void;
|
|
27
|
+
hasCrons(workflowId: string): boolean;
|
|
24
28
|
deregisterAllCrons(): void;
|
|
25
29
|
private toCronKey;
|
|
26
30
|
}
|
|
@@ -93,7 +93,7 @@ let ScheduledTaskManager = class ScheduledTaskManager {
|
|
|
93
93
|
deregisterCrons(workflowId) {
|
|
94
94
|
const workflowCrons = this.cronsByWorkflow.get(workflowId);
|
|
95
95
|
if (!workflowCrons || workflowCrons.size === 0)
|
|
96
|
-
return;
|
|
96
|
+
return false;
|
|
97
97
|
const summaries = [];
|
|
98
98
|
for (const cron of workflowCrons.values()) {
|
|
99
99
|
summaries.push(cron.summary);
|
|
@@ -105,6 +105,47 @@ let ScheduledTaskManager = class ScheduledTaskManager {
|
|
|
105
105
|
crons: summaries,
|
|
106
106
|
instanceRole: this.instanceSettings.instanceRole,
|
|
107
107
|
});
|
|
108
|
+
return true;
|
|
109
|
+
}
|
|
110
|
+
getWorkflowIdsWithCrons() {
|
|
111
|
+
return Array.from(this.cronsByWorkflow.keys());
|
|
112
|
+
}
|
|
113
|
+
getCronNodeIds(workflowId) {
|
|
114
|
+
const workflowCrons = this.cronsByWorkflow.get(workflowId);
|
|
115
|
+
if (!workflowCrons)
|
|
116
|
+
return [];
|
|
117
|
+
const nodeIds = new Set();
|
|
118
|
+
for (const cron of workflowCrons.values()) {
|
|
119
|
+
nodeIds.add(cron.ctx.nodeId);
|
|
120
|
+
}
|
|
121
|
+
return Array.from(nodeIds);
|
|
122
|
+
}
|
|
123
|
+
deregisterCron(workflowId, nodeId) {
|
|
124
|
+
const workflowCrons = this.cronsByWorkflow.get(workflowId);
|
|
125
|
+
if (!workflowCrons || workflowCrons.size === 0)
|
|
126
|
+
return;
|
|
127
|
+
const summaries = [];
|
|
128
|
+
for (const [key, cron] of workflowCrons) {
|
|
129
|
+
if (cron.ctx.nodeId !== nodeId)
|
|
130
|
+
continue;
|
|
131
|
+
summaries.push(cron.summary);
|
|
132
|
+
void cron.job.stop();
|
|
133
|
+
workflowCrons.delete(key);
|
|
134
|
+
}
|
|
135
|
+
if (workflowCrons.size === 0)
|
|
136
|
+
this.cronsByWorkflow.delete(workflowId);
|
|
137
|
+
if (summaries.length === 0)
|
|
138
|
+
return;
|
|
139
|
+
this.logger.info('Deregistered crons for node', {
|
|
140
|
+
workflowId,
|
|
141
|
+
nodeId,
|
|
142
|
+
crons: summaries,
|
|
143
|
+
instanceRole: this.instanceSettings.instanceRole,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
hasCrons(workflowId) {
|
|
147
|
+
const workflowCrons = this.cronsByWorkflow.get(workflowId);
|
|
148
|
+
return workflowCrons !== undefined && workflowCrons.size > 0;
|
|
108
149
|
}
|
|
109
150
|
deregisterAllCrons() {
|
|
110
151
|
for (const workflowId of this.cronsByWorkflow.keys()) {
|