n8n 2.23.2 → 2.24.0

package/dist/node-catalog/node-catalog.service.js

@@ -48,12 +48,15 @@ const di_1 = require("@n8n/di");
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const load_nodes_and_credentials_1 = require("../load-nodes-and-credentials");
+const node_description_transform_1 = require("../modules/mcp-registry/node-description-transform");
+const synthesize_type_def_1 = require("../modules/mcp-registry/synthesize-type-def");
 const UNFILTERED = Symbol('unfiltered');
 let NodeCatalogService = class NodeCatalogService {
     constructor(loadNodesAndCredentials, logger) {
         this.loadNodesAndCredentials = loadNodesAndCredentials;
         this.logger = logger;
         this.nodeDefinitionDirs = [];
+        this.mcpRegistryDescriptions = new Map();
         this.searchStates = new Map();
         this.getCache = new Map();
         this.suggestCache = new Map();
@@ -100,8 +103,30 @@ let NodeCatalogService = class NodeCatalogService {
         const cached = this.getCache.get(cacheKey);
         if (cached)
             return cached;
-        const { getNodeTypes } = await Promise.resolve().then(() => __importStar(require('@n8n/ai-utilities/node-catalog')));
-        const result = getNodeTypes(nodeIds, { nodeDefinitionDirs: this.nodeDefinitionDirs });
+        const registryIds = [];
+        const onDiskIds = [];
+        for (const id of nodeIds) {
+            const nodeId = typeof id === 'string' ? id : id.nodeId;
+            if (nodeId.startsWith(`${node_description_transform_1.MCP_REGISTRY_PACKAGE_NAME}.`)) {
+                registryIds.push(id);
+            }
+            else {
+                onDiskIds.push(id);
+            }
+        }
+        const parts = [];
+        for (const id of registryIds) {
+            const nodeId = typeof id === 'string' ? id : id.nodeId;
+            const description = this.mcpRegistryDescriptions.get(nodeId);
+            if (description) {
+                parts.push((0, synthesize_type_def_1.synthesizeMcpRegistryTypeDef)(description));
+            }
+        }
+        if (onDiskIds.length > 0) {
+            const { getNodeTypes } = await Promise.resolve().then(() => __importStar(require('@n8n/ai-utilities/node-catalog')));
+            parts.push(getNodeTypes(onDiskIds, { nodeDefinitionDirs: this.nodeDefinitionDirs }));
+        }
+        const result = parts.join('\n\n');
         this.getCache.set(cacheKey, result);
         return result;
     }
@@ -121,6 +146,7 @@ let NodeCatalogService = class NodeCatalogService {
         await this.loadNodesAndCredentials.postProcessLoaders();
         const { nodes: nodeTypeDescriptions } = await this.loadNodesAndCredentials.collectTypes();
         this.nodeTypeParser = new NodeTypeParserClass(nodeTypeDescriptions);
+        this.indexMcpRegistryDescriptions(nodeTypeDescriptions);
         this.nodeDefinitionDirs = await this.resolveBuiltinNodeDefinitionDirs();
         setSchemaBaseDirs(this.nodeDefinitionDirs);
         this.logger.debug('NodeCatalogService initialized', {
@@ -134,6 +160,7 @@ let NodeCatalogService = class NodeCatalogService {
         const { NodeTypeParser: NodeTypeParserClass } = await Promise.resolve().then(() => __importStar(require('@n8n/ai-utilities/node-catalog')));
         const { nodes: nodeTypeDescriptions } = await this.loadNodesAndCredentials.collectTypes();
         this.nodeTypeParser = new NodeTypeParserClass(nodeTypeDescriptions);
+        this.indexMcpRegistryDescriptions(nodeTypeDescriptions);
         this.searchStates.clear();
         this.getCache.clear();
         this.suggestCache.clear();
@@ -141,6 +168,15 @@ let NodeCatalogService = class NodeCatalogService {
             nodeTypeCount: nodeTypeDescriptions.length,
         });
     }
+    indexMcpRegistryDescriptions(descriptions) {
+        this.mcpRegistryDescriptions.clear();
+        const prefix = `${node_description_transform_1.MCP_REGISTRY_PACKAGE_NAME}.`;
+        for (const description of descriptions) {
+            if (description.name.startsWith(prefix)) {
+                this.mcpRegistryDescriptions.set(description.name, description);
+            }
+        }
+    }
     async resolveBuiltinNodeDefinitionDirs() {
         const dirs = [];
         for (const packageId of ['n8n-nodes-base', '@n8n/n8n-nodes-langchain']) {

package/dist/node-catalog/node-catalog.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-catalog.service.js","sourceRoot":"","sources":["../../src/node-catalog/node-catalog.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node-catalog.service.js","sourceRoot":"","sources":["../../src/node-catalog/node-catalog.service.ts"],"names":[],"mappings":"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"}

package/dist/oauth/oauth-browser-binding.service.d.ts

@@ -0,0 +1,18 @@
+import { GlobalConfig } from '@n8n/config';
+import type { Request, Response } from 'express';
+export declare const OAUTH_BINDING_COOKIE_NAME = "n8n-oauth-binding";
+export type BindingVerifyResult = {
+    ok: true;
+} | {
+    ok: false;
+    reason: 'cookie-missing' | 'hash-mismatch';
+};
+export declare class OAuthBrowserBindingService {
+    private readonly globalConfig;
+    constructor(globalConfig: GlobalConfig);
+    isEnabled(): boolean;
+    ensureBindingCookie(req: Request, res: Response): string;
+    computeHash(nonce: string): string;
+    verifyBinding(req: Request, expectedHash: string): BindingVerifyResult;
+    private readCookie;
+}

package/dist/oauth/oauth-browser-binding.service.js

@@ -0,0 +1,68 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthBrowserBindingService = exports.OAUTH_BINDING_COOKIE_NAME = void 0;
+const config_1 = require("@n8n/config");
+const di_1 = require("@n8n/di");
+const crypto_1 = require("crypto");
+exports.OAUTH_BINDING_COOKIE_NAME = 'n8n-oauth-binding';
+const NONCE_BYTES = 32;
+let OAuthBrowserBindingService = class OAuthBrowserBindingService {
+    constructor(globalConfig) {
+        this.globalConfig = globalConfig;
+    }
+    isEnabled() {
+        return this.globalConfig.auth.oauthBrowserBinding;
+    }
+    ensureBindingCookie(req, res) {
+        const existing = this.readCookie(req);
+        if (existing) {
+            return existing;
+        }
+        const nonce = (0, crypto_1.randomBytes)(NONCE_BYTES).toString('base64url');
+        const { secure, samesite } = this.globalConfig.auth.cookie;
+        const sameSite = samesite === 'strict' ? 'lax' : samesite;
+        res.cookie(exports.OAUTH_BINDING_COOKIE_NAME, nonce, {
+            httpOnly: true,
+            secure,
+            sameSite,
+            path: `/${this.globalConfig.endpoints.rest}`,
+        });
+        return nonce;
+    }
+    computeHash(nonce) {
+        return (0, crypto_1.createHash)('sha256').update(nonce).digest('base64url');
+    }
+    verifyBinding(req, expectedHash) {
+        const cookieValue = this.readCookie(req);
+        if (!cookieValue) {
+            return { ok: false, reason: 'cookie-missing' };
+        }
+        const actualHash = this.computeHash(cookieValue);
+        const actualBuf = Buffer.from(actualHash);
+        const expectedBuf = Buffer.from(expectedHash);
+        if (actualBuf.length !== expectedBuf.length || !(0, crypto_1.timingSafeEqual)(actualBuf, expectedBuf)) {
+            return { ok: false, reason: 'hash-mismatch' };
+        }
+        return { ok: true };
+    }
+    readCookie(req) {
+        const cookies = req.cookies;
+        const value = cookies?.[exports.OAUTH_BINDING_COOKIE_NAME];
+        return typeof value === 'string' && value.length > 0 ? value : undefined;
+    }
+};
+exports.OAuthBrowserBindingService = OAuthBrowserBindingService;
+exports.OAuthBrowserBindingService = OAuthBrowserBindingService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [config_1.GlobalConfig])
+], OAuthBrowserBindingService);
+//# sourceMappingURL=oauth-browser-binding.service.js.map

package/dist/oauth/oauth-browser-binding.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-browser-binding.service.js","sourceRoot":"","sources":["../../src/oauth/oauth-browser-binding.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAClC,mCAAkE;AAGrD,QAAA,yBAAyB,GAAG,mBAAmB,CAAC;AAE7D,MAAM,WAAW,GAAG,EAAE,CAAC;AAOhB,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAG3D,SAAS;QACR,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC;IACnD,CAAC;IAUD,mBAAmB,CAAC,GAAY,EAAE,GAAa;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,QAAQ,EAAE,CAAC;YACd,OAAO,QAAQ,CAAC;QACjB,CAAC;QACD,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;QAC3D,MAAM,QAAQ,GAA8B,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;QACrF,GAAG,CAAC,MAAM,CAAC,iCAAyB,EAAE,KAAK,EAAE;YAC5C,QAAQ,EAAE,IAAI;YACd,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE;SAC5C,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACd,CAAC;IAED,WAAW,CAAC,KAAa;QACxB,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAQD,aAAa,CAAC,GAAY,EAAE,YAAoB;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QAChD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9C,IAAI,SAAS,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,IAAI,CAAC,IAAA,wBAAe,EAAC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC;YACzF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACrB,CAAC;IAEO,UAAU,CAAC,GAAY;QAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,OAA8C,CAAC;QACnE,MAAM,KAAK,GAAG,OAAO,EAAE,CAAC,iCAAyB,CAAC,CAAC;QACnD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,CAAC;CACD,CAAA;AA9DY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,YAAO,GAAE;qCAEkC,qBAAY;GAD3C,0BAA0B,CA8DtC"}

package/dist/oauth/oauth.service.d.ts

@@ -2,7 +2,7 @@ import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import type { AuthenticatedRequest, CredentialsEntity, ICredentialsDb } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
-import type { Response } from 'express';
+import type { Request, Response } from 'express';
 import { Cipher } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { AuthService } from '../auth/auth.service';
@@ -13,7 +13,9 @@ import { UrlService } from '../services/url.service';
 import { ExternalHooks } from '../external-hooks';
 import { OauthVersion, type CreateCsrfStateData, type CsrfState, type OAuth1CredentialData } from './types';
 import { DynamicCredentialsProxy } from '../credentials/dynamic-credentials-proxy';
+import { EventService } from '../events/event.service';
 import { OAuthJweServiceProxy } from '../oauth/oauth-jwe-service.proxy';
+import { OAuthBrowserBindingService } from '../oauth/oauth-browser-binding.service';
 export declare function shouldSkipAuthOnOAuthCallback(): boolean;
 export declare const skipAuthOnOAuthCallback: boolean;
 export { OauthVersion, type OAuth1CredentialData, type CreateCsrfStateData, type CsrfState };
@@ -29,7 +31,9 @@ export declare class OauthService {
     private readonly dynamicCredentialsProxy;
     private readonly authService;
     private readonly oauthJweServiceProxy;
-    constructor(logger: Logger, credentialsHelper: CredentialsHelper, credentialsRepository: CredentialsRepository, credentialsFinderService: CredentialsFinderService, urlService: UrlService, globalConfig: GlobalConfig, externalHooks: ExternalHooks, cipher: Cipher, dynamicCredentialsProxy: DynamicCredentialsProxy, authService: AuthService, oauthJweServiceProxy: OAuthJweServiceProxy);
+    private readonly browserBindingService;
+    private readonly eventService;
+    constructor(logger: Logger, credentialsHelper: CredentialsHelper, credentialsRepository: CredentialsRepository, credentialsFinderService: CredentialsFinderService, urlService: UrlService, globalConfig: GlobalConfig, externalHooks: ExternalHooks, cipher: Cipher, dynamicCredentialsProxy: DynamicCredentialsProxy, authService: AuthService, oauthJweServiceProxy: OAuthJweServiceProxy, browserBindingService: OAuthBrowserBindingService, eventService: EventService);
     private validateOAuthUrlOrThrow;
     getBaseUrl(oauthVersion: OauthVersion): string;
     getCredentialForUpdate(req: OAuthRequest.OAuth1Credential.Auth | OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity>;
@@ -55,9 +59,11 @@ export declare class OauthService {
     ]>;
     renderCallbackError(res: Response, message: string, reason?: string): void;
     getOAuthCredentials<T>(credential: CredentialsEntity): Promise<T>;
+    refreshOAuth2CredentialById(credentialId: string, projectId: string): Promise<Record<string, string> | null>;
     private hasEditableScopeProperty;
-    generateAOauth2AuthUri(credential: CredentialsEntity, csrfData: CreateCsrfStateData): Promise<string>;
-    generateAOauth1AuthUri(credential: CredentialsEntity, csrfData: CreateCsrfStateData): Promise<string>;
+    private applyBrowserBindingIfEnabled;
+    generateAOauth2AuthUri(credential: CredentialsEntity, csrfData: CreateCsrfStateData, req?: Request, res?: Response): Promise<string>;
+    generateAOauth1AuthUri(credential: CredentialsEntity, csrfData: CreateCsrfStateData, req?: Request, res?: Response): Promise<string>;
     private convertCredentialToOptions;
     private discoverProtectedResourceMetadata;
     private selectGrantTypeAndAuthenticationMethod;

package/dist/oauth/oauth.service.js

@@ -77,14 +77,16 @@ const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
 const types_1 = require("./types");
 Object.defineProperty(exports, "OauthVersion", { enumerable: true, get: function () { return types_1.OauthVersion; } });
 const dynamic_credentials_proxy_1 = require("../credentials/dynamic-credentials-proxy");
+const event_service_1 = require("../events/event.service");
 const oauth_jwe_service_proxy_1 = require("../oauth/oauth-jwe-service.proxy");
+const oauth_browser_binding_service_1 = require("../oauth/oauth-browser-binding.service");
 function shouldSkipAuthOnOAuthCallback() {
     const value = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK?.toLowerCase() ?? 'false';
     return value === 'true';
 }
 exports.skipAuthOnOAuthCallback = shouldSkipAuthOnOAuthCallback();
 let OauthService = OauthService_1 = class OauthService {
-    constructor(logger, credentialsHelper, credentialsRepository, credentialsFinderService, urlService, globalConfig, externalHooks, cipher, dynamicCredentialsProxy, authService, oauthJweServiceProxy) {
+    constructor(logger, credentialsHelper, credentialsRepository, credentialsFinderService, urlService, globalConfig, externalHooks, cipher, dynamicCredentialsProxy, authService, oauthJweServiceProxy, browserBindingService, eventService) {
         this.logger = logger;
         this.credentialsHelper = credentialsHelper;
         this.credentialsRepository = credentialsRepository;
@@ -96,6 +98,8 @@ let OauthService = OauthService_1 = class OauthService {
         this.dynamicCredentialsProxy = dynamicCredentialsProxy;
         this.authService = authService;
         this.oauthJweServiceProxy = oauthJweServiceProxy;
+        this.browserBindingService = browserBindingService;
+        this.eventService = eventService;
     }
     validateOAuthUrlOrThrow(url) {
         try {
@@ -230,6 +234,17 @@ let OauthService = OauthService_1 = class OauthService {
         if (typeof decryptedState.cid !== 'string' || typeof decoded.token !== 'string') {
             throw new n8n_workflow_1.UnexpectedError(errorMessage);
         }
+        if (typeof decryptedState.bindingHash === 'string' && decryptedState.bindingHash.length > 0) {
+            const result = this.browserBindingService.verifyBinding(req, decryptedState.bindingHash);
+            if (!result.ok) {
+                this.eventService.emit('oauth-callback-binding-rejected', {
+                    reason: result.reason,
+                    credentialId: decryptedState.cid,
+                    origin: decryptedState.origin,
+                });
+                throw new auth_error_1.AuthError('This OAuth flow was started in a different browser. Please retry from your original window.');
+            }
+        }
         if (decryptedState.origin === 'dynamic-credential') {
             if (req.user?.id !== undefined &&
                 decryptedState.userId !== undefined &&
@@ -289,6 +304,62 @@ let OauthService = OauthService_1 = class OauthService {
         const oauthCredentials = await this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
         return oauthCredentials;
     }
+    async refreshOAuth2CredentialById(credentialId, projectId) {
+        const credential = await this.credentialsRepository.findOne({
+            where: { id: credentialId },
+            relations: { shared: true },
+        });
+        if (!credential)
+            return null;
+        const isAccessible = credential.isGlobal || (credential.shared ?? []).some((s) => s.projectId === projectId);
+        if (!isAccessible)
+            return null;
+        const oauthCredentials = await this.getOAuthCredentials(credential);
+        const oauthTokenData = oauthCredentials.oauthTokenData;
+        if (!oauthTokenData)
+            return null;
+        const scopes = oauthCredentials.scope
+            ?.split(' ')
+            .map((s) => s.trim())
+            .filter(Boolean);
+        const oAuthClient = new client_oauth2_1.ClientOAuth2({
+            clientId: oauthCredentials.clientId,
+            clientSecret: oauthCredentials.clientSecret,
+            accessTokenUri: oauthCredentials.accessTokenUrl,
+            scopes: scopes?.length ? scopes : undefined,
+            ignoreSSLIssues: oauthCredentials.ignoreSSLIssues,
+            authentication: oauthCredentials.authentication ?? 'header',
+        });
+        const token = oAuthClient.createToken({
+            ...oauthTokenData,
+            ...(oauthTokenData.access_token ? { access_token: oauthTokenData.access_token } : {}),
+            ...(oauthTokenData.refresh_token ? { refresh_token: oauthTokenData.refresh_token } : {}),
+        }, oauthTokenData.token_type);
+        let refreshed;
+        try {
+            refreshed =
+                oauthCredentials.grantType === 'clientCredentials'
+                    ? await token.client.credentials.getToken()
+                    : await token.refresh();
+        }
+        catch (error) {
+            this.logger.warn('Failed to refresh OAuth2 token for credential', {
+                credentialId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+            return null;
+        }
+        try {
+            await this.encryptAndSaveData(credential, { oauthTokenData: refreshed.data });
+        }
+        catch (error) {
+            this.logger.warn('Refreshed OAuth2 token but failed to persist new token data', {
+                credentialId,
+                error: error instanceof Error ? error.message : String(error),
+            });
+        }
+        return { Authorization: `Bearer ${refreshed.accessToken}` };
+    }
     hasEditableScopeProperty(credentialType) {
         try {
             const properties = this.credentialsHelper.getCredentialsProperties(credentialType);
@@ -299,7 +370,16 @@ let OauthService = OauthService_1 = class OauthService {
             return false;
         }
     }
-    async generateAOauth2AuthUri(credential, csrfData) {
+    applyBrowserBindingIfEnabled(csrfData, req, res) {
+        if (!req || !res)
+            return;
+        if (!this.browserBindingService.isEnabled())
+            return;
+        const nonce = this.browserBindingService.ensureBindingCookie(req, res);
+        csrfData.bindingHash = this.browserBindingService.computeHash(nonce);
+    }
+    async generateAOauth2AuthUri(credential, csrfData, req, res) {
+        this.applyBrowserBindingIfEnabled(csrfData, req, res);
         const oauthCredentials = await this.getOAuthCredentials(credential);
         const toUpdate = {};
         if (oauthCredentials.useDynamicClientRegistration && oauthCredentials.serverUrl) {
@@ -434,7 +514,8 @@ let OauthService = OauthService_1 = class OauthService {
         });
         return returnUri.toString();
     }
-    async generateAOauth1AuthUri(credential, csrfData) {
+    async generateAOauth1AuthUri(credential, csrfData, req, res) {
+        this.applyBrowserBindingIfEnabled(csrfData, req, res);
         const oauthCredentials = await this.getOAuthCredentials(credential);
         this.validateOAuthUrlOrThrow(oauthCredentials.authUrl ?? '');
         this.validateOAuthUrlOrThrow(oauthCredentials.requestTokenUrl ?? '');
@@ -604,6 +685,8 @@ exports.OauthService = OauthService = OauthService_1 = __decorate([
         n8n_core_1.Cipher,
         dynamic_credentials_proxy_1.DynamicCredentialsProxy,
         auth_service_1.AuthService,
-        oauth_jwe_service_proxy_1.OAuthJweServiceProxy])
+        oauth_jwe_service_proxy_1.OAuthJweServiceProxy,
+        oauth_browser_binding_service_1.OAuthBrowserBindingService,
+        event_service_1.EventService])
 ], OauthService);
 //# sourceMappingURL=oauth.service.js.map

package/dist/oauth/oauth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}

package/dist/oauth/types.d.ts

@@ -6,6 +6,7 @@ export type CsrfStateRequired = {
 export type CreateCsrfStateData = {
     cid: string;
     origin: 'static-credential' | 'dynamic-credential';
+    bindingHash?: string;
     [key: string]: unknown;
 };
 export type CsrfState = CsrfStateRequired;

package/dist/oauth/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAmBzB,QAAA,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAE5D,IAAkB,YAGjB;AAHD,WAAkB,YAAY;IAC7B,2CAAM,CAAA;IACN,2CAAM,CAAA;AACP,CAAC,EAHiB,YAAY,4BAAZ,YAAY,QAG7B;AAWY,QAAA,YAAY,GAAG;IAC3B,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AA0BzB,QAAA,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAE5D,IAAkB,YAGjB;AAHD,WAAkB,YAAY;IAC7B,2CAAM,CAAA;IACN,2CAAM,CAAA;AACP,CAAC,EAHiB,YAAY,4BAAZ,YAAY,QAG7B;AAWY,QAAA,YAAY,GAAG;IAC3B,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC"}

package/dist/public-api/index.js

@@ -50,6 +50,7 @@ const license_1 = require("../license");
 const auth_strategy_registry_1 = require("../services/auth-strategy.registry");
 const last_active_at_service_1 = require("../services/last-active-at.service");
 const url_service_1 = require("../services/url.service");
+const import_package_upload_1 = require("../modules/n8n-packages/utils/import-package-upload");
 const public_api_error_response_1 = require("./v1/public-api-error-response");
 function createLazySwaggerMiddleware(openApiSpecPath, publicApiEndpoint, version) {
     let cachedRouter;
@@ -105,12 +106,14 @@ function createLazyValidatorMiddleware(openApiSpecPath, handlersDirectory, versi
                     }
                     return authenticated;
                 };
+                const globalConfig = di_1.Container.get(config_1.GlobalConfig);
                 const router = express_1.default.Router();
                 router.use(openApiValidatorMiddleware({
                     apiSpec: openApiSpecPath,
                     operationHandlers: handlersDirectory,
                     validateRequests: true,
                     validateApiSpec: true,
+                    fileUploader: (0, import_package_upload_1.createN8nPackageMulterOptions)(globalConfig),
                     formats: {
                         email: {
                             type: 'string',
@@ -154,6 +157,7 @@ function createLazyValidatorMiddleware(openApiSpecPath, handlersDirectory, versi
 }
 function createApiRouter(version, openApiSpecPath, handlersDirectory, publicApiEndpoint) {
     const globalConfig = di_1.Container.get(config_1.GlobalConfig);
+    const payloadLimit = `${globalConfig.endpoints.payloadSizeMax}mb`;
     const apiController = express_1.default.Router();
     if (!globalConfig.publicApi.swaggerUiDisabled) {
         apiController.use(`/${publicApiEndpoint}/${version}/docs`, createLazySwaggerMiddleware(openApiSpecPath, publicApiEndpoint, version));
@@ -170,7 +174,7 @@ function createApiRouter(version, openApiSpecPath, handlersDirectory, publicApiE
         }
         next(error);
     };
-    apiController.use(`/${publicApiEndpoint}/${version}`, express_1.default.json(), jsonParseErrorHandler, createLazyValidatorMiddleware(openApiSpecPath, handlersDirectory, version));
+    apiController.use(`/${publicApiEndpoint}/${version}`, express_1.default.json({ limit: payloadLimit }), jsonParseErrorHandler, createLazyValidatorMiddleware(openApiSpecPath, handlersDirectory, version));
     const publicApiErrorHandler = (error, _req, res, _next) => {
         (0, public_api_error_response_1.sendPublicApiErrorResponse)(res, error);
     };

package/dist/public-api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/public-api/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/public-api/index.ts"],"names":[],"mappings":"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"}

package/dist/public-api/types.d.ts

@@ -117,6 +117,12 @@ export declare namespace WorkflowRequest {
         versionId: string;
     }, {}, {}, {}>;
 }
+export declare namespace PackageRequest {
+    type Import = AuthenticatedRequest<{}, {}, {
+        projectId?: string;
+        folderId?: string;
+    }, Record<string, never>>;
+}
 export declare namespace UserRequest {
     type Invite = AuthenticatedRequest<{}, {}, Array<{
         email: string;

package/dist/public-api/v1/handlers/credentials/credentials.service.js

@@ -69,6 +69,7 @@ async function saveCredential(payload, user) {
         projectId: project?.id,
         projectType: project?.type,
         isDynamic: credential.isResolvable ?? false,
+        jweEnabled: payload.data.jweEnabled === true,
     });
     const credentialForApi = {
         id: credential.id,