n8n-core 2.27.1 → 2.27.3
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/build.tsbuildinfo +1 -1
- package/dist/execution-engine/node-execution-context/index.d.ts +0 -1
- package/dist/execution-engine/node-execution-context/index.js +1 -3
- package/dist/execution-engine/node-execution-context/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/get-additional-keys.d.ts +6 -2
- package/dist/execution-engine/node-execution-context/utils/get-additional-keys.js +4 -4
- package/dist/execution-engine/node-execution-context/utils/get-additional-keys.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/legacy-request-adapter.d.ts +0 -3
- package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.js +9 -289
- 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/pagination.d.ts +2 -2
- package/dist/execution-engine/node-execution-context/utils/request-helpers/pagination.js +2 -2
- package/dist/execution-engine/node-execution-context/utils/request-helpers/pagination.js.map +1 -1
- package/package.json +11 -11
|
@@ -12,7 +12,6 @@ export { StructuredToolkit, type SupplyDataToolResponse } from './utils/ai-tool-
|
|
|
12
12
|
export { constructExecutionMetaData } from './utils/construct-execution-metadata';
|
|
13
13
|
export { getAdditionalKeys, getNonWorkflowAdditionalKeys } from './utils/get-additional-keys';
|
|
14
14
|
export { normalizeItems } from './utils/normalize-items';
|
|
15
|
-
export { parseIncomingMessage } from '@n8n/backend-network';
|
|
16
15
|
export { returnJsonArray } from './utils/return-json-array';
|
|
17
16
|
export { resolveSourceOverwrite } from './utils/resolve-source-overwrite';
|
|
18
17
|
export * from './utils/binary-helper-functions';
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.resolveSourceOverwrite = exports.returnJsonArray = exports.
|
|
17
|
+
exports.resolveSourceOverwrite = exports.returnJsonArray = exports.normalizeItems = exports.getNonWorkflowAdditionalKeys = exports.getAdditionalKeys = exports.constructExecutionMetaData = exports.StructuredToolkit = exports.WebhookContext = exports.TriggerContext = exports.SupplyDataContext = exports.PollContext = exports.LocalLoadOptionsContext = exports.LoadOptionsContext = exports.HookContext = exports.ExecuteSingleContext = exports.ExecuteContext = exports.CredentialTestContext = void 0;
|
|
18
18
|
var credentials_test_context_1 = require("./credentials-test-context");
|
|
19
19
|
Object.defineProperty(exports, "CredentialTestContext", { enumerable: true, get: function () { return credentials_test_context_1.CredentialTestContext; } });
|
|
20
20
|
var execute_context_1 = require("./execute-context");
|
|
@@ -44,8 +44,6 @@ Object.defineProperty(exports, "getAdditionalKeys", { enumerable: true, get: fun
|
|
|
44
44
|
Object.defineProperty(exports, "getNonWorkflowAdditionalKeys", { enumerable: true, get: function () { return get_additional_keys_1.getNonWorkflowAdditionalKeys; } });
|
|
45
45
|
var normalize_items_1 = require("./utils/normalize-items");
|
|
46
46
|
Object.defineProperty(exports, "normalizeItems", { enumerable: true, get: function () { return normalize_items_1.normalizeItems; } });
|
|
47
|
-
var backend_network_1 = require("@n8n/backend-network");
|
|
48
|
-
Object.defineProperty(exports, "parseIncomingMessage", { enumerable: true, get: function () { return backend_network_1.parseIncomingMessage; } });
|
|
49
47
|
var return_json_array_1 = require("./utils/return-json-array");
|
|
50
48
|
Object.defineProperty(exports, "returnJsonArray", { enumerable: true, get: function () { return return_json_array_1.returnJsonArray; } });
|
|
51
49
|
var resolve_source_overwrite_1 = require("./utils/resolve-source-overwrite");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAC9B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA;AAC1B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAEvB,uDAAuF;AAA9E,kHAAA,iBAAiB,OAAA;AAC1B,qFAAkF;AAAzE,0IAAA,0BAA0B,OAAA;AACnC,mEAA8F;AAArF,wHAAA,iBAAiB,OAAA;AAAE,mIAAA,4BAA4B,OAAA;AACxD,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAC9B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,mEAAgE;AAAvD,8HAAA,oBAAoB,OAAA;AAC7B,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,2EAAuE;AAA9D,qIAAA,uBAAuB,OAAA;AAChC,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA;AAC1B,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAEvB,uDAAuF;AAA9E,kHAAA,iBAAiB,OAAA;AAC1B,qFAAkF;AAAzE,0IAAA,0BAA0B,OAAA;AACnC,mEAA8F;AAArF,wHAAA,iBAAiB,OAAA;AAAE,mIAAA,4BAA4B,OAAA;AACxD,2DAAyD;AAAhD,iHAAA,cAAc,OAAA;AACvB,+DAA4D;AAAnD,oHAAA,eAAe,OAAA;AACxB,6EAA0E;AAAjE,kIAAA,sBAAsB,OAAA;AAC/B,kEAAgD"}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
1
|
import type { IRunExecutionData, IWorkflowDataProxyAdditionalKeys, IWorkflowExecuteAdditionalData, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
|
-
export declare function getAdditionalKeys(additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData: IRunExecutionData | null
|
|
3
|
-
|
|
2
|
+
export declare function getAdditionalKeys(additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData: IRunExecutionData | null, options?: {
|
|
3
|
+
isCredential: boolean;
|
|
4
|
+
}): IWorkflowDataProxyAdditionalKeys;
|
|
5
|
+
export declare function getNonWorkflowAdditionalKeys(additionalData: IWorkflowExecuteAdditionalData, options?: {
|
|
6
|
+
secretsEnabled: boolean;
|
|
7
|
+
}): IWorkflowDataProxyAdditionalKeys;
|
|
@@ -10,7 +10,7 @@ function appendResumeToken(url, token) {
|
|
|
10
10
|
urlObj.searchParams.set(constants_1.WAITING_TOKEN_QUERY_PARAM, token);
|
|
11
11
|
return urlObj.toString();
|
|
12
12
|
}
|
|
13
|
-
function getAdditionalKeys(additionalData, mode, runExecutionData) {
|
|
13
|
+
function getAdditionalKeys(additionalData, mode, runExecutionData, options = { isCredential: false }) {
|
|
14
14
|
const executionId = additionalData.executionId ?? constants_1.PLACEHOLDER_EMPTY_EXECUTION_ID;
|
|
15
15
|
let resumeUrl = `${additionalData.webhookWaitingBaseUrl}/${executionId}`;
|
|
16
16
|
let resumeFormUrl = `${additionalData.formWaitingBaseUrl}/${executionId}`;
|
|
@@ -29,15 +29,15 @@ function getAdditionalKeys(additionalData, mode, runExecutionData) {
|
|
|
29
29
|
: undefined,
|
|
30
30
|
},
|
|
31
31
|
$vars: additionalData.variables,
|
|
32
|
-
$secrets: (0, get_secrets_proxy_1.getSecretsProxy)(additionalData),
|
|
32
|
+
$secrets: options.isCredential ? (0, get_secrets_proxy_1.getSecretsProxy)(additionalData) : undefined,
|
|
33
33
|
$executionId: executionId,
|
|
34
34
|
$resumeWebhookUrl: resumeUrl,
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
-
function getNonWorkflowAdditionalKeys(additionalData) {
|
|
37
|
+
function getNonWorkflowAdditionalKeys(additionalData, options = { secretsEnabled: false }) {
|
|
38
38
|
return {
|
|
39
39
|
$vars: additionalData.variables,
|
|
40
|
-
$secrets: (0, get_secrets_proxy_1.getSecretsProxy)(additionalData),
|
|
40
|
+
$secrets: options.secretsEnabled ? (0, get_secrets_proxy_1.getSecretsProxy)(additionalData) : undefined,
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
//# sourceMappingURL=get-additional-keys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-additional-keys.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/get-additional-keys.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"get-additional-keys.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/get-additional-keys.ts"],"names":[],"mappings":";;AAmBA,8CA+BC;AAMD,oEAQC;AAzDD,2CAAwF;AAExF,+CAA0D;AAC1D,2DAAsD;AAEtD,SAAS,iBAAiB,CAAC,GAAW,EAAE,KAAa;IACpD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,qCAAyB,EAAE,KAAK,CAAC,CAAC;IAC1D,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC;AAGD,SAAgB,iBAAiB,CAChC,cAA8C,EAC9C,IAAyB,EACzB,gBAA0C,EAC1C,UAAqC,EAAE,YAAY,EAAE,KAAK,EAAE;IAE5D,MAAM,WAAW,GAAG,cAAc,CAAC,WAAW,IAAI,0CAA8B,CAAC;IAEjF,IAAI,SAAS,GAAG,GAAG,cAAc,CAAC,qBAAqB,IAAI,WAAW,EAAE,CAAC;IACzE,IAAI,aAAa,GAAG,GAAG,cAAc,CAAC,kBAAkB,IAAI,WAAW,EAAE,CAAC;IAC1E,IAAI,gBAAgB,EAAE,WAAW,EAAE,CAAC;QACnC,SAAS,GAAG,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACvE,aAAa,GAAG,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC;IACD,OAAO;QACN,UAAU,EAAE;YACX,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY;YAC/C,SAAS;YACT,aAAa;YACb,UAAU,EAAE,gBAAgB;gBAC3B,CAAC,CAAC,IAAA,uCAAyB,EAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;gBACvD,CAAC,CAAC,SAAS;SACZ;QACD,KAAK,EAAE,cAAc,CAAC,SAAS;QAC/B,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;QAG5E,YAAY,EAAE,WAAW;QACzB,iBAAiB,EAAE,SAAS;KAC5B,CAAC;AACH,CAAC;AAMD,SAAgB,4BAA4B,CAC3C,cAA8C,EAC9C,UAAuC,EAAE,cAAc,EAAE,KAAK,EAAE;IAEhE,OAAO;QACN,KAAK,EAAE,cAAc,CAAC,SAAS;QAC/B,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,IAAA,mCAAe,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;KAC9E,CAAC;AACH,CAAC"}
|
|
@@ -30,8 +30,8 @@ const getRequestHelperFunctions = (workflow, node, additionalData, runExecutionD
|
|
|
30
30
|
}
|
|
31
31
|
return await (0, backend_network_1.httpRequest)(requestOptions, additionalData.ssrfBridge);
|
|
32
32
|
},
|
|
33
|
-
async requestWithAuthenticationPaginated(requestOptions, itemIndex, paginationOptions, credentialsType, additionalCredentialOptions) {
|
|
34
|
-
return await pagination_1.requestWithAuthenticationPaginated.call(this, requestOptions, itemIndex, paginationOptions, getResolvedValue, node, credentialsType, additionalCredentialOptions);
|
|
33
|
+
async requestWithAuthenticationPaginated(requestOptions, itemIndex, paginationOptions, credentialsType, additionalCredentialOptions, sanitizedRequest) {
|
|
34
|
+
return await pagination_1.requestWithAuthenticationPaginated.call(this, requestOptions, itemIndex, paginationOptions, getResolvedValue, node, credentialsType, additionalCredentialOptions, sanitizedRequest);
|
|
35
35
|
},
|
|
36
36
|
async httpRequestWithAuthentication(credentialsType, requestOptions, additionalCredentialOptions) {
|
|
37
37
|
return await authentication_1.httpRequestWithAuthentication.call(this, credentialsType, requestOptions, workflow, node, additionalData, additionalCredentialOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/factory.ts"],"names":[],"mappings":";;;AAAA,0DAAmD;AAmBnD,4EAAmG;AAEnG,qDAA4F;AAC5F,qEAA+D;AAC/D,mCAA2E;AAC3E,6CAAkE;AAE3D,MAAM,yBAAyB,GAAG,CACxC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,mBAA6C,IAAI,EACjD,sBAA4C,EAAE,EACrB,EAAE;IAC3B,MAAM,gBAAgB,GAAG,CACxB,cAAsC,EACtC,SAAiB,EACjB,QAAgB,EAChB,WAAyB,EACzB,cAAiD,EACjD,oBAAoB,GAAG,KAAK,EACH,EAAE;QAC3B,MAAM,IAAI,GAAwB,UAAU,CAAC;QAE7C,IACC,OAAO,cAAc,KAAK,QAAQ;YAClC,CAAC,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EACvE,CAAC;YACF,OAAO,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAC3C,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,EACT,mBAAmB,EACnB,IAAI,EACJ,cAAc,IAAI,EAAE,EACpB,WAAW,EACX,oBAAoB,CACpB,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC;IACvB,CAAC,CAAC;IAGF,MAAM,WAAW,GAAG,cAAc,CAAC,kBAAkB,CAAC;IAEtD,OAAO;QACN,WAAW,EAAE,KAAK,EAAE,cAAmC,EAAE,EAAE;YAC1D,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,gBAAgB,GAAG,MAAM,IAAA,uCAAmB,EACjD,WAAW,EACX,cAAc,EACd,IAAI,EACJ,cAAc,CAAC,kBAAkB,CACjC,CAAC;gBACF,IAAI,gBAAgB,KAAK,SAAS;oBAAE,OAAO,gBAAgB,CAAC;YAC7D,CAAC;YACD,IAAI,cAAc,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC;gBAC7C,cAAc,CAAC,OAAO,KAAK,EAAE,CAAC;gBAC9B,cAAc,CAAC,IAAI,CAAC,kBAAkB,CACrC,cAAc,CAAC,WAAY,EAC3B,IAAI,CAAC,IAAI,EACT,cAAc,CAAC,OAAiC,CAChD,CAAC;YACH,CAAC;YACD,OAAO,MAAM,IAAA,6BAAW,EAAC,cAAc,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QACD,KAAK,CAAC,kCAAkC,CAEvC,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,2BAA2B;
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/factory.ts"],"names":[],"mappings":";;;AAAA,0DAAmD;AAmBnD,4EAAmG;AAEnG,qDAA4F;AAC5F,qEAA+D;AAC/D,mCAA2E;AAC3E,6CAAkE;AAE3D,MAAM,yBAAyB,GAAG,CACxC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,mBAA6C,IAAI,EACjD,sBAA4C,EAAE,EACrB,EAAE;IAC3B,MAAM,gBAAgB,GAAG,CACxB,cAAsC,EACtC,SAAiB,EACjB,QAAgB,EAChB,WAAyB,EACzB,cAAiD,EACjD,oBAAoB,GAAG,KAAK,EACH,EAAE;QAC3B,MAAM,IAAI,GAAwB,UAAU,CAAC;QAE7C,IACC,OAAO,cAAc,KAAK,QAAQ;YAClC,CAAC,OAAO,cAAc,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EACvE,CAAC;YACF,OAAO,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAC3C,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,EACT,mBAAmB,EACnB,IAAI,EACJ,cAAc,IAAI,EAAE,EACpB,WAAW,EACX,oBAAoB,CACpB,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC;IACvB,CAAC,CAAC;IAGF,MAAM,WAAW,GAAG,cAAc,CAAC,kBAAkB,CAAC;IAEtD,OAAO;QACN,WAAW,EAAE,KAAK,EAAE,cAAmC,EAAE,EAAE;YAC1D,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,gBAAgB,GAAG,MAAM,IAAA,uCAAmB,EACjD,WAAW,EACX,cAAc,EACd,IAAI,EACJ,cAAc,CAAC,kBAAkB,CACjC,CAAC;gBACF,IAAI,gBAAgB,KAAK,SAAS;oBAAE,OAAO,gBAAgB,CAAC;YAC7D,CAAC;YACD,IAAI,cAAc,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC;gBAC7C,cAAc,CAAC,OAAO,KAAK,EAAE,CAAC;gBAC9B,cAAc,CAAC,IAAI,CAAC,kBAAkB,CACrC,cAAc,CAAC,WAAY,EAC3B,IAAI,CAAC,IAAI,EACT,cAAc,CAAC,OAAiC,CAChD,CAAC;YACH,CAAC;YACD,OAAO,MAAM,IAAA,6BAAW,EAAC,cAAc,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QACD,KAAK,CAAC,kCAAkC,CAEvC,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,2BAA2B,EAC3B,gBAAgB;YAGhB,OAAO,MAAM,+CAAkC,CAAC,IAAI,CACnD,IAAI,EACJ,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,IAAI,EACJ,eAAe,EACf,2BAA2B,EAC3B,gBAAgB,CAChB,CAAC;QACH,CAAC;QACD,KAAK,CAAC,6BAA6B,CAElC,eAAe,EACf,cAAc,EACd,2BAA2B;YAG3B,OAAO,MAAM,8CAA6B,CAAC,IAAI,CAC9C,IAAI,EACJ,eAAe,EACf,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,2BAA2B,CAC3B,CAAC;QACH,CAAC;QAED,KAAK,CAAC,kBAAkB,CAEvB,eAAuB,EACvB,aAA8B;YAE9B,OAAO,MAAM,0BAAkB,CAAC,IAAI,CACnC,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,cAAc,EACd,aAAa,CACb,CAAC;QACH,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;YACvC,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,uBAAuB,CAAC;gBACzF,MAAM,gBAAgB,GAAG,MAAM,IAAA,uCAAmB,EACjD,WAAW,EACX,IAAA,0CAAsB,EAAC,WAAW,EAAE,OAAO,CAAC,EAC5C,IAAI,EACJ,SAAS,EACT,QAAQ,CACR,CAAC;gBACF,IAAI,gBAAgB,KAAK,SAAS;oBAAE,OAAO,gBAAgB,CAAC;YAC7D,CAAC;YACD,IAAI,cAAc,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC;gBAC7C,MAAM,MAAM,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;gBAChF,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;gBACtB,cAAc,CAAC,IAAI,CAAC,kBAAkB,CACrC,cAAc,CAAC,WAAY,EAC3B,IAAI,CAAC,IAAI,EACT,MAAM,CAAC,OAAiC,CACxC,CAAC;YACH,CAAC;YAED,OAAO,MAAM,IAAA,4CAAmB,EAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACxF,CAAC;QAED,KAAK,CAAC,yBAAyB,CAE9B,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,SAAS;YAGT,OAAO,MAAM,0CAAyB,CAAC,IAAI,CAC1C,IAAI,EACJ,eAAe,EACf,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,2BAA2B,EAC3B,SAAS,CACT,CAAC;QACH,CAAC;QAED,KAAK,CAAC,aAAa,CAElB,eAAuB,EACvB,cAA+B;YAG/B,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,gBAAgB,GAAG,MAAM,IAAA,uCAAmB,EACjD,WAAW,EACX,IAAA,0CAAsB,EAAC,cAAc,CAAC,EACtC,IAAI,EACJ,cAAc,CAAC,uBAAuB,EACtC,QAAQ,CACR,CAAC;gBACF,IAAI,gBAAgB,KAAK,SAAS;oBAAE,OAAO,gBAAgB,CAAC;YAC7D,CAAC;YACD,OAAO,MAAM,qBAAa,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;QACxE,CAAC;QAED,KAAK,CAAC,aAAa,CAElB,eAAuB,EACvB,cAA+B,EAC/B,aAA8B;YAG9B,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,gBAAgB,GAAG,MAAM,IAAA,uCAAmB,EACjD,WAAW,EACX,IAAA,0CAAsB,EAAC,cAAc,CAAC,EACtC,IAAI,EACJ,cAAc,CAAC,uBAAuB,EACtC,QAAQ,CACR,CAAC;gBACF,IAAI,gBAAgB,KAAK,SAAS;oBAAE,OAAO,gBAAgB,CAAC;YAC7D,CAAC;YACD,OAAO,MAAM,qBAAa,CAAC,IAAI,CAC9B,IAAI,EACJ,eAAe,EACf,cAAc,EACd,IAAI,EACJ,cAAc,EACd,aAAa,CACb,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AA/MW,QAAA,yBAAyB,6BA+MpC"}
|
|
@@ -1,5 +1,2 @@
|
|
|
1
|
-
import { type SsrfBridge } from '@n8n/backend-network';
|
|
2
|
-
import type { AxiosRequestConfig } from 'axios';
|
|
3
1
|
import type { INode, IRequestOptions, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow';
|
|
4
|
-
export declare function parseRequestObject(requestObject: IRequestOptions, ssrfBridge?: SsrfBridge): Promise<AxiosRequestConfig<any>>;
|
|
5
2
|
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
|
@@ -1,297 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.parseRequestObject = parseRequestObject;
|
|
7
3
|
exports.proxyRequestToAxios = proxyRequestToAxios;
|
|
8
|
-
const backend_common_1 = require("@n8n/backend-common");
|
|
9
4
|
const backend_network_1 = require("@n8n/backend-network");
|
|
10
5
|
const di_1 = require("@n8n/di");
|
|
11
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
12
|
-
const http_1 = require("http");
|
|
13
|
-
const pick_1 = __importDefault(require("lodash/pick"));
|
|
14
|
-
const n8n_workflow_1 = require("n8n-workflow");
|
|
15
|
-
const qs_1 = require("qs");
|
|
16
|
-
const stream_1 = require("stream");
|
|
17
|
-
async function parseRequestObject(requestObject, ssrfBridge) {
|
|
18
|
-
const axiosConfig = {};
|
|
19
|
-
if (requestObject.headers !== undefined) {
|
|
20
|
-
axiosConfig.headers = requestObject.headers;
|
|
21
|
-
}
|
|
22
|
-
const contentTypeHeaderKeyName = axiosConfig.headers &&
|
|
23
|
-
Object.keys(axiosConfig.headers).find((headerName) => headerName.toLowerCase() === 'content-type');
|
|
24
|
-
const contentType = contentTypeHeaderKeyName &&
|
|
25
|
-
axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
26
|
-
if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
|
|
27
|
-
if (typeof requestObject.body === 'string') {
|
|
28
|
-
axiosConfig.data = requestObject.body;
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
const allData = Object.assign(requestObject.body || {}, requestObject.form || {});
|
|
32
|
-
if (requestObject.useQuerystring === true) {
|
|
33
|
-
axiosConfig.data = (0, qs_1.stringify)(allData, { arrayFormat: 'repeat' });
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
axiosConfig.data = (0, qs_1.stringify)(allData);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
else if (contentType?.includes('multipart/form-data')) {
|
|
41
|
-
if (requestObject.formData !== undefined && (0, backend_network_1.isFormDataInstance)(requestObject.formData)) {
|
|
42
|
-
axiosConfig.data = requestObject.formData;
|
|
43
|
-
}
|
|
44
|
-
else {
|
|
45
|
-
const allData = {
|
|
46
|
-
...requestObject.body,
|
|
47
|
-
...requestObject.formData,
|
|
48
|
-
};
|
|
49
|
-
axiosConfig.data = (0, backend_network_1.createFormDataObject)(allData);
|
|
50
|
-
}
|
|
51
|
-
delete axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
52
|
-
const headers = axiosConfig.data.getHeaders();
|
|
53
|
-
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
54
|
-
await (0, backend_network_1.generateContentLengthHeader)(axiosConfig);
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
if (requestObject.form !== undefined && requestObject.body === undefined) {
|
|
58
|
-
axiosConfig.data =
|
|
59
|
-
typeof requestObject.form === 'string'
|
|
60
|
-
? (0, qs_1.stringify)(requestObject.form, { format: 'RFC3986' })
|
|
61
|
-
: (0, qs_1.stringify)(requestObject.form).toString();
|
|
62
|
-
if (axiosConfig.headers !== undefined) {
|
|
63
|
-
const headerName = (0, backend_network_1.searchForHeader)(axiosConfig, 'content-type');
|
|
64
|
-
if (headerName) {
|
|
65
|
-
delete axiosConfig.headers[headerName];
|
|
66
|
-
}
|
|
67
|
-
axiosConfig.headers['Content-Type'] = 'application/x-www-form-urlencoded';
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
axiosConfig.headers = {
|
|
71
|
-
'Content-Type': 'application/x-www-form-urlencoded',
|
|
72
|
-
};
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
else if (requestObject.formData !== undefined) {
|
|
76
|
-
if (axiosConfig.headers !== undefined) {
|
|
77
|
-
const headers = Object.keys(axiosConfig.headers);
|
|
78
|
-
headers.forEach((header) => {
|
|
79
|
-
if (header.toLowerCase() === 'content-type') {
|
|
80
|
-
delete axiosConfig.headers?.[header];
|
|
81
|
-
}
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
if ((0, backend_network_1.isFormDataInstance)(requestObject.formData)) {
|
|
85
|
-
axiosConfig.data = requestObject.formData;
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
axiosConfig.data = (0, backend_network_1.createFormDataObject)(requestObject.formData);
|
|
89
|
-
}
|
|
90
|
-
const headers = axiosConfig.data.getHeaders();
|
|
91
|
-
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
92
|
-
await (0, backend_network_1.generateContentLengthHeader)(axiosConfig);
|
|
93
|
-
}
|
|
94
|
-
else if (requestObject.body !== undefined) {
|
|
95
|
-
if (requestObject.form !== undefined && requestObject.body) {
|
|
96
|
-
requestObject.body = Object.assign(requestObject.body, requestObject.form);
|
|
97
|
-
}
|
|
98
|
-
axiosConfig.data = requestObject.body;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
if (requestObject.uri !== undefined) {
|
|
102
|
-
axiosConfig.url = requestObject.uri?.toString();
|
|
103
|
-
}
|
|
104
|
-
if (requestObject.url !== undefined) {
|
|
105
|
-
axiosConfig.url = requestObject.url?.toString();
|
|
106
|
-
}
|
|
107
|
-
if (requestObject.baseURL !== undefined) {
|
|
108
|
-
axiosConfig.baseURL = requestObject.baseURL?.toString();
|
|
109
|
-
}
|
|
110
|
-
if (requestObject.method !== undefined) {
|
|
111
|
-
axiosConfig.method = requestObject.method;
|
|
112
|
-
}
|
|
113
|
-
if (requestObject.qs !== undefined && Object.keys(requestObject.qs).length > 0) {
|
|
114
|
-
axiosConfig.params = requestObject.qs;
|
|
115
|
-
}
|
|
116
|
-
function hasArrayFormatOptions(arg) {
|
|
117
|
-
if (typeof arg.qsStringifyOptions === 'object' &&
|
|
118
|
-
arg.qsStringifyOptions !== null &&
|
|
119
|
-
!Array.isArray(arg.qsStringifyOptions) &&
|
|
120
|
-
'arrayFormat' in arg.qsStringifyOptions) {
|
|
121
|
-
return true;
|
|
122
|
-
}
|
|
123
|
-
return false;
|
|
124
|
-
}
|
|
125
|
-
if (requestObject.useQuerystring === true ||
|
|
126
|
-
(hasArrayFormatOptions(requestObject) &&
|
|
127
|
-
requestObject.qsStringifyOptions.arrayFormat === 'repeat')) {
|
|
128
|
-
axiosConfig.paramsSerializer = (params) => {
|
|
129
|
-
return (0, qs_1.stringify)(params, { arrayFormat: 'repeat' });
|
|
130
|
-
};
|
|
131
|
-
}
|
|
132
|
-
else if (requestObject.useQuerystring === false) {
|
|
133
|
-
axiosConfig.paramsSerializer = (params) => {
|
|
134
|
-
return (0, qs_1.stringify)(params, { arrayFormat: 'indices' });
|
|
135
|
-
};
|
|
136
|
-
}
|
|
137
|
-
if (hasArrayFormatOptions(requestObject) &&
|
|
138
|
-
requestObject.qsStringifyOptions.arrayFormat === 'brackets') {
|
|
139
|
-
axiosConfig.paramsSerializer = (params) => {
|
|
140
|
-
return (0, qs_1.stringify)(params, { arrayFormat: 'brackets' });
|
|
141
|
-
};
|
|
142
|
-
}
|
|
143
|
-
if (requestObject.auth !== undefined) {
|
|
144
|
-
if (requestObject.auth.bearer !== undefined) {
|
|
145
|
-
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
146
|
-
Authorization: `Bearer ${requestObject.auth.bearer}`,
|
|
147
|
-
});
|
|
148
|
-
}
|
|
149
|
-
else {
|
|
150
|
-
const authObj = requestObject.auth;
|
|
151
|
-
axiosConfig.auth = {
|
|
152
|
-
username: (authObj.user || authObj.username),
|
|
153
|
-
password: (authObj.password || authObj.pass),
|
|
154
|
-
};
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
if (requestObject.json === true) {
|
|
158
|
-
const acceptHeaderExists = axiosConfig.headers === undefined
|
|
159
|
-
? false
|
|
160
|
-
: Object.keys(axiosConfig.headers)
|
|
161
|
-
.map((headerKey) => headerKey.toLowerCase())
|
|
162
|
-
.includes('accept');
|
|
163
|
-
if (!acceptHeaderExists) {
|
|
164
|
-
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
165
|
-
Accept: 'application/json',
|
|
166
|
-
});
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
if (requestObject.json === false || requestObject.json === undefined) {
|
|
170
|
-
axiosConfig.transformResponse = (res) => res;
|
|
171
|
-
}
|
|
172
|
-
const { method } = requestObject;
|
|
173
|
-
if ((requestObject.followRedirect !== false &&
|
|
174
|
-
(!method || method === 'GET' || method === 'HEAD')) ||
|
|
175
|
-
requestObject.followAllRedirects) {
|
|
176
|
-
axiosConfig.maxRedirects = requestObject.maxRedirects;
|
|
177
|
-
}
|
|
178
|
-
else {
|
|
179
|
-
axiosConfig.maxRedirects = 0;
|
|
180
|
-
}
|
|
181
|
-
const host = (0, backend_network_1.getHostFromRequestObject)(requestObject);
|
|
182
|
-
const agentOptions = { ...requestObject.agentOptions };
|
|
183
|
-
if (host) {
|
|
184
|
-
agentOptions.servername = host;
|
|
185
|
-
}
|
|
186
|
-
if (requestObject.rejectUnauthorized === false) {
|
|
187
|
-
agentOptions.rejectUnauthorized = false;
|
|
188
|
-
agentOptions.secureOptions = crypto_1.default.constants.SSL_OP_LEGACY_SERVER_CONNECT;
|
|
189
|
-
}
|
|
190
|
-
if (requestObject.timeout !== undefined) {
|
|
191
|
-
axiosConfig.timeout = requestObject.timeout;
|
|
192
|
-
}
|
|
193
|
-
const secureLookup = ssrfBridge?.createSecureLookup();
|
|
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);
|
|
196
|
-
if (requestObject.useStream) {
|
|
197
|
-
axiosConfig.responseType = 'stream';
|
|
198
|
-
}
|
|
199
|
-
else if (requestObject.encoding === null) {
|
|
200
|
-
axiosConfig.responseType = 'arraybuffer';
|
|
201
|
-
}
|
|
202
|
-
const allHeaders = axiosConfig.headers ? Object.keys(axiosConfig.headers) : [];
|
|
203
|
-
if (!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'accept')) {
|
|
204
|
-
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, { accept: '*/*' });
|
|
205
|
-
}
|
|
206
|
-
if (requestObject.json !== false &&
|
|
207
|
-
axiosConfig.data !== undefined &&
|
|
208
|
-
axiosConfig.data !== '' &&
|
|
209
|
-
!(axiosConfig.data instanceof Buffer) &&
|
|
210
|
-
!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'content-type')) {
|
|
211
|
-
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
212
|
-
'content-type': 'application/json',
|
|
213
|
-
});
|
|
214
|
-
}
|
|
215
|
-
if (requestObject.simple === false) {
|
|
216
|
-
axiosConfig.validateStatus = () => true;
|
|
217
|
-
}
|
|
218
|
-
(0, backend_network_1.applyDefaultOutboundUserAgent)(axiosConfig);
|
|
219
|
-
return axiosConfig;
|
|
220
|
-
}
|
|
221
6
|
async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject, options) {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
};
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
configObject = uriOrObject ?? {};
|
|
232
|
-
}
|
|
233
|
-
const ssrfBridge = additionalData?.ssrfBridge;
|
|
234
|
-
const url = (0, backend_network_1.resolveLegacyRequestUrl)(configObject);
|
|
235
|
-
await (0, backend_network_1.validateUrlSsrf)(url, ssrfBridge);
|
|
236
|
-
axiosConfig = Object.assign(axiosConfig, await parseRequestObject(configObject, ssrfBridge));
|
|
237
|
-
(0, backend_network_1.throwIfDomainNotAllowed)(axiosConfig, configObject.allowedDomains);
|
|
238
|
-
try {
|
|
239
|
-
const response = await (0, backend_network_1.invokeAxios)(axiosConfig, configObject.auth);
|
|
240
|
-
let body = response.data;
|
|
241
|
-
if (body instanceof http_1.IncomingMessage && axiosConfig.responseType === 'stream') {
|
|
242
|
-
(0, backend_network_1.parseIncomingMessage)(body);
|
|
243
|
-
}
|
|
244
|
-
else if (body === '') {
|
|
245
|
-
body = axiosConfig.responseType === 'arraybuffer' ? Buffer.alloc(0) : undefined;
|
|
246
|
-
}
|
|
247
|
-
await additionalData?.hooks?.runHook('nodeFetchedData', [workflow?.id, node]);
|
|
248
|
-
return configObject.resolveWithFullResponse
|
|
249
|
-
? {
|
|
250
|
-
body,
|
|
251
|
-
headers: { ...response.headers },
|
|
252
|
-
statusCode: response.status,
|
|
253
|
-
statusMessage: response.statusText,
|
|
254
|
-
request: response.request,
|
|
255
|
-
}
|
|
256
|
-
: body;
|
|
257
|
-
}
|
|
258
|
-
catch (error) {
|
|
259
|
-
const { config, response } = error;
|
|
260
|
-
if (error.isAxiosError) {
|
|
261
|
-
error.config = error.request = undefined;
|
|
262
|
-
error.options = (0, pick_1.default)(config ?? {}, ['url', 'method', 'data', 'headers']);
|
|
263
|
-
if (response) {
|
|
264
|
-
di_1.Container.get(backend_common_1.Logger).debug('Request proxied to Axios failed', { status: response.status });
|
|
265
|
-
let responseData = response.data;
|
|
266
|
-
if (Buffer.isBuffer(responseData) || responseData instanceof stream_1.Readable) {
|
|
267
|
-
responseData = await (0, backend_network_1.binaryToString)(responseData);
|
|
268
|
-
}
|
|
269
|
-
if (configObject.simple === false) {
|
|
270
|
-
if (configObject.resolveWithFullResponse) {
|
|
271
|
-
return {
|
|
272
|
-
body: responseData,
|
|
273
|
-
headers: response.headers,
|
|
274
|
-
statusCode: response.status,
|
|
275
|
-
statusMessage: response.statusText,
|
|
276
|
-
};
|
|
277
|
-
}
|
|
278
|
-
else {
|
|
279
|
-
return responseData;
|
|
280
|
-
}
|
|
281
|
-
}
|
|
282
|
-
error.message = `${response.status} - ${JSON.stringify(responseData)}`;
|
|
283
|
-
throw Object.assign(error, {
|
|
284
|
-
statusCode: response.status,
|
|
285
|
-
status: response.status,
|
|
286
|
-
error: responseData,
|
|
287
|
-
response: (0, pick_1.default)(response, ['headers', 'status', 'statusText']),
|
|
288
|
-
});
|
|
289
|
-
}
|
|
290
|
-
else if ('rejectUnauthorized' in configObject && error.code?.includes('CERT')) {
|
|
291
|
-
throw new n8n_workflow_1.NodeSslError(error);
|
|
292
|
-
}
|
|
293
|
-
}
|
|
294
|
-
throw error;
|
|
295
|
-
}
|
|
7
|
+
const configObject = typeof uriOrObject === 'string' ? { uri: uriOrObject, ...options } : (uriOrObject ?? {});
|
|
8
|
+
const client = di_1.Container.get(backend_network_1.OutboundHttp).requests({
|
|
9
|
+
ssrf: additionalData?.ssrfBridge ?? 'disabled',
|
|
10
|
+
});
|
|
11
|
+
return await client.requestLegacy(configObject, {
|
|
12
|
+
onFetched: async () => {
|
|
13
|
+
await additionalData?.hooks?.runHook('nodeFetchedData', [workflow?.id, node]);
|
|
14
|
+
},
|
|
15
|
+
});
|
|
296
16
|
}
|
|
297
17
|
//# sourceMappingURL=legacy-request-adapter.js.map
|
|
@@ -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":";;AAcA,kDAqBC;AAjCD,0DAAoD;AACpD,gCAAoC;AAW7B,KAAK,UAAU,mBAAmB,CACxC,QAA8B,EAC9B,cAA0D,EAC1D,IAAuB,EACvB,WAAqC,EACrC,OAAyB;IAEzB,MAAM,YAAY,GACjB,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAI1F,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,8BAAY,CAAC,CAAC,QAAQ,CAAC;QACnD,IAAI,EAAE,cAAc,EAAE,UAAU,IAAI,UAAU;KAC9C,CAAC,CAAC;IAEH,OAAO,MAAM,MAAM,CAAC,aAAa,CAAC,YAAY,EAAE;QAC/C,SAAS,EAAE,KAAK,IAAI,EAAE;YACrB,MAAM,cAAc,EAAE,KAAK,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/E,CAAC;KACD,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IAdditionalCredentialOptions, IExecuteData, IExecuteFunctions, INode, IRequestOptions, IWorkflowDataProxyAdditionalKeys, NodeParameterValueType, PaginationOptions } from 'n8n-workflow';
|
|
1
|
+
import type { IAdditionalCredentialOptions, IDataObject, IExecuteData, IExecuteFunctions, INode, IRequestOptions, IWorkflowDataProxyAdditionalKeys, NodeParameterValueType, PaginationOptions } from 'n8n-workflow';
|
|
2
2
|
export type ResolveValueFn = (parameterValue: NodeParameterValueType, itemIndex: number, runIndex: number, executeData: IExecuteData, additionalKeys?: IWorkflowDataProxyAdditionalKeys, returnObjectAsString?: boolean) => NodeParameterValueType;
|
|
3
3
|
export declare function applyPaginationRequestData(requestData: IRequestOptions, paginationRequestData: PaginationOptions['request']): IRequestOptions;
|
|
4
|
-
export declare function requestWithAuthenticationPaginated(this: IExecuteFunctions, requestOptions: IRequestOptions, itemIndex: number, paginationOptions: PaginationOptions, resolveValue: ResolveValueFn, node: INode, credentialsType?: string, additionalCredentialOptions?: IAdditionalCredentialOptions): Promise<any[]>;
|
|
4
|
+
export declare function requestWithAuthenticationPaginated(this: IExecuteFunctions, requestOptions: IRequestOptions, itemIndex: number, paginationOptions: PaginationOptions, resolveValue: ResolveValueFn, node: INode, credentialsType?: string, additionalCredentialOptions?: IAdditionalCredentialOptions, sanitizedRequest?: IDataObject): Promise<any[]>;
|
|
@@ -26,7 +26,7 @@ function applyPaginationRequestData(requestData, paginationRequestData) {
|
|
|
26
26
|
}
|
|
27
27
|
return (0, merge_1.default)({}, requestData, preparedPaginationData);
|
|
28
28
|
}
|
|
29
|
-
async function requestWithAuthenticationPaginated(requestOptions, itemIndex, paginationOptions, resolveValue, node, credentialsType, additionalCredentialOptions) {
|
|
29
|
+
async function requestWithAuthenticationPaginated(requestOptions, itemIndex, paginationOptions, resolveValue, node, credentialsType, additionalCredentialOptions, sanitizedRequest) {
|
|
30
30
|
const responseData = [];
|
|
31
31
|
if (!requestOptions.qs) {
|
|
32
32
|
requestOptions.qs = {};
|
|
@@ -38,7 +38,7 @@ async function requestWithAuthenticationPaginated(requestOptions, itemIndex, pag
|
|
|
38
38
|
let paginateRequestData;
|
|
39
39
|
const runIndex = 0;
|
|
40
40
|
const additionalKeys = {
|
|
41
|
-
$request: requestOptions,
|
|
41
|
+
$request: sanitizedRequest ?? requestOptions,
|
|
42
42
|
$response: {},
|
|
43
43
|
$version: node.typeVersion,
|
|
44
44
|
$pageCount: 0,
|
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-core",
|
|
3
|
-
"version": "2.27.
|
|
3
|
+
"version": "2.27.3",
|
|
4
4
|
"description": "Core functionality of n8n",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"files": [
|
|
14
14
|
"dist",
|
|
15
15
|
"bin",
|
|
16
|
-
"
|
|
17
|
-
"
|
|
16
|
+
"LICENSE_EE.md",
|
|
17
|
+
"LICENSE.md"
|
|
18
18
|
],
|
|
19
19
|
"devDependencies": {
|
|
20
20
|
"@types/express": "^5.0.1",
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
"vitest": "^4.1.1",
|
|
29
29
|
"vitest-mock-extended": "^3.1.0",
|
|
30
30
|
"zod": "3.25.67",
|
|
31
|
-
"@n8n/playwright-janitor": "0.1.0",
|
|
32
31
|
"@n8n/errors": "0.10.0",
|
|
33
|
-
"@n8n/
|
|
34
|
-
"@n8n/
|
|
32
|
+
"@n8n/typescript-config": "1.6.1",
|
|
33
|
+
"@n8n/playwright-janitor": "0.1.0",
|
|
34
|
+
"@n8n/vitest-config": "1.15.0"
|
|
35
35
|
},
|
|
36
36
|
"peerDependencies": {
|
|
37
37
|
"zod": "3.25.67"
|
|
@@ -63,15 +63,15 @@
|
|
|
63
63
|
"uuid": "11.1.1",
|
|
64
64
|
"winston": "3.14.2",
|
|
65
65
|
"xml2js": "0.6.2",
|
|
66
|
-
"@n8n/backend-
|
|
67
|
-
"@n8n/backend-network": "1.1.1",
|
|
66
|
+
"@n8n/backend-network": "1.1.3",
|
|
68
67
|
"@n8n/client-oauth2": "1.9.0",
|
|
69
68
|
"@n8n/config": "2.25.1",
|
|
70
69
|
"@n8n/constants": "0.27.0",
|
|
71
|
-
"@n8n/decorators": "1.27.1",
|
|
72
|
-
"@n8n/workflow-sdk": "0.20.0",
|
|
73
70
|
"@n8n/di": "0.14.0",
|
|
74
|
-
"n8n
|
|
71
|
+
"@n8n/decorators": "1.27.3",
|
|
72
|
+
"n8n-workflow": "2.27.2",
|
|
73
|
+
"@n8n/workflow-sdk": "0.20.2",
|
|
74
|
+
"@n8n/backend-common": "1.27.3"
|
|
75
75
|
},
|
|
76
76
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
77
77
|
"homepage": "https://n8n.io",
|