n8n 2.27.4 → 2.28.1

package/dist/modules/data-table/multer-upload-middleware.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MulterUploadMiddleware = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
 const di_1 = require("@n8n/di");
 const promises_1 = require("fs/promises");
@@ -24,10 +25,12 @@ const data_table_repository_1 = require("./data-table.repository");
 const size_utils_1 = require("./utils/size-utils");
 const ALLOWED_MIME_TYPES = ['text/csv'];
 let MulterUploadMiddleware = class MulterUploadMiddleware {
-    constructor(globalConfig, sizeValidator, dataTableRepository) {
+    constructor(globalConfig, sizeValidator, dataTableRepository, logger) {
         this.globalConfig = globalConfig;
         this.sizeValidator = sizeValidator;
         this.dataTableRepository = dataTableRepository;
+        this.logger = logger;
+        this.quotaCheckChain = Promise.resolve();
         this.uploadDir = this.globalConfig.dataTable.uploadDir;
         void this.ensureUploadDirExists();
         const storage = multer_1.default.diskStorage({
@@ -41,58 +44,104 @@ let MulterUploadMiddleware = class MulterUploadMiddleware {
         });
         this.upload = (0, multer_1.default)({
             storage,
-            limits: this.globalConfig.dataTable.uploadMaxFileSize
-                ? { fileSize: this.globalConfig.dataTable.uploadMaxFileSize }
-                : undefined,
-            fileFilter: async (req, file, cb) => {
+            limits: {
+                fileSize: this.globalConfig.dataTable.uploadMaxFileSize ?? this.globalConfig.dataTable.maxSize,
+            },
+            fileFilter: (_req, file, cb) => {
                 if (!ALLOWED_MIME_TYPES.includes(file.mimetype)) {
                     cb(new bad_request_error_1.BadRequestError(`Only the following file types are allowed: ${ALLOWED_MIME_TYPES.join(', ')}`));
                     return;
                 }
-                const fileSize = parseInt(req.headers['content-length'] ?? '0', 10);
-                if (this.globalConfig.dataTable.uploadMaxFileSize) {
-                    cb(null, true);
-                    return;
-                }
-                try {
-                    const sizeData = await this.sizeValidator.getCachedSizeData(async () => {
-                        return await this.dataTableRepository.findDataTablesSize();
-                    });
-                    const remainingSpace = Math.max(0, this.globalConfig.dataTable.maxSize - sizeData.totalBytes);
-                    if (fileSize > remainingSpace) {
-                        const message = remainingSpace === 0
-                            ? `Storage limit exceeded. Current usage: ${(0, size_utils_1.formatBytes)(sizeData.totalBytes)}, Limit: ${(0, size_utils_1.formatBytes)(this.globalConfig.dataTable.maxSize)}`
-                            : `File size exceeds remaining storage space. Available: ${(0, size_utils_1.formatBytes)(remainingSpace)}, File: ${(0, size_utils_1.formatBytes)(fileSize)}`;
-                        cb(new bad_request_error_1.BadRequestError(message));
-                        return;
-                    }
-                    cb(null, true);
-                }
-                catch {
-                    cb(new bad_request_error_1.BadRequestError('Failed to validate file size'));
-                }
+                cb(null, true);
             },
         });
     }
     async ensureUploadDirExists() {
         await (0, promises_1.mkdir)(this.uploadDir, { recursive: true });
     }
+    async getUploadDirSize() {
+        const files = await (0, promises_1.readdir)(this.uploadDir);
+        let total = 0;
+        for (const file of files) {
+            try {
+                const stats = await (0, promises_1.stat)((0, backend_common_1.safeJoinPath)(this.uploadDir, file));
+                if (stats.isFile())
+                    total += stats.size;
+            }
+            catch (error) {
+                this.logger.debug('Failed to stat data-table upload file', { file, error });
+            }
+        }
+        return total;
+    }
     single(fieldName) {
         return (req, res, next) => {
-            void this.upload.single(fieldName)(req, res, (error) => {
+            void this.upload.single(fieldName)(req, res, async (error) => {
+                const authedReq = req;
                 if (error) {
-                    req.fileUploadError = error;
+                    authedReq.fileUploadError = error;
+                    next();
+                    return;
+                }
+                if (authedReq.file) {
+                    try {
+                        await this.enqueueQuotaCheck(authedReq.file.path);
+                    }
+                    catch (err) {
+                        authedReq.fileUploadError = err;
+                    }
                 }
                 next();
             });
         };
     }
+    async enqueueQuotaCheck(uploadPath) {
+        const next = this.quotaCheckChain
+            .catch(() => { })
+            .then(async () => await this.enforceQuotaPostUpload(uploadPath));
+        this.quotaCheckChain = next.catch(() => { });
+        await next;
+    }
+    async enforceQuotaPostUpload(uploadPath) {
+        let usedBytes;
+        try {
+            const sizeData = await this.sizeValidator.getCachedSizeData(async () => {
+                return await this.dataTableRepository.findDataTablesSize();
+            });
+            const tempBytes = await this.getUploadDirSize();
+            usedBytes = sizeData.totalBytes + tempBytes;
+        }
+        catch (error) {
+            this.logger.warn('Failed to validate data-table storage budget; rejecting upload', {
+                path: uploadPath,
+                error,
+            });
+            await this.removeUpload(uploadPath);
+            throw new bad_request_error_1.BadRequestError('Could not validate storage limit');
+        }
+        if (usedBytes > this.globalConfig.dataTable.maxSize) {
+            await this.removeUpload(uploadPath);
+            throw new bad_request_error_1.BadRequestError(`Storage limit exceeded. Current usage: ${(0, size_utils_1.formatBytes)(usedBytes)}, Limit: ${(0, size_utils_1.formatBytes)(this.globalConfig.dataTable.maxSize)}`);
+        }
+    }
+    async removeUpload(uploadPath) {
+        try {
+            await (0, promises_1.unlink)(uploadPath);
+        }
+        catch (error) {
+            this.logger.warn('Failed to remove data-table upload after quota rejection', {
+                path: uploadPath,
+                error,
+            });
+        }
+    }
 };
 exports.MulterUploadMiddleware = MulterUploadMiddleware;
 exports.MulterUploadMiddleware = MulterUploadMiddleware = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [config_1.GlobalConfig,
         data_table_size_validator_service_1.DataTableSizeValidator,
-        data_table_repository_1.DataTableRepository])
+        data_table_repository_1.DataTableRepository,
+        backend_common_1.Logger])
 ], MulterUploadMiddleware);
 //# sourceMappingURL=multer-upload-middleware.js.map

package/dist/modules/data-table/multer-upload-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"multer-upload-middleware.js","sourceRoot":"","sources":["../../../src/modules/data-table/multer-upload-middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multer-upload-middleware.js","sourceRoot":"","sources":["../../../src/modules/data-table/multer-upload-middleware.ts"],"names":[],"mappings":"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"}

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/index.d.ts

@@ -0,0 +1,2 @@
+export * from './n8n-oauth-seeder';
+export * from './n8n-oauth-extractor';

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./n8n-oauth-seeder"), exports);
+__exportStar(require("./n8n-oauth-extractor"), exports);
+//# sourceMappingURL=index.js.map

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,wDAAsC"}

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/metadata.d.ts

@@ -0,0 +1,20 @@
+import { z } from 'zod';
+export declare const EncryptedMetadataSchema: z.ZodObject<{
+    encryptedMetadata: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    encryptedMetadata: string;
+}, {
+    encryptedMetadata: string;
+}>;
+export declare const N8NOAuth2ExtractorMetadataSchema: z.ZodObject<{
+    authToken: z.ZodString;
+    resource: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    resource: string;
+    authToken: string;
+}, {
+    resource: string;
+    authToken: string;
+}>;
+export type EncryptedMetadata = z.infer<typeof EncryptedMetadataSchema>;
+export type N8NOAuth2ExtractorMetadata = z.infer<typeof N8NOAuth2ExtractorMetadataSchema>;

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/metadata.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.N8NOAuth2ExtractorMetadataSchema = exports.EncryptedMetadataSchema = void 0;
+const zod_1 = require("zod");
+exports.EncryptedMetadataSchema = zod_1.z.object({
+    encryptedMetadata: zod_1.z.string(),
+});
+exports.N8NOAuth2ExtractorMetadataSchema = zod_1.z.object({
+    authToken: zod_1.z.string(),
+    resource: zod_1.z.string(),
+});
+//# sourceMappingURL=metadata.js.map

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/metadata.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/C,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE;CAC7B,CAAC,CAAC;AAEU,QAAA,gCAAgC,GAAG,OAAC,CAAC,MAAM,CAAC;IACxD,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAC"}

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-extractor.d.ts

@@ -0,0 +1,12 @@
+import { Logger } from '@n8n/backend-common';
+import { ContextEstablishmentOptions, ContextEstablishmentResult, HookDescription, IContextEstablishmentHook } from '@n8n/decorators';
+import { Cipher } from 'n8n-core';
+export declare const N8N_OAUTH_EXTRACTOR_NAME = "N8nOAuthExtractor";
+export declare class N8NOAuth2Extractor implements IContextEstablishmentHook {
+    private readonly logger;
+    private readonly cipher;
+    constructor(logger: Logger, cipher: Cipher);
+    hookDescription: HookDescription;
+    isApplicableToTriggerNode(_nodeType: string): boolean;
+    execute(options: ContextEstablishmentOptions): Promise<ContextEstablishmentResult>;
+}

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-extractor.js

@@ -0,0 +1,85 @@
+"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.N8NOAuth2Extractor = exports.N8N_OAUTH_EXTRACTOR_NAME = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const decorators_1 = require("@n8n/decorators");
+const n8n_core_1 = require("n8n-core");
+const metadata_1 = require("./metadata");
+const n8n_workflow_1 = require("n8n-workflow");
+exports.N8N_OAUTH_EXTRACTOR_NAME = 'N8nOAuthExtractor';
+let N8NOAuth2Extractor = class N8NOAuth2Extractor {
+    constructor(logger, cipher) {
+        this.logger = logger;
+        this.cipher = cipher;
+        this.hookDescription = {
+            name: exports.N8N_OAUTH_EXTRACTOR_NAME,
+            displayName: 'N8N OAuth2 Extractor',
+            options: [],
+        };
+        this.logger = this.logger.scoped('dynamic-credentials');
+    }
+    isApplicableToTriggerNode(_nodeType) {
+        return false;
+    }
+    async execute(options) {
+        if (!options.triggerItems || options.triggerItems.length === 0) {
+            this.logger.debug('No trigger items found, skipping n8n OAuth extractor hook.');
+            throw new Error('No trigger items found, skipping n8n OAuth extractor hook.');
+        }
+        const [triggerItem] = options.triggerItems;
+        const encryptedMetadataResult = metadata_1.EncryptedMetadataSchema.safeParse(triggerItem);
+        delete triggerItem.encryptedMetadata;
+        if (encryptedMetadataResult.success) {
+            try {
+                const decrypted = await this.cipher.decryptV2(encryptedMetadataResult.data.encryptedMetadata);
+                const parsed = (0, n8n_workflow_1.jsonParse)(decrypted);
+                const n8nOAuthInformation = metadata_1.N8NOAuth2ExtractorMetadataSchema.safeParse(parsed);
+                if (n8nOAuthInformation.success) {
+                    return {
+                        triggerItems: options.triggerItems,
+                        contextUpdate: {
+                            credentials: {
+                                version: 1,
+                                identity: n8nOAuthInformation.data.authToken,
+                                metadata: {
+                                    source: 'n8n-oauth',
+                                    resource: n8nOAuthInformation.data.resource,
+                                },
+                            },
+                        },
+                    };
+                }
+                else {
+                    this.logger.warn('Invalid format for encryptedMetadata in n8n OAuth extractor', {
+                        errors: n8nOAuthInformation.error.errors,
+                    });
+                }
+            }
+            catch (error) {
+                this.logger.error('Failed to decrypt/parse encrypted n8n OAuth metadata', {
+                    error: (0, n8n_workflow_1.ensureError)(error),
+                });
+            }
+        }
+        else {
+            this.logger.warn('No encryptedMetadata found in trigger item for n8n OAuth extractor.');
+        }
+        throw new Error('No valid n8n OAuth authentication metadata could be extracted.');
+    }
+};
+exports.N8NOAuth2Extractor = N8NOAuth2Extractor;
+exports.N8NOAuth2Extractor = N8NOAuth2Extractor = __decorate([
+    (0, decorators_1.ContextEstablishmentHook)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger,
+        n8n_core_1.Cipher])
+], N8NOAuth2Extractor);
+//# sourceMappingURL=n8n-oauth-extractor.js.map

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"n8n-oauth-extractor.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-extractor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gDAMyB;AACzB,uCAAkC;AAClC,yCAAuF;AACvF,+CAAsD;AAEzC,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAGrD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC9B,YACkB,MAAc,EACd,MAAc;QADd,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QAKhC,oBAAe,GAAoB;YAClC,IAAI,EAAE,gCAAwB;YAC9B,WAAW,EAAE,sBAAsB;YACnC,OAAO,EAAE,EAAE;SACX,CAAC;QAPD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACzD,CAAC;IAQD,yBAAyB,CAAC,SAAiB;QAG1C,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAoC;QACjD,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAChF,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAC/E,CAAC;QACD,MAAM,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;QAE3C,MAAM,uBAAuB,GAAG,kCAAuB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAG/E,OAAO,WAAW,CAAC,iBAAiB,CAAC;QAErC,IAAI,uBAAuB,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC;gBACJ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAC5C,uBAAuB,CAAC,IAAI,CAAC,iBAAiB,CAC9C,CAAC;gBACF,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,SAAS,CAAC,CAAC;gBACpC,MAAM,mBAAmB,GAAG,2CAAgC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC/E,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC;oBACjC,OAAO;wBACN,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,aAAa,EAAE;4BACd,WAAW,EAAE;gCACZ,OAAO,EAAE,CAAC;gCACV,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,SAAS;gCAC5C,QAAQ,EAAE;oCACT,MAAM,EAAE,WAAW;oCACnB,QAAQ,EAAE,mBAAmB,CAAC,IAAI,CAAC,QAAQ;iCAC3C;6BACD;yBACD;qBACD,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,EAAE;wBAC/E,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC,MAAM;qBACxC,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,EAAE;oBACzE,KAAK,EAAE,IAAA,0BAAW,EAAC,KAAK,CAAC;iBACzB,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACzF,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACnF,CAAC;CACD,CAAA;AApEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,qCAAwB,GAAE;qCAGA,uBAAM;QACN,iBAAM;GAHpB,kBAAkB,CAoE9B"}

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-seeder.d.ts

@@ -0,0 +1,10 @@
+import { Logger } from '@n8n/backend-common';
+import { Cipher } from 'n8n-core';
+import { IRunExecutionData } from 'n8n-workflow';
+import { TriggerAuthIdentitySeeder } from '../../../../services/trigger-auth-identity-seeder-proxy.service';
+export declare class N8nOAuthIdentitySeeder implements TriggerAuthIdentitySeeder {
+    private readonly logger;
+    private readonly cipher;
+    constructor(logger: Logger, cipher: Cipher);
+    seed(runExecutionData: IRunExecutionData, token: string, resource: string): Promise<void>;
+}

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-seeder.js

@@ -0,0 +1,78 @@
+"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.N8nOAuthIdentitySeeder = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
+const n8n_oauth_extractor_1 = require("./n8n-oauth-extractor");
+let N8nOAuthIdentitySeeder = class N8nOAuthIdentitySeeder {
+    constructor(logger, cipher) {
+        this.logger = logger;
+        this.cipher = cipher;
+        this.logger = this.logger.scoped('dynamic-credentials');
+    }
+    async seed(runExecutionData, token, resource) {
+        const item = runExecutionData.executionData?.nodeExecutionStack?.[0]?.data?.main;
+        const metadata = {
+            resource,
+            authToken: token,
+        };
+        const encryptedMetadata = await this.cipher.encryptV2(metadata);
+        if (item) {
+            this.logger.debug('Seeding n8n OAuth identity into trigger execution data.');
+            if (item?.[0]?.[0]) {
+                item[0][0].encryptedMetadata = encryptedMetadata;
+            }
+            else if (item?.[0]) {
+                item[0].push({
+                    encryptedMetadata,
+                    json: {},
+                });
+            }
+            else {
+                runExecutionData.executionData.nodeExecutionStack[0].data.main = [
+                    [
+                        {
+                            encryptedMetadata,
+                            json: {},
+                        },
+                    ],
+                ];
+            }
+        }
+        if (runExecutionData.executionData?.nodeExecutionStack?.[0]) {
+            this.logger.debug('Seeding n8n OAuth identity into trigger node parameters.');
+            runExecutionData.executionData.nodeExecutionStack[0].node = {
+                ...runExecutionData.executionData?.nodeExecutionStack?.[0].node,
+                parameters: {
+                    ...runExecutionData.executionData?.nodeExecutionStack?.[0].node.parameters,
+                    executionsHooksVersion: 1,
+                    contextEstablishmentHooks: {
+                        hooks: [
+                            {
+                                hookName: n8n_oauth_extractor_1.N8N_OAUTH_EXTRACTOR_NAME,
+                                isAllowedToFail: true,
+                            },
+                        ],
+                    },
+                },
+            };
+        }
+    }
+};
+exports.N8nOAuthIdentitySeeder = N8nOAuthIdentitySeeder;
+exports.N8nOAuthIdentitySeeder = N8nOAuthIdentitySeeder = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger,
+        n8n_core_1.Cipher])
+], N8nOAuthIdentitySeeder);
+//# sourceMappingURL=n8n-oauth-seeder.js.map

package/dist/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-seeder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"n8n-oauth-seeder.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/context-establishment-hooks/n8n-oauth/n8n-oauth-seeder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAClC,uCAAkC;AAGlC,+DAAiE;AAI1D,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,MAAc,EACd,MAAc;QADd,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QAE/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,gBAAmC,EAAE,KAAa,EAAE,QAAgB;QAC9E,MAAM,IAAI,GAAG,gBAAgB,CAAC,aAAa,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC;QACjF,MAAM,QAAQ,GAA+B;YAC5C,QAAQ;YACR,SAAS,EAAE,KAAK;SAChB,CAAC;QAEF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAChE,IAAI,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAC7E,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;YAClD,CAAC;iBAAM,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtB,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBACZ,iBAAiB;oBACjB,IAAI,EAAE,EAAE;iBACR,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,gBAAgB,CAAC,aAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG;oBACjE;wBACC;4BACC,iBAAiB;4BACjB,IAAI,EAAE,EAAE;yBACR;qBACD;iBACD,CAAC;YACH,CAAC;QACF,CAAC;QAED,IAAI,gBAAgB,CAAC,aAAa,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAC9E,gBAAgB,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG;gBAC3D,GAAG,gBAAgB,CAAC,aAAa,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC/D,UAAU,EAAE;oBACX,GAAG,gBAAgB,CAAC,aAAa,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU;oBAC1E,sBAAsB,EAAE,CAAC;oBACzB,yBAAyB,EAAE;wBAC1B,KAAK,EAAE;4BACN;gCACC,QAAQ,EAAE,8CAAwB;gCAClC,eAAe,EAAE,IAAI;6BACrB;yBACD;qBACD;iBACD;aACD,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAA;AAxDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAGiB,uBAAM;QACN,iBAAM;GAHpB,sBAAsB,CAwDlC"}

package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.d.ts

@@ -1,9 +1,11 @@
 import type { ICredentialContext } from 'n8n-workflow';
 import { ITokenIdentifier } from './identifier-interface';
 import { AuthService } from '../../../../auth/auth.service';
+import { OAuthTokenVerifierProxy } from '../../../../services/oauth-token-verifier-proxy.service';
 export declare class N8NIdentifier implements ITokenIdentifier {
     private readonly authService;
-    constructor(authService: AuthService);
+    private readonly oauthTokenVerifierProxy;
+    constructor(authService: AuthService, oauthTokenVerifierProxy: OAuthTokenVerifierProxy);
     validateOptions(_: Record<string, unknown>): Promise<void>;
     resolve(context: ICredentialContext, _: Record<string, unknown>): Promise<string>;
 }

package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.js

@@ -14,6 +14,7 @@ const di_1 = require("@n8n/di");
 const auth_service_1 = require("../../../../auth/auth.service");
 const zod_1 = require("zod");
 const decorators_1 = require("@n8n/decorators");
+const oauth_token_verifier_proxy_service_1 = require("../../../../services/oauth-token-verifier-proxy.service");
 const ManualExecutionMetadataSchema = zod_1.z.object({
     source: zod_1.z.literal('manual-execution'),
 });
@@ -23,13 +24,19 @@ const RequestBoundMetadataSchema = zod_1.z.object({
     endpoint: zod_1.z.string(),
     browserId: zod_1.z.string().optional(),
 });
+const N8nOAuthMetadataSchema = zod_1.z.object({
+    source: zod_1.z.literal('n8n-oauth'),
+    resource: zod_1.z.string(),
+});
 const N8NIdentifierMetadataSchema = zod_1.z.discriminatedUnion('source', [
     ManualExecutionMetadataSchema,
     RequestBoundMetadataSchema,
+    N8nOAuthMetadataSchema,
 ]);
 let N8NIdentifier = class N8NIdentifier {
-    constructor(authService) {
+    constructor(authService, oauthTokenVerifierProxy) {
         this.authService = authService;
+        this.oauthTokenVerifierProxy = oauthTokenVerifierProxy;
     }
     async validateOptions(_) {
         return;
@@ -43,6 +50,13 @@ let N8NIdentifier = class N8NIdentifier {
             const user = await this.authService.authenticateUserByCookie(context.identity);
             return user.id;
         }
+        if (metadataResult.data.source === 'n8n-oauth') {
+            const user = await this.oauthTokenVerifierProxy.verifyOAuthAccessToken(context.identity, metadataResult.data.resource);
+            if (!user?.user) {
+                throw new decorators_1.CredentialResolverError(`Invalid OAuth token for resource ${metadataResult.data.resource}`);
+            }
+            return user.user.id;
+        }
         const user = await this.authService.authenticateUserBasedOnToken(context.identity, metadataResult.data.method, metadataResult.data.endpoint, metadataResult.data.browserId);
         return user.id;
     }
@@ -50,6 +64,7 @@ let N8NIdentifier = class N8NIdentifier {
 exports.N8NIdentifier = N8NIdentifier;
 exports.N8NIdentifier = N8NIdentifier = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [auth_service_1.AuthService])
+    __metadata("design:paramtypes", [auth_service_1.AuthService,
+        oauth_token_verifier_proxy_service_1.OAuthTokenVerifierProxy])
 ], N8NIdentifier);
 //# sourceMappingURL=n8n-identifier.js.map

package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"n8n-identifier.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAGlC,sDAAkD;AAClD,6BAAwB;AACxB,gDAA0D;AAE1D,MAAM,6BAA6B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,0BAA0B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IACtD,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,OAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE;IAClE,6BAA6B;IAC7B,0BAA0B;CAC1B,CAAC,CAAC;AAiBI,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAEzD,KAAK,CAAC,eAAe,CAAC,CAA0B;QAC/C,OAAO;IACR,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAA2B,EAAE,CAA0B;QACpE,MAAM,cAAc,GAAG,2BAA2B,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/E,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,oCAAuB,CAChC,6BAA6B,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,CAC3D,CAAC;QACH,CAAC;QAED,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,KAAK,kBAAkB,EAAE,CAAC;YAEvD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC,EAAE,CAAC;QAChB,CAAC;QAID,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAC/D,OAAO,CAAC,QAAQ,EAChB,cAAc,CAAC,IAAI,CAAC,MAAM,EAC1B,cAAc,CAAC,IAAI,CAAC,QAAQ,EAC5B,cAAc,CAAC,IAAI,CAAC,SAAS,CAC7B,CAAC;QACF,OAAO,IAAI,CAAC,EAAE,CAAC;IAChB,CAAC;CACD,CAAA;AA/BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,YAAO,GAAE;qCAEiC,0BAAW;GADzC,aAAa,CA+BzB"}
+{"version":3,"file":"n8n-identifier.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAGlC,sDAAkD;AAClD,6BAAwB;AACxB,gDAA0D;AAC1D,sGAAwF;AAExF,MAAM,6BAA6B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;CACrC,CAAC,CAAC;AAEH,MAAM,0BAA0B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,MAAM,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IACtD,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,OAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE;IAClE,6BAA6B;IAC7B,0BAA0B;IAC1B,sBAAsB;CACtB,CAAC,CAAC;AAiBI,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YACkB,WAAwB,EACxB,uBAAgD;QADhD,gBAAW,GAAX,WAAW,CAAa;QACxB,4BAAuB,GAAvB,uBAAuB,CAAyB;IAC/D,CAAC;IAEJ,KAAK,CAAC,eAAe,CAAC,CAA0B;QAC/C,OAAO;IACR,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAA2B,EAAE,CAA0B;QACpE,MAAM,cAAc,GAAG,2BAA2B,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/E,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,oCAAuB,CAChC,6BAA6B,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,CAC3D,CAAC;QACH,CAAC;QAED,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,KAAK,kBAAkB,EAAE,CAAC;YAEvD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC,EAAE,CAAC;QAChB,CAAC;QAED,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CACrE,OAAO,CAAC,QAAQ,EAChB,cAAc,CAAC,IAAI,CAAC,QAAQ,CAC5B,CAAC;YACF,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,oCAAuB,CAChC,oCAAoC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAClE,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,CAAC;QAID,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAC/D,OAAO,CAAC,QAAQ,EAChB,cAAc,CAAC,IAAI,CAAC,MAAM,EAC1B,cAAc,CAAC,IAAI,CAAC,QAAQ,EAC5B,cAAc,CAAC,IAAI,CAAC,SAAS,CAC7B,CAAC;QACF,OAAO,IAAI,CAAC,EAAE,CAAC;IAChB,CAAC;CACD,CAAA;AA/CY,sCAAa;wBAAb,aAAa;IADzB,IAAA,YAAO,GAAE;qCAGsB,0BAAW;QACC,4DAAuB;GAHtD,aAAa,CA+CzB"}

package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.d.ts

@@ -1,8 +1,9 @@
 import { Logger } from '@n8n/backend-common';
 import type { ICredentialContext } from 'n8n-workflow';
 import { z } from 'zod';
-import { CacheService } from '../../../../services/cache/cache.service';
 import { ITokenIdentifier } from './identifier-interface';
+import { OAuth2MetadataHttpClient } from './oauth2-metadata-http-client';
+import { CacheService } from '../../../../services/cache/cache.service';
 export declare const OAuth2IntrospectionOptionsSchema: z.ZodObject<{
     validation: z.ZodLiteral<"oauth2-introspection">;
     clientId: z.ZodString;
@@ -66,7 +67,8 @@ export type TokenIntrospectionResponse = z.infer<typeof TokenIntrospectionRespon
 export declare class OAuth2TokenIntrospectionIdentifier implements ITokenIdentifier {
     private readonly logger;
     private readonly cache;
-    constructor(logger: Logger, cache: CacheService);
+    private readonly http;
+    constructor(logger: Logger, cache: CacheService, http: OAuth2MetadataHttpClient);
     validateOptions(identifierOptions: Record<string, unknown>): Promise<void>;
     resolve(context: ICredentialContext, identifierOptions: Record<string, unknown>): Promise<string>;
     private parseOptions;