n8n-core 2.25.2 → 2.26.1

package/dist/execution-engine/node-execution-context/utils/request-helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/index.ts"],"names":[],"mappings":";;;AAAA,6CAauB;AAZtB,mHAAA,oBAAoB,OAAA;AACpB,oHAAA,qBAAqB,OAAA;AACrB,0HAAA,2BAA2B,OAAA;AAC3B,kHAAA,mBAAmB,OAAA;AACnB,uHAAA,wBAAwB,OAAA;AACxB,iHAAA,kBAAkB,OAAA;AAClB,wHAAA,yBAAyB,OAAA;AACzB,8GAAA,eAAe,OAAA;AACf,0GAAA,WAAW,OAAA;AACX,6GAAA,cAAc,OAAA;AACd,oHAAA,qBAAqB,OAAA;AACrB,6GAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/execution-engine/node-execution-context/utils/request-helpers/index.ts"],"names":[],"mappings":";;;AACA,0BAAwB;AAExB,qCAAsD;AAA7C,oHAAA,yBAAyB,OAAA"}

package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.d.ts

@@ -0,0 +1,5 @@
+import type { AxiosRequestConfig } from 'axios';
+import type { INode, IRequestOptions, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow';
+import type { SsrfBridge } from '../../../../ssrf';
+export declare function parseRequestObject(requestObject: IRequestOptions, ssrfBridge?: SsrfBridge): Promise<AxiosRequestConfig<any>>;
+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

@@ -0,0 +1,301 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRequestObject = parseRequestObject;
+exports.proxyRequestToAxios = proxyRequestToAxios;
+const backend_common_1 = require("@n8n/backend-common");
+const di_1 = require("@n8n/di");
+const crypto_1 = __importDefault(require("crypto"));
+const http_1 = require("http");
+const pick_1 = __importDefault(require("lodash/pick"));
+const n8n_workflow_1 = require("n8n-workflow");
+const qs_1 = require("qs");
+const stream_1 = require("stream");
+const binary_helper_functions_1 = require("../binary-helper-functions");
+const parse_incoming_message_1 = require("../parse-incoming-message");
+const axios_utils_1 = require("./axios-utils");
+const http_request_1 = require("./http-request");
+const outbound_user_agent_1 = require("./outbound-user-agent");
+async function parseRequestObject(requestObject, ssrfBridge) {
+    const axiosConfig = {};
+    if (requestObject.headers !== undefined) {
+        axiosConfig.headers = requestObject.headers;
+    }
+    const contentTypeHeaderKeyName = axiosConfig.headers &&
+        Object.keys(axiosConfig.headers).find((headerName) => headerName.toLowerCase() === 'content-type');
+    const contentType = contentTypeHeaderKeyName &&
+        axiosConfig.headers?.[contentTypeHeaderKeyName];
+    if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
+        if (typeof requestObject.body === 'string') {
+            axiosConfig.data = requestObject.body;
+        }
+        else {
+            const allData = Object.assign(requestObject.body || {}, requestObject.form || {});
+            if (requestObject.useQuerystring === true) {
+                axiosConfig.data = (0, qs_1.stringify)(allData, { arrayFormat: 'repeat' });
+            }
+            else {
+                axiosConfig.data = (0, qs_1.stringify)(allData);
+            }
+        }
+    }
+    else if (contentType?.includes('multipart/form-data')) {
+        if (requestObject.formData !== undefined && (0, axios_utils_1.isFormDataInstance)(requestObject.formData)) {
+            axiosConfig.data = requestObject.formData;
+        }
+        else {
+            const allData = {
+                ...requestObject.body,
+                ...requestObject.formData,
+            };
+            axiosConfig.data = (0, axios_utils_1.createFormDataObject)(allData);
+        }
+        delete axiosConfig.headers?.[contentTypeHeaderKeyName];
+        const headers = axiosConfig.data.getHeaders();
+        axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
+        await (0, axios_utils_1.generateContentLengthHeader)(axiosConfig);
+    }
+    else {
+        if (requestObject.form !== undefined && requestObject.body === undefined) {
+            axiosConfig.data =
+                typeof requestObject.form === 'string'
+                    ? (0, qs_1.stringify)(requestObject.form, { format: 'RFC3986' })
+                    : (0, qs_1.stringify)(requestObject.form).toString();
+            if (axiosConfig.headers !== undefined) {
+                const headerName = (0, axios_utils_1.searchForHeader)(axiosConfig, 'content-type');
+                if (headerName) {
+                    delete axiosConfig.headers[headerName];
+                }
+                axiosConfig.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+            }
+            else {
+                axiosConfig.headers = {
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                };
+            }
+        }
+        else if (requestObject.formData !== undefined) {
+            if (axiosConfig.headers !== undefined) {
+                const headers = Object.keys(axiosConfig.headers);
+                headers.forEach((header) => {
+                    if (header.toLowerCase() === 'content-type') {
+                        delete axiosConfig.headers?.[header];
+                    }
+                });
+            }
+            if ((0, axios_utils_1.isFormDataInstance)(requestObject.formData)) {
+                axiosConfig.data = requestObject.formData;
+            }
+            else {
+                axiosConfig.data = (0, axios_utils_1.createFormDataObject)(requestObject.formData);
+            }
+            const headers = axiosConfig.data.getHeaders();
+            axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
+            await (0, axios_utils_1.generateContentLengthHeader)(axiosConfig);
+        }
+        else if (requestObject.body !== undefined) {
+            if (requestObject.form !== undefined && requestObject.body) {
+                requestObject.body = Object.assign(requestObject.body, requestObject.form);
+            }
+            axiosConfig.data = requestObject.body;
+        }
+    }
+    if (requestObject.uri !== undefined) {
+        axiosConfig.url = requestObject.uri?.toString();
+    }
+    if (requestObject.url !== undefined) {
+        axiosConfig.url = requestObject.url?.toString();
+    }
+    if (requestObject.baseURL !== undefined) {
+        axiosConfig.baseURL = requestObject.baseURL?.toString();
+    }
+    if (requestObject.method !== undefined) {
+        axiosConfig.method = requestObject.method;
+    }
+    if (requestObject.qs !== undefined && Object.keys(requestObject.qs).length > 0) {
+        axiosConfig.params = requestObject.qs;
+    }
+    function hasArrayFormatOptions(arg) {
+        if (typeof arg.qsStringifyOptions === 'object' &&
+            arg.qsStringifyOptions !== null &&
+            !Array.isArray(arg.qsStringifyOptions) &&
+            'arrayFormat' in arg.qsStringifyOptions) {
+            return true;
+        }
+        return false;
+    }
+    if (requestObject.useQuerystring === true ||
+        (hasArrayFormatOptions(requestObject) &&
+            requestObject.qsStringifyOptions.arrayFormat === 'repeat')) {
+        axiosConfig.paramsSerializer = (params) => {
+            return (0, qs_1.stringify)(params, { arrayFormat: 'repeat' });
+        };
+    }
+    else if (requestObject.useQuerystring === false) {
+        axiosConfig.paramsSerializer = (params) => {
+            return (0, qs_1.stringify)(params, { arrayFormat: 'indices' });
+        };
+    }
+    if (hasArrayFormatOptions(requestObject) &&
+        requestObject.qsStringifyOptions.arrayFormat === 'brackets') {
+        axiosConfig.paramsSerializer = (params) => {
+            return (0, qs_1.stringify)(params, { arrayFormat: 'brackets' });
+        };
+    }
+    if (requestObject.auth !== undefined) {
+        if (requestObject.auth.bearer !== undefined) {
+            axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
+                Authorization: `Bearer ${requestObject.auth.bearer}`,
+            });
+        }
+        else {
+            const authObj = requestObject.auth;
+            axiosConfig.auth = {
+                username: (authObj.user || authObj.username),
+                password: (authObj.password || authObj.pass),
+            };
+        }
+    }
+    if (requestObject.json === true) {
+        const acceptHeaderExists = axiosConfig.headers === undefined
+            ? false
+            : Object.keys(axiosConfig.headers)
+                .map((headerKey) => headerKey.toLowerCase())
+                .includes('accept');
+        if (!acceptHeaderExists) {
+            axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
+                Accept: 'application/json',
+            });
+        }
+    }
+    if (requestObject.json === false || requestObject.json === undefined) {
+        axiosConfig.transformResponse = (res) => res;
+    }
+    const { method } = requestObject;
+    if ((requestObject.followRedirect !== false &&
+        (!method || method === 'GET' || method === 'HEAD')) ||
+        requestObject.followAllRedirects) {
+        axiosConfig.maxRedirects = requestObject.maxRedirects;
+    }
+    else {
+        axiosConfig.maxRedirects = 0;
+    }
+    const host = (0, axios_utils_1.getHostFromRequestObject)(requestObject);
+    const agentOptions = { ...requestObject.agentOptions };
+    if (host) {
+        agentOptions.servername = host;
+    }
+    if (requestObject.rejectUnauthorized === false) {
+        agentOptions.rejectUnauthorized = false;
+        agentOptions.secureOptions = crypto_1.default.constants.SSL_OP_LEGACY_SERVER_CONNECT;
+    }
+    if (requestObject.timeout !== undefined) {
+        axiosConfig.timeout = requestObject.timeout;
+    }
+    const secureLookup = ssrfBridge?.createSecureLookup();
+    (0, axios_utils_1.setAxiosAgents)(axiosConfig, agentOptions, requestObject.proxy, secureLookup);
+    axiosConfig.beforeRedirect = (0, axios_utils_1.getBeforeRedirectFn)(agentOptions, axiosConfig, requestObject.proxy, requestObject.sendCredentialsOnCrossOriginRedirect ?? true, requestObject.allowedDomains, ssrfBridge);
+    if (requestObject.useStream) {
+        axiosConfig.responseType = 'stream';
+    }
+    else if (requestObject.encoding === null) {
+        axiosConfig.responseType = 'arraybuffer';
+    }
+    const allHeaders = axiosConfig.headers ? Object.keys(axiosConfig.headers) : [];
+    if (!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'accept')) {
+        axiosConfig.headers = Object.assign(axiosConfig.headers || {}, { accept: '*/*' });
+    }
+    if (requestObject.json !== false &&
+        axiosConfig.data !== undefined &&
+        axiosConfig.data !== '' &&
+        !(axiosConfig.data instanceof Buffer) &&
+        !allHeaders.some((headerKey) => headerKey.toLowerCase() === 'content-type')) {
+        axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
+            'content-type': 'application/json',
+        });
+    }
+    if (requestObject.simple === false) {
+        axiosConfig.validateStatus = () => true;
+    }
+    (0, outbound_user_agent_1.applyDefaultOutboundUserAgent)(axiosConfig);
+    return axiosConfig;
+}
+async function proxyRequestToAxios(workflow, additionalData, node, uriOrObject, options) {
+    let axiosConfig = {
+        maxBodyLength: Infinity,
+        maxContentLength: -1,
+    };
+    let configObject;
+    if (typeof uriOrObject === 'string') {
+        configObject = { uri: uriOrObject, ...options };
+    }
+    else {
+        configObject = uriOrObject ?? {};
+    }
+    const ssrfBridge = additionalData?.ssrfBridge;
+    const url = (0, axios_utils_1.resolveLegacyRequestUrl)(configObject);
+    await (0, axios_utils_1.validateUrlSsrf)(url, ssrfBridge);
+    axiosConfig = Object.assign(axiosConfig, await parseRequestObject(configObject, ssrfBridge));
+    (0, axios_utils_1.throwIfDomainNotAllowed)(axiosConfig, configObject.allowedDomains);
+    try {
+        const response = await (0, http_request_1.invokeAxios)(axiosConfig, configObject.auth);
+        let body = response.data;
+        if (body instanceof http_1.IncomingMessage && axiosConfig.responseType === 'stream') {
+            (0, parse_incoming_message_1.parseIncomingMessage)(body);
+        }
+        else if (body === '') {
+            body = axiosConfig.responseType === 'arraybuffer' ? Buffer.alloc(0) : undefined;
+        }
+        await additionalData?.hooks?.runHook('nodeFetchedData', [workflow?.id, node]);
+        return configObject.resolveWithFullResponse
+            ? {
+                body,
+                headers: { ...response.headers },
+                statusCode: response.status,
+                statusMessage: response.statusText,
+                request: response.request,
+            }
+            : body;
+    }
+    catch (error) {
+        const { config, response } = error;
+        if (error.isAxiosError) {
+            error.config = error.request = undefined;
+            error.options = (0, pick_1.default)(config ?? {}, ['url', 'method', 'data', 'headers']);
+            if (response) {
+                di_1.Container.get(backend_common_1.Logger).debug('Request proxied to Axios failed', { status: response.status });
+                let responseData = response.data;
+                if (Buffer.isBuffer(responseData) || responseData instanceof stream_1.Readable) {
+                    responseData = await (0, binary_helper_functions_1.binaryToString)(responseData);
+                }
+                if (configObject.simple === false) {
+                    if (configObject.resolveWithFullResponse) {
+                        return {
+                            body: responseData,
+                            headers: response.headers,
+                            statusCode: response.status,
+                            statusMessage: response.statusText,
+                        };
+                    }
+                    else {
+                        return responseData;
+                    }
+                }
+                error.message = `${response.status} - ${JSON.stringify(responseData)}`;
+                throw Object.assign(error, {
+                    statusCode: response.status,
+                    status: response.status,
+                    error: responseData,
+                    response: (0, pick_1.default)(response, ['headers', 'status', 'statusText']),
+                });
+            }
+            else if ('rejectUnauthorized' in configObject && error.code?.includes('CERT')) {
+                throw new n8n_workflow_1.NodeSslError(error);
+            }
+        }
+        throw error;
+    }
+}
+//# sourceMappingURL=legacy-request-adapter.js.map

package/dist/execution-engine/node-execution-context/utils/request-helpers/legacy-request-adapter.js.map

@@ -0,0 +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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"}

package/dist/execution-engine/node-execution-context/utils/request-helpers/oauth.d.ts

@@ -0,0 +1,5 @@
+import type { ClientOAuth2TokenData } from '@n8n/client-oauth2';
+import type { IAllExecuteFunctions, IHttpRequestOptions, INode, IOAuth2Options, IRequestOptions, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+export declare function requestOAuth2(this: IAllExecuteFunctions, credentialsType: string, requestOptions: IHttpRequestOptions | IRequestOptions, node: INode, additionalData: IWorkflowExecuteAdditionalData, oAuth2Options?: IOAuth2Options, isN8nRequest?: boolean): Promise<any>;
+export declare function requestOAuth1(this: IAllExecuteFunctions, credentialsType: string, requestOptions: IHttpRequestOptions | IRequestOptions, isN8nRequest?: boolean): Promise<any>;
+export declare function refreshOAuth2Token(this: IAllExecuteFunctions, credentialsType: string, node: INode, additionalData: IWorkflowExecuteAdditionalData, oAuth2Options?: IOAuth2Options): Promise<ClientOAuth2TokenData>;

package/dist/execution-engine/node-execution-context/utils/request-helpers/oauth.js

@@ -0,0 +1,288 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestOAuth2 = requestOAuth2;
+exports.requestOAuth1 = requestOAuth1;
+exports.refreshOAuth2Token = refreshOAuth2Token;
+const client_oauth2_1 = require("@n8n/client-oauth2");
+const crypto_1 = require("crypto");
+const get_1 = __importDefault(require("lodash/get"));
+const n8n_workflow_1 = require("n8n-workflow");
+const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
+const http_request_1 = require("./http-request");
+function createOAuth2Client(credentials) {
+    const scopes = credentials.scope
+        ?.split(' ')
+        .map((s) => s.trim())
+        .filter(Boolean);
+    return new client_oauth2_1.ClientOAuth2({
+        clientId: credentials.clientId,
+        clientSecret: credentials.clientSecret,
+        accessTokenUri: credentials.accessTokenUrl,
+        scopes: scopes?.length ? scopes : undefined,
+        ignoreSSLIssues: credentials.ignoreSSLIssues,
+        authentication: credentials.authentication ?? 'header',
+        ...(credentials.additionalBodyProperties && {
+            additionalBodyProperties: (0, n8n_workflow_1.jsonParse)(credentials.additionalBodyProperties, {
+                fallbackValue: {},
+            }),
+        }),
+    });
+}
+function buildSigningToken(client, tokenData, oAuth2Options) {
+    const accessToken = (0, get_1.default)(tokenData, oAuth2Options?.property) || tokenData.accessToken;
+    const refreshToken = tokenData.refreshToken;
+    return client.createToken({
+        ...tokenData,
+        ...(accessToken ? { access_token: accessToken } : {}),
+        ...(refreshToken ? { refresh_token: refreshToken } : {}),
+    }, oAuth2Options?.tokenType || tokenData.tokenType);
+}
+async function decryptOAuth2TokenDataIfConfigured(additionalData, tokenData, jweEnabled) {
+    if (!jweEnabled)
+        return tokenData;
+    const proxy = additionalData['oauth-jwe']?.oauthJweProxyProvider;
+    if (!proxy || !tokenData)
+        return tokenData;
+    return await proxy.decryptOAuth2TokenData(tokenData);
+}
+function isRevokedOAuth2GrantError(error) {
+    if (!(error instanceof client_oauth2_1.AuthError))
+        return false;
+    const body = error.body;
+    return body?.error === 'invalid_grant';
+}
+function buildOAuth2ReconnectError(node, credentialsType) {
+    const credentialName = node.credentials?.[credentialsType]?.name;
+    const credentialLabel = credentialName ? `"${credentialName}"` : `of type "${credentialsType}"`;
+    return new n8n_workflow_1.NodeOperationError(node, `The credential ${credentialLabel} needs to be reconnected.`, {
+        description: 'Access could not be refreshed because the connected account has revoked access, the refresh token expired, or the account password or permissions changed. Open the credential and reconnect it to continue.',
+        level: 'warning',
+    });
+}
+async function refreshOrFetchToken(ctx) {
+    const { credentials, token, credentialsType, node, additionalData, oAuth2Options, logger, helpers, } = ctx;
+    const tokenRefreshOptions = {};
+    if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
+        const body = {
+            client_id: credentials.clientId,
+            ...(credentials.grantType === 'authorizationCode' && {
+                client_secret: credentials.clientSecret,
+            }),
+        };
+        tokenRefreshOptions.body = body;
+        tokenRefreshOptions.headers = { Authorization: '' };
+    }
+    logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Revalidating.`);
+    let newToken;
+    try {
+        if (credentials.grantType === 'clientCredentials') {
+            newToken = await token.client.credentials.getToken();
+        }
+        else {
+            newToken = await token.refresh(tokenRefreshOptions);
+        }
+    }
+    catch (error) {
+        if (isRevokedOAuth2GrantError(error)) {
+            throw buildOAuth2ReconnectError(node, credentialsType);
+        }
+        throw error;
+    }
+    logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
+    const refreshedTokenData = await decryptOAuth2TokenDataIfConfigured(additionalData, newToken.data, credentials.jweEnabled === true);
+    credentials.oauthTokenData = refreshedTokenData;
+    const preAuthData = await additionalData.credentialsHelper.runPreAuthentication({ helpers }, credentials, credentialsType);
+    let signingToken = newToken;
+    if (preAuthData) {
+        Object.assign(credentials, preAuthData);
+        signingToken = buildSigningToken(token.client, credentials.oauthTokenData, oAuth2Options);
+    }
+    if (!node.credentials?.[credentialsType]) {
+        throw new n8n_workflow_1.ApplicationError('Node does not have credential type', {
+            extra: { nodeName: node.name, credentialType: credentialsType },
+        });
+    }
+    const nodeCredentials = node.credentials[credentialsType];
+    await additionalData.credentialsHelper.updateCredentialsOauthTokenData(nodeCredentials, credentialsType, credentials, additionalData);
+    return signingToken;
+}
+function resolveTokenExpiredStatusCode(oAuth2Options, credentials) {
+    return credentials?.tokenExpiredStatusCode ?? oAuth2Options?.tokenExpiredStatusCode ?? 401;
+}
+async function requestOAuth2(credentialsType, requestOptions, node, additionalData, oAuth2Options, isN8nRequest = false) {
+    (0, http_request_1.removeEmptyBody)(requestOptions);
+    const credentials = (await this.getCredentials(credentialsType));
+    if (credentials.grantType === 'authorizationCode' && credentials.oauthTokenData === undefined) {
+        throw new n8n_workflow_1.ApplicationError('OAuth credentials not connected');
+    }
+    const oAuthClient = createOAuth2Client(credentials);
+    let oauthTokenData = credentials.oauthTokenData;
+    if (credentials.grantType === 'clientCredentials' &&
+        (oauthTokenData === undefined ||
+            Object.keys(oauthTokenData).length === 0 ||
+            oauthTokenData.access_token === '')) {
+        let tokenResult;
+        try {
+            tokenResult = await oAuthClient.credentials.getToken();
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            throw new n8n_workflow_1.ApplicationError(`Failed to acquire OAuth2 access token: ${message}`, {
+                cause: error,
+            });
+        }
+        const { data } = tokenResult;
+        if (!node.credentials?.[credentialsType]) {
+            throw new n8n_workflow_1.ApplicationError('Node does not have credential type', {
+                extra: { nodeName: node.name },
+                tags: { credentialType: credentialsType },
+            });
+        }
+        const nodeCredentials = node.credentials[credentialsType];
+        const initialTokenData = (await decryptOAuth2TokenDataIfConfigured(additionalData, data, credentials.jweEnabled === true));
+        credentials.oauthTokenData = initialTokenData;
+        await additionalData.credentialsHelper.updateCredentialsOauthTokenData(nodeCredentials, credentialsType, credentials, additionalData);
+        oauthTokenData = initialTokenData;
+    }
+    const preAuthData = await additionalData.credentialsHelper.runPreAuthentication({ helpers: this.helpers }, credentials, credentialsType);
+    if (preAuthData) {
+        Object.assign(credentials, preAuthData);
+        oauthTokenData = credentials.oauthTokenData;
+    }
+    const token = buildSigningToken(oAuthClient, oauthTokenData, oAuth2Options);
+    requestOptions.rejectUnauthorized = !credentials.ignoreSSLIssues;
+    const newRequestOptions = token.sign(requestOptions);
+    const newRequestHeaders = (newRequestOptions.headers = newRequestOptions.headers ?? {});
+    if (oAuth2Options?.keepBearer === false && typeof newRequestHeaders.Authorization === 'string') {
+        newRequestHeaders.Authorization = newRequestHeaders.Authorization.split(' ')[1];
+    }
+    if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
+        Object.assign(newRequestHeaders, {
+            [oAuth2Options.keyToIncludeInAccessTokenHeader]: token.accessToken,
+        });
+    }
+    const tokenExpiredStatusCode = resolveTokenExpiredStatusCode(oAuth2Options, credentials);
+    const shouldSkipTokenRefresh = oAuth2Options?.skipTokenRefresh === true;
+    const refreshCtx = {
+        credentials,
+        token,
+        credentialsType,
+        node,
+        additionalData,
+        oAuth2Options,
+        logger: this.logger,
+        helpers: this.helpers,
+    };
+    const retryWithNewToken = async (makeRequest) => {
+        const newToken = await refreshOrFetchToken(refreshCtx);
+        const refreshedRequestOptions = newToken.sign(requestOptions);
+        refreshedRequestOptions.headers = refreshedRequestOptions.headers ?? {};
+        if (oAuth2Options?.keyToIncludeInAccessTokenHeader) {
+            Object.assign(refreshedRequestOptions.headers, {
+                [oAuth2Options.keyToIncludeInAccessTokenHeader]: newToken.accessToken,
+            });
+        }
+        return await makeRequest(refreshedRequestOptions);
+    };
+    if (isN8nRequest) {
+        return await this.helpers.httpRequest(newRequestOptions).catch(async (error) => {
+            if (!shouldSkipTokenRefresh && error.response?.status === tokenExpiredStatusCode) {
+                return await retryWithNewToken(async (opts) => await this.helpers.httpRequest(opts));
+            }
+            throw error;
+        });
+    }
+    return await this.helpers
+        .request(newRequestOptions)
+        .then((response) => {
+        const requestOptions = newRequestOptions;
+        if (!shouldSkipTokenRefresh &&
+            requestOptions.resolveWithFullResponse === true &&
+            requestOptions.simple === false &&
+            response.statusCode === tokenExpiredStatusCode) {
+            throw response;
+        }
+        return response;
+    })
+        .catch(async (error) => {
+        if (!shouldSkipTokenRefresh && error.statusCode === tokenExpiredStatusCode) {
+            return await retryWithNewToken(async (opts) => await this.helpers.request(opts));
+        }
+        throw error;
+    });
+}
+async function requestOAuth1(credentialsType, requestOptions, isN8nRequest = false) {
+    (0, http_request_1.removeEmptyBody)(requestOptions);
+    const credentials = await this.getCredentials(credentialsType);
+    if (credentials === undefined) {
+        throw new n8n_workflow_1.ApplicationError('No credentials were returned');
+    }
+    if (credentials.oauthTokenData === undefined) {
+        throw new n8n_workflow_1.ApplicationError('OAuth credentials not connected');
+    }
+    const oauth = new oauth_1_0a_1.default({
+        consumer: {
+            key: credentials.consumerKey,
+            secret: credentials.consumerSecret,
+        },
+        signature_method: credentials.signatureMethod,
+        hash_function(base, key) {
+            let algorithm;
+            switch (credentials.signatureMethod) {
+                case 'HMAC-SHA256':
+                    algorithm = 'sha256';
+                    break;
+                case 'HMAC-SHA512':
+                    algorithm = 'sha512';
+                    break;
+                default:
+                    algorithm = 'sha1';
+                    break;
+            }
+            return (0, crypto_1.createHmac)(algorithm, key).update(base).digest('base64');
+        },
+    });
+    const oauthTokenData = credentials.oauthTokenData;
+    const token = {
+        key: oauthTokenData.oauth_token,
+        secret: oauthTokenData.oauth_token_secret,
+    };
+    requestOptions.data = { ...requestOptions.qs, ...requestOptions.form };
+    if ('uri' in requestOptions && !requestOptions.url) {
+        requestOptions.url = requestOptions.uri;
+        delete requestOptions.uri;
+    }
+    requestOptions.headers = oauth.toHeader(oauth.authorize(requestOptions, token));
+    if (isN8nRequest) {
+        return await this.helpers.httpRequest(requestOptions);
+    }
+    return await this.helpers
+        .request(requestOptions)
+        .catch(async (error) => {
+        throw error;
+    });
+}
+async function refreshOAuth2Token(credentialsType, node, additionalData, oAuth2Options) {
+    const credentials = (await this.getCredentials(credentialsType));
+    if (credentials.grantType === 'authorizationCode' && credentials.oauthTokenData === undefined) {
+        throw new n8n_workflow_1.ApplicationError('OAuth credentials not connected');
+    }
+    const oAuthClient = createOAuth2Client(credentials);
+    const oauthTokenData = credentials.oauthTokenData;
+    const token = buildSigningToken(oAuthClient, oauthTokenData, oAuth2Options);
+    const newToken = await refreshOrFetchToken({
+        credentials,
+        token,
+        credentialsType,
+        node,
+        additionalData,
+        oAuth2Options,
+        logger: this.logger,
+        helpers: this.helpers,
+    });
+    return newToken.data;
+}
+//# sourceMappingURL=oauth.js.map

package/dist/execution-engine/node-execution-context/utils/request-helpers/oauth.js.map

@@ -0,0 +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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"}