n8n-core 1.21.1 → 1.22.0

package/dist/NodeExecuteFunctions.d.ts

@@ -43,5 +43,5 @@ export declare function getExecuteFunctions(workflow: Workflow, runExecutionData
 export declare function getExecuteSingleFunctions(workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, connectionInputData: INodeExecutionData[], inputData: ITaskDataConnections, node: INode, itemIndex: number, additionalData: IWorkflowExecuteAdditionalData, executeData: IExecuteData, mode: WorkflowExecuteMode, abortSignal?: AbortSignal): IExecuteSingleFunctions;
 export declare function getCredentialTestFunctions(): ICredentialTestFunctions;
 export declare function getLoadOptionsFunctions(workflow: Workflow, node: INode, path: string, additionalData: IWorkflowExecuteAdditionalData): ILoadOptionsFunctions;
-export declare function getExecuteHookFunctions(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, isTest?: boolean, webhookData?: IWebhookData): IHookFunctions;
+export declare function getExecuteHookFunctions(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, webhookData?: IWebhookData): IHookFunctions;
 export declare function getExecuteWebhookFunctions(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, webhookData: IWebhookData): IWebhookFunctions;

package/dist/NodeExecuteFunctions.js

@@ -64,6 +64,12 @@ axios_1.default.defaults.paramsSerializer = (params) => {
     }
     return (0, qs_1.stringify)(params, { arrayFormat: 'indices' });
 };
+axios_1.default.interceptors.request.use((config) => {
+    if (config.data === undefined) {
+        config.headers.setContentType(false, false);
+    }
+    return config;
+});
 const pushFormDataValue = (form, key, value) => {
     if ((value === null || value === void 0 ? void 0 : value.hasOwnProperty('value')) && value.hasOwnProperty('options')) {
         form.append(key, value.value, value.options);
@@ -88,21 +94,21 @@ const createFormDataObject = (data) => {
     });
     return formData;
 };
-function searchForHeader(headers, headerName) {
-    if (headers === undefined) {
+function searchForHeader(config, headerName) {
+    if (config.headers === undefined) {
         return undefined;
     }
-    const headerNames = Object.keys(headers);
+    const headerNames = Object.keys(config.headers);
     headerName = headerName.toLowerCase();
     return headerNames.find((thisHeader) => thisHeader.toLowerCase() === headerName);
 }
-async function generateContentLengthHeader(formData, headers) {
-    if (!(formData === null || formData === void 0 ? void 0 : formData.getLength)) {
+async function generateContentLengthHeader(config) {
+    if (!(config.data instanceof form_data_1.default)) {
         return;
     }
     try {
         const length = await new Promise((res, rej) => {
-            formData.getLength((error, length) => {
+            config.data.getLength((error, length) => {
                 if (error) {
                     rej(error);
                     return;
@@ -110,16 +116,17 @@ async function generateContentLengthHeader(formData, headers) {
                 res(length);
             });
         });
-        headers = Object.assign(headers, {
+        config.headers = {
+            ...config.headers,
             'content-length': length,
-        });
+        };
     }
     catch (error) {
         n8n_workflow_1.LoggerProxy.error('Unable to calculate form data length', { error });
     }
 }
 async function parseRequestObject(requestObject) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const axiosConfig = {};
     if (requestObject.headers !== undefined) {
         axiosConfig.headers = requestObject.headers;
@@ -127,7 +134,7 @@ async function parseRequestObject(requestObject) {
     const contentTypeHeaderKeyName = axiosConfig.headers &&
         Object.keys(axiosConfig.headers).find((headerName) => headerName.toLowerCase() === 'content-type');
     const contentType = contentTypeHeaderKeyName &&
-        axiosConfig.headers[contentTypeHeaderKeyName];
+        ((_a = axiosConfig.headers) === null || _a === void 0 ? void 0 : _a[contentTypeHeaderKeyName]);
     if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
         if (typeof requestObject.body === 'string') {
             axiosConfig.data = requestObject.body;
@@ -142,7 +149,7 @@ async function parseRequestObject(requestObject) {
             }
         }
     }
-    else if (contentType && contentType.includes('multipart/form-data') !== false) {
+    else if (contentType === null || contentType === void 0 ? void 0 : contentType.includes('multipart/form-data')) {
         if (requestObject.formData !== undefined && requestObject.formData instanceof form_data_1.default) {
             axiosConfig.data = requestObject.formData;
         }
@@ -153,10 +160,10 @@ async function parseRequestObject(requestObject) {
             };
             axiosConfig.data = createFormDataObject(allData);
         }
-        delete axiosConfig.headers[contentTypeHeaderKeyName];
+        (_b = axiosConfig.headers) === null || _b === void 0 ? true : delete _b[contentTypeHeaderKeyName];
         const headers = axiosConfig.data.getHeaders();
         axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
-        await generateContentLengthHeader(axiosConfig.data, axiosConfig.headers);
+        await generateContentLengthHeader(axiosConfig);
     }
     else {
         if (requestObject.form !== undefined && requestObject.body === undefined) {
@@ -165,7 +172,7 @@ async function parseRequestObject(requestObject) {
                     ? (0, qs_1.stringify)(requestObject.form, { format: 'RFC3986' })
                     : (0, qs_1.stringify)(requestObject.form).toString();
             if (axiosConfig.headers !== undefined) {
-                const headerName = searchForHeader(axiosConfig.headers, 'content-type');
+                const headerName = searchForHeader(axiosConfig, 'content-type');
                 if (headerName) {
                     delete axiosConfig.headers[headerName];
                 }
@@ -180,7 +187,12 @@ async function parseRequestObject(requestObject) {
         else if (requestObject.formData !== undefined) {
             if (axiosConfig.headers !== undefined) {
                 const headers = Object.keys(axiosConfig.headers);
-                headers.forEach((header) => header.toLowerCase() === 'content-type' ? delete axiosConfig.headers[header] : null);
+                headers.forEach((header) => {
+                    var _a;
+                    if (header.toLowerCase() === 'content-type') {
+                        (_a = axiosConfig.headers) === null || _a === void 0 ? true : delete _a[header];
+                    }
+                });
             }
             if (requestObject.formData instanceof form_data_1.default) {
                 axiosConfig.data = requestObject.formData;
@@ -190,7 +202,7 @@ async function parseRequestObject(requestObject) {
             }
             const headers = axiosConfig.data.getHeaders();
             axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
-            await generateContentLengthHeader(axiosConfig.data, axiosConfig.headers);
+            await generateContentLengthHeader(axiosConfig);
         }
         else if (requestObject.body !== undefined) {
             if (requestObject.form !== undefined && requestObject.body) {
@@ -200,13 +212,13 @@ async function parseRequestObject(requestObject) {
         }
     }
     if (requestObject.uri !== undefined) {
-        axiosConfig.url = (_a = requestObject.uri) === null || _a === void 0 ? void 0 : _a.toString();
+        axiosConfig.url = (_c = requestObject.uri) === null || _c === void 0 ? void 0 : _c.toString();
     }
     if (requestObject.url !== undefined) {
-        axiosConfig.url = (_b = requestObject.url) === null || _b === void 0 ? void 0 : _b.toString();
+        axiosConfig.url = (_d = requestObject.url) === null || _d === void 0 ? void 0 : _d.toString();
     }
     if (requestObject.baseURL !== undefined) {
-        axiosConfig.baseURL = (_c = requestObject.baseURL) === null || _c === void 0 ? void 0 : _c.toString();
+        axiosConfig.baseURL = (_e = requestObject.baseURL) === null || _e === void 0 ? void 0 : _e.toString();
     }
     if (requestObject.method !== undefined) {
         axiosConfig.method = requestObject.method;
@@ -524,7 +536,7 @@ async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject,
         return configObject.resolveWithFullResponse
             ? {
                 body,
-                headers: response.headers,
+                headers: { ...response.headers },
                 statusCode: response.status,
                 statusMessage: response.statusText,
                 request: response.request,
@@ -573,6 +585,7 @@ async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject,
 }
 exports.proxyRequestToAxios = proxyRequestToAxios;
 function convertN8nRequestToAxios(n8nRequest) {
+    var _a;
     const { headers, method, timeout, auth, proxy, url } = n8nRequest;
     const axiosRequest = {
         headers: headers !== null && headers !== void 0 ? headers : {},
@@ -606,7 +619,7 @@ function convertN8nRequestToAxios(n8nRequest) {
     }
     const { body } = n8nRequest;
     if (body) {
-        const existingContentTypeHeaderKey = searchForHeader(axiosRequest.headers, 'content-type');
+        const existingContentTypeHeaderKey = searchForHeader(axiosRequest, 'content-type');
         if (existingContentTypeHeaderKey === undefined) {
             axiosRequest.headers = axiosRequest.headers || {};
             if (body instanceof form_data_1.default) {
@@ -619,7 +632,7 @@ function convertN8nRequestToAxios(n8nRequest) {
                 axiosRequest.headers['Content-Type'] = 'application/x-www-form-urlencoded';
             }
         }
-        else if (axiosRequest.headers[existingContentTypeHeaderKey] === 'application/x-www-form-urlencoded') {
+        else if (((_a = axiosRequest.headers) === null || _a === void 0 ? void 0 : _a[existingContentTypeHeaderKey]) === 'application/x-www-form-urlencoded') {
             axiosRequest.data = new url_1.URLSearchParams(n8nRequest.body);
         }
         if (typeof body === 'string' || (typeof body === 'object' && !(0, n8n_workflow_1.isObjectEmpty)(body))) {
@@ -627,14 +640,20 @@ function convertN8nRequestToAxios(n8nRequest) {
         }
     }
     if (n8nRequest.json) {
-        const key = searchForHeader(axiosRequest.headers, 'accept');
+        const key = searchForHeader(axiosRequest, 'accept');
         if (!key) {
-            axiosRequest.headers.Accept = 'application/json';
+            axiosRequest.headers = {
+                ...axiosRequest.headers,
+                Accept: 'application/json',
+            };
         }
     }
-    const userAgentHeader = searchForHeader(axiosRequest.headers, 'user-agent');
+    const userAgentHeader = searchForHeader(axiosRequest, 'user-agent');
     if (!userAgentHeader) {
-        axiosRequest.headers['User-Agent'] = 'n8n';
+        axiosRequest.headers = {
+            ...axiosRequest.headers,
+            'User-Agent': 'n8n',
+        };
     }
     if (n8nRequest.ignoreHttpStatusErrors) {
         axiosRequest.validateStatus = () => true;
@@ -2271,7 +2290,7 @@ function getLoadOptionsFunctions(workflow, node, path, additionalData) {
     })(workflow, node, path);
 }
 exports.getLoadOptionsFunctions = getLoadOptionsFunctions;
-function getExecuteHookFunctions(workflow, node, additionalData, mode, activation, isTest, webhookData) {
+function getExecuteHookFunctions(workflow, node, additionalData, mode, activation, webhookData) {
     return ((workflow, node) => {
         return {
             ...getCommonWorkflowFunctions(workflow, node, additionalData),
@@ -2286,7 +2305,7 @@ function getExecuteHookFunctions(workflow, node, additionalData, mode, activatio
                 return getNodeParameter(workflow, runExecutionData, runIndex, connectionInputData, node, parameterName, itemIndex, mode, getAdditionalKeys(additionalData, mode, runExecutionData), undefined, fallbackValue, options);
             },
             getNodeWebhookUrl: (name) => {
-                return getNodeWebhookUrl(name, workflow, node, additionalData, mode, getAdditionalKeys(additionalData, mode, null), isTest);
+                return getNodeWebhookUrl(name, workflow, node, additionalData, mode, getAdditionalKeys(additionalData, mode, null), webhookData === null || webhookData === void 0 ? void 0 : webhookData.isTest);
             },
             getWebhookName() {
                 if (webhookData === undefined) {