n8n 2.15.1 → 2.17.0

package/dist/modules/community-packages/community-node-types-utils.js

@@ -10,11 +10,11 @@ function getUrl(environment) {
         ? N8N_VETTED_NODE_TYPES_PRODUCTION_URL
         : N8N_VETTED_NODE_TYPES_STAGING_URL;
 }
-async function getCommunityNodeTypes(environment, qs = {}, maxAiNodeSdkVersion) {
+async function getCommunityNodeTypes(environment, qs = {}, maxAiNodeSdk) {
     const url = getUrl(environment);
     const params = {
         ...qs,
-        maxAiNodeSdkVersion,
+        maxAiNodeSdk,
         pagination: {
             page: 1,
             pageSize: 25,
@@ -22,11 +22,11 @@ async function getCommunityNodeTypes(environment, qs = {}, maxAiNodeSdkVersion)
     };
     return await (0, strapi_utils_1.paginatedRequest)(url, params);
 }
-async function getCommunityNodesMetadata(environment, maxAiNodeSdkVersion) {
+async function getCommunityNodesMetadata(environment, maxAiNodeSdk) {
     const url = getUrl(environment);
     const params = {
         fields: ['npmVersion', 'name', 'updatedAt'],
-        maxAiNodeSdkVersion,
+        maxAiNodeSdk,
         pagination: {
             page: 1,
             pageSize: 500,

package/dist/modules/community-packages/community-node-types-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"community-node-types-utils.js","sourceRoot":"","sources":["../../../src/modules/community-packages/community-node-types-utils.ts"],"names":[],"mappings":";;AAuCA,sDAeC;AAED,8DAiBC;AAvED,iDAAsE;AA4BtE,MAAM,iCAAiC,GAAG,gDAAgD,CAAC;AAC3F,MAAM,oCAAoC,GAAG,wCAAwC,CAAC;AAEtF,SAAS,MAAM,CAAC,WAAqC;IACpD,OAAO,WAAW,KAAK,YAAY;QAClC,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,iCAAiC,CAAC;AACtC,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAC1C,WAAqC,EACrC,KAAqD,EAAE,EACvD,mBAA2B;IAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG;QACd,GAAG,EAAE;QACL,mBAAmB;QACnB,UAAU,EAAE;YACX,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,EAAE;SACZ;KACD,CAAC;IACF,OAAO,MAAM,IAAA,+BAAgB,EAA0B,GAAG,EAAE,MAAM,CAAC,CAAC;AACrE,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC9C,WAAqC,EACrC,mBAA2B;IAE3B,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG;QACd,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC;QAC3C,mBAAmB;QACnB,UAAU,EAAE;YACX,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,GAAG;SACb;KACD,CAAC;IAEF,OAAO,MAAM,IAAA,+BAAgB,EAAyB,GAAG,EAAE,MAAM,EAAE;QAClE,YAAY,EAAE,IAAI;KAClB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"community-node-types-utils.js","sourceRoot":"","sources":["../../../src/modules/community-packages/community-node-types-utils.ts"],"names":[],"mappings":";;AAuCA,sDAeC;AAED,8DAiBC;AAvED,iDAAsE;AA4BtE,MAAM,iCAAiC,GAAG,gDAAgD,CAAC;AAC3F,MAAM,oCAAoC,GAAG,wCAAwC,CAAC;AAEtF,SAAS,MAAM,CAAC,WAAqC;IACpD,OAAO,WAAW,KAAK,YAAY;QAClC,CAAC,CAAC,oCAAoC;QACtC,CAAC,CAAC,iCAAiC,CAAC;AACtC,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAC1C,WAAqC,EACrC,KAAqD,EAAE,EACvD,YAAoB;IAEpB,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG;QACd,GAAG,EAAE;QACL,YAAY;QACZ,UAAU,EAAE;YACX,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,EAAE;SACZ;KACD,CAAC;IACF,OAAO,MAAM,IAAA,+BAAgB,EAA0B,GAAG,EAAE,MAAM,CAAC,CAAC;AACrE,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC9C,WAAqC,EACrC,YAAoB;IAEpB,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG;QACd,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC;QAC3C,YAAY;QACZ,UAAU,EAAE;YACX,IAAI,EAAE,CAAC;YACP,QAAQ,EAAE,GAAG;SACb;KACD,CAAC;IAEF,OAAO,MAAM,IAAA,+BAAgB,EAAyB,GAAG,EAAE,MAAM,EAAE;QAClE,YAAY,EAAE,IAAI;KAClB,CAAC,CAAC;AACJ,CAAC"}

package/dist/modules/community-packages/strapi-utils.d.ts

@@ -19,7 +19,7 @@ interface PaginationRequestParams {
         page: number;
         pageSize: number;
     };
-    maxAiNodeSdkVersion?: number;
+    maxAiNodeSdk?: number;
 }
 export declare function paginatedRequest<T>(url: string, params: PaginationRequestParams, options?: PaginationRequestOptions): Promise<T[]>;
 export declare function buildStrapiUpdateQuery(ids: number[]): IDataObject;

package/dist/modules/data-table/data-table-proxy.service.d.ts

@@ -1,20 +1,62 @@
+import type { ListDataTableQueryDto } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
-import { DataTableProxyProvider, IDataTableProjectAggregateService, IDataTableProjectService, INode, Workflow } from 'n8n-workflow';
+import type { User } from '@n8n/db';
+import { AddDataTableColumnOptions, CreateDataTableOptions, DataTableProxyProvider, DataTableRows, DeleteDataTableRowsOptions, IDataTableProjectAggregateService, IDataTableProjectService, DataTableInsertRowsReturnType, INode, ListDataTableRowsOptions, UpdateDataTableOptions, UpdateDataTableRowOptions, Workflow } from 'n8n-workflow';
+import { DataTableAggregateService } from './data-table-aggregate.service';
 import { DataTableService } from './data-table.service';
+import { SourceControlPreferencesService } from '../../modules/source-control.ee/source-control-preferences.service.ee';
 import { OwnershipService } from '../../services/ownership.service';
 declare const ALLOWED_NODES: readonly ["n8n-nodes-base.dataTable", "n8n-nodes-base.dataTableTool", "n8n-nodes-base.evaluationTrigger", "n8n-nodes-base.evaluation"];
 type AllowedNode = (typeof ALLOWED_NODES)[number];
 export declare function isAllowedNode(s: string): s is AllowedNode;
 export declare class DataTableProxyService implements DataTableProxyProvider {
     private readonly dataTableService;
+    private readonly dataTableAggregateService;
     private readonly ownershipService;
     private readonly logger;
-    constructor(dataTableService: DataTableService, ownershipService: OwnershipService, logger: Logger);
+    private readonly sourceControlPreferencesService;
+    constructor(dataTableService: DataTableService, dataTableAggregateService: DataTableAggregateService, ownershipService: OwnershipService, logger: Logger, sourceControlPreferencesService: SourceControlPreferencesService);
+    private checkInstanceWriteAccess;
     private validateRequest;
     private getProjectId;
     getDataTableAggregateProxy(workflow: Workflow, node: INode, projectId?: string): Promise<IDataTableProjectAggregateService>;
     getDataTableProxy(workflow: Workflow, node: INode, dataTableId: string, projectId?: string): Promise<IDataTableProjectService>;
+    private requireScope;
+    makeDataTableOperationsForUser(user: User): {
+        getManyAndCount(options: ListDataTableQueryDto): Promise<{
+            count: number;
+            data: import("./data-table.entity").DataTable[];
+        }>;
+        createDataTable(projectId: string, options: CreateDataTableOptions): Promise<import("./data-table.entity").DataTable>;
+        getColumns(dataTableId: string, projectId: string): Promise<import("./data-table-column.entity").DataTableColumn[]>;
+        updateDataTable(dataTableId: string, projectId: string, options: UpdateDataTableOptions): Promise<boolean>;
+        addColumn(dataTableId: string, projectId: string, options: AddDataTableColumnOptions): Promise<import("./data-table-column.entity").DataTableColumn>;
+        deleteColumn(dataTableId: string, projectId: string, columnId: string): Promise<boolean>;
+        renameColumn(dataTableId: string, projectId: string, columnId: string, options: {
+            name: string;
+        }): Promise<{
+            name: string;
+            dataTableId: string;
+            type: "string" | "number" | "boolean" | "date";
+            index: number;
+            dataTable: import("./data-table.entity").DataTable;
+            id: string;
+            generateId(): void;
+            createdAt: Date;
+            updatedAt: Date;
+            setUpdateDate(): void;
+        }>;
+        deleteDataTable(dataTableId: string, projectId: string): Promise<boolean>;
+        getManyRowsAndCount(dataTableId: string, projectId: string, options: Partial<ListDataTableRowsOptions>): Promise<{
+            count: number;
+            data: import("n8n-workflow").DataTableRowsReturn;
+        }>;
+        insertRows<T extends DataTableInsertRowsReturnType>(dataTableId: string, projectId: string, rows: DataTableRows, returnType: T): Promise<import("n8n-workflow").DataTableInsertRowsResult<T>>;
+        updateRows(dataTableId: string, projectId: string, options: UpdateDataTableRowOptions): Promise<import("n8n-workflow").DataTableRowReturn[] | import("n8n-workflow").DataTableRowReturnWithState[]>;
+        deleteRows(dataTableId: string, projectId: string, options: DeleteDataTableRowsOptions): Promise<import("n8n-workflow").DataTableRowReturn[]>;
+    };
     private makeAggregateOperations;
     private makeDataTableOperations;
 }
+export type DataTableUserOperations = ReturnType<DataTableProxyService['makeDataTableOperationsForUser']>;
 export {};

package/dist/modules/data-table/data-table-proxy.service.js

@@ -13,7 +13,11 @@ exports.DataTableProxyService = void 0;
 exports.isAllowedNode = isAllowedNode;
 const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
+const data_table_aggregate_service_1 = require("./data-table-aggregate.service");
 const data_table_service_1 = require("./data-table.service");
+const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
+const check_access_1 = require("../../permissions.ee/check-access");
+const source_control_preferences_service_ee_1 = require("../../modules/source-control.ee/source-control-preferences.service.ee");
 const ownership_service_1 = require("../../services/ownership.service");
 const ALLOWED_NODES = [
     'n8n-nodes-base.dataTable',
@@ -25,12 +29,20 @@ function isAllowedNode(s) {
     return ALLOWED_NODES.includes(s);
 }
 let DataTableProxyService = class DataTableProxyService {
-    constructor(dataTableService, ownershipService, logger) {
+    constructor(dataTableService, dataTableAggregateService, ownershipService, logger, sourceControlPreferencesService) {
         this.dataTableService = dataTableService;
+        this.dataTableAggregateService = dataTableAggregateService;
         this.ownershipService = ownershipService;
         this.logger = logger;
+        this.sourceControlPreferencesService = sourceControlPreferencesService;
         this.logger = this.logger.scoped('data-table');
     }
+    checkInstanceWriteAccess() {
+        const preferences = this.sourceControlPreferencesService.getPreferences();
+        if (preferences.branchReadOnly) {
+            throw new forbidden_error_1.ForbiddenError('Cannot modify data tables on a protected instance. This instance is in read-only mode.');
+        }
+    }
     validateRequest(node) {
         if (!isAllowedNode(node.type)) {
             throw new Error('This proxy is only available for Data table nodes');
@@ -50,6 +62,76 @@ let DataTableProxyService = class DataTableProxyService {
         projectId = projectId ?? (await this.getProjectId(workflow));
         return this.makeDataTableOperations(projectId, dataTableId);
     }
+    async requireScope(user, scope, projectId) {
+        const hasScope = await (0, check_access_1.userHasScopes)(user, [scope], false, { projectId });
+        if (!hasScope) {
+            throw new Error(`User does not have '${scope}' access on project '${projectId}'`);
+        }
+    }
+    makeDataTableOperationsForUser(user) {
+        const dataTableService = this.dataTableService;
+        const dataTableAggregateService = this.dataTableAggregateService;
+        const requireScope = async (scope, projectId) => await this.requireScope(user, scope, projectId);
+        const checkInstanceWriteAccess = () => this.checkInstanceWriteAccess();
+        return {
+            async getManyAndCount(options) {
+                return await dataTableAggregateService.getManyAndCount(user, options);
+            },
+            async createDataTable(projectId, options) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:create', projectId);
+                return await dataTableService.createDataTable(projectId, options);
+            },
+            async getColumns(dataTableId, projectId) {
+                await requireScope('dataTable:read', projectId);
+                return await dataTableService.getColumns(dataTableId, projectId);
+            },
+            async updateDataTable(dataTableId, projectId, options) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:update', projectId);
+                return await dataTableService.updateDataTable(dataTableId, projectId, options);
+            },
+            async addColumn(dataTableId, projectId, options) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:update', projectId);
+                return await dataTableService.addColumn(dataTableId, projectId, options);
+            },
+            async deleteColumn(dataTableId, projectId, columnId) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:update', projectId);
+                return await dataTableService.deleteColumn(dataTableId, projectId, columnId);
+            },
+            async renameColumn(dataTableId, projectId, columnId, options) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:update', projectId);
+                return await dataTableService.renameColumn(dataTableId, projectId, columnId, options);
+            },
+            async deleteDataTable(dataTableId, projectId) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:delete', projectId);
+                return await dataTableService.deleteDataTable(dataTableId, projectId);
+            },
+            async getManyRowsAndCount(dataTableId, projectId, options) {
+                await requireScope('dataTable:readRow', projectId);
+                return await dataTableService.getManyRowsAndCount(dataTableId, projectId, options);
+            },
+            async insertRows(dataTableId, projectId, rows, returnType) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:writeRow', projectId);
+                return await dataTableService.insertRows(dataTableId, projectId, rows, returnType);
+            },
+            async updateRows(dataTableId, projectId, options) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:writeRow', projectId);
+                return await dataTableService.updateRows(dataTableId, projectId, { filter: options.filter, data: options.data }, true, options.dryRun);
+            },
+            async deleteRows(dataTableId, projectId, options) {
+                checkInstanceWriteAccess();
+                await requireScope('dataTable:writeRow', projectId);
+                return await dataTableService.deleteRows(dataTableId, projectId, { filter: options.filter }, true, options.dryRun);
+            },
+        };
+    }
     makeAggregateOperations(projectId) {
         const dataTableService = this.dataTableService;
         return {
@@ -114,7 +196,9 @@ exports.DataTableProxyService = DataTableProxyService;
 exports.DataTableProxyService = DataTableProxyService = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [data_table_service_1.DataTableService,
+        data_table_aggregate_service_1.DataTableAggregateService,
         ownership_service_1.OwnershipService,
-        backend_common_1.Logger])
+        backend_common_1.Logger,
+        source_control_preferences_service_ee_1.SourceControlPreferencesService])
 ], DataTableProxyService);
 //# sourceMappingURL=data-table-proxy.service.js.map

package/dist/modules/data-table/data-table-proxy.service.js.map

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

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

@@ -10,15 +10,15 @@ export declare const OAuth2IntrospectionOptionsSchema: z.ZodObject<{
     metadataUri: z.ZodString;
     subjectClaim: z.ZodDefault<z.ZodOptional<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
+    validation: "oauth2-introspection";
     clientId: string;
     clientSecret: string;
-    validation: "oauth2-introspection";
     metadataUri: string;
     subjectClaim: string;
 }, {
+    validation: "oauth2-introspection";
     clientId: string;
     clientSecret: string;
-    validation: "oauth2-introspection";
     metadataUri: string;
     subjectClaim?: string | undefined;
 }>;

package/dist/modules/dynamic-credentials.ee/services/resolver-config-expression.service.js

@@ -31,10 +31,16 @@ let ResolverConfigExpressionService = class ResolverConfigExpressionService {
         });
         const additionalData = await (0, workflow_execute_additional_data_1.getBase)();
         const additionalKeys = (0, n8n_core_1.getNonWorkflowAdditionalKeys)(additionalData);
-        return workflow.expression.getComplexParameterValue({
-            id: '1',
-            name: 'Mock Node',
-        }, config, 'manual', additionalKeys, undefined, undefined, config);
+        await workflow.expression.acquireIsolate();
+        try {
+            return workflow.expression.getComplexParameterValue({
+                id: '1',
+                name: 'Mock Node',
+            }, config, 'manual', additionalKeys, undefined, undefined, config);
+        }
+        finally {
+            await workflow.expression.releaseIsolate();
+        }
     }
 };
 exports.ResolverConfigExpressionService = ResolverConfigExpressionService;

package/dist/modules/dynamic-credentials.ee/services/resolver-config-expression.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver-config-expression.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/resolver-config-expression.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAClC,uCAAwD;AAExD,+CAA0D;AAE1D,6CAAyC;AACzC,yFAA6D;AAOtD,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAC3C,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAOrD,KAAK,CAAC,OAAO,CAAC,MAAuC;QAEpD,IAAI,CAAC,IAAA,+BAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QACf,CAAC;QAGD,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,EAAE;YACf,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,MAAM,IAAA,0CAAO,GAAE,CAAC;QACvC,MAAM,cAAc,GAAG,IAAA,uCAA4B,EAAC,cAAc,CAAC,CAAC;QAEpE,OAAO,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAElD;YACC,EAAE,EAAE,GAAG;YACP,IAAI,EAAE,WAAW;SACR,EACV,MAAM,EACN,QAAQ,EACR,cAAc,EACd,SAAS,EACT,SAAS,EACT,MAAM,CACa,CAAC;IACtB,CAAC;CACD,CAAA;AAvCY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,YAAO,GAAE;qCAE+B,sBAAS;GADrC,+BAA+B,CAuC3C"}
+{"version":3,"file":"resolver-config-expression.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/resolver-config-expression.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;AAClC,uCAAwD;AAExD,+CAA0D;AAE1D,6CAAyC;AACzC,yFAA6D;AAOtD,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAC3C,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAOrD,KAAK,CAAC,OAAO,CAAC,MAAuC;QAEpD,IAAI,CAAC,IAAA,+BAAgB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QACf,CAAC;QAGD,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;YAC7B,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,EAAE;YACf,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,MAAM,IAAA,0CAAO,GAAE,CAAC;QACvC,MAAM,cAAc,GAAG,IAAA,uCAA4B,EAAC,cAAc,CAAC,CAAC;QAEpE,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QAC3C,IAAI,CAAC;YACJ,OAAO,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAElD;gBACC,EAAE,EAAE,GAAG;gBACP,IAAI,EAAE,WAAW;aACR,EACV,MAAM,EACN,QAAQ,EACR,cAAc,EACd,SAAS,EACT,SAAS,EACT,MAAM,CACa,CAAC;QACtB,CAAC;gBAAS,CAAC;YACV,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QAC5C,CAAC;IACF,CAAC;CACD,CAAA;AA5CY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,YAAO,GAAE;qCAE+B,sBAAS;GADrC,+BAA+B,CA4C3C"}

package/dist/modules/external-secrets.ee/external-secrets-settings.controller.ee.d.ts

@@ -1,6 +1,8 @@
 import { UpdateExternalSecretsSettingsDto } from '@n8n/api-types';
 import { ModuleRegistry, Logger } from '@n8n/backend-common';
+import type { AuthenticatedRequest } from '@n8n/db';
 import type { NextFunction, Request, Response } from 'express';
+import { EventService } from '../../events/event.service';
 import { ExternalSecretsConfig } from './external-secrets.config';
 import { ExternalSecretsSettingsService } from './external-secrets-settings.service.ee';
 export declare class ExternalSecretsSettingsController {
@@ -8,9 +10,10 @@ export declare class ExternalSecretsSettingsController {
     private readonly settingsService;
     private readonly moduleRegistry;
     private readonly logger;
-    constructor(config: ExternalSecretsConfig, settingsService: ExternalSecretsSettingsService, moduleRegistry: ModuleRegistry, logger: Logger);
+    private readonly eventService;
+    constructor(config: ExternalSecretsConfig, settingsService: ExternalSecretsSettingsService, moduleRegistry: ModuleRegistry, logger: Logger, eventService: EventService);
     checkFeatureFlag(_req: Request, res: Response, next: NextFunction): void;
-    updateSettings(_req: Request, _res: Response, body: UpdateExternalSecretsSettingsDto): Promise<{
+    updateSettings(req: AuthenticatedRequest, _res: Response, body: UpdateExternalSecretsSettingsDto): Promise<{
         systemRolesEnabled: boolean;
     }>;
 }

package/dist/modules/external-secrets.ee/external-secrets-settings.controller.ee.js

@@ -17,15 +17,17 @@ const api_types_1 = require("@n8n/api-types");
 const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
 const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
+const event_service_1 = require("../../events/event.service");
 const response_helper_1 = require("../../response-helper");
 const external_secrets_config_1 = require("./external-secrets.config");
 const external_secrets_settings_service_ee_1 = require("./external-secrets-settings.service.ee");
 let ExternalSecretsSettingsController = class ExternalSecretsSettingsController {
-    constructor(config, settingsService, moduleRegistry, logger) {
+    constructor(config, settingsService, moduleRegistry, logger, eventService) {
         this.config = config;
         this.settingsService = settingsService;
         this.moduleRegistry = moduleRegistry;
         this.logger = logger;
+        this.eventService = eventService;
     }
     checkFeatureFlag(_req, res, next) {
         if (!this.config.externalSecretsRoleBasedAccess) {
@@ -34,8 +36,12 @@ let ExternalSecretsSettingsController = class ExternalSecretsSettingsController
         }
         next();
     }
-    async updateSettings(_req, _res, body) {
+    async updateSettings(req, _res, body) {
         await this.settingsService.setSystemRolesEnabled(body.systemRolesEnabled);
+        this.eventService.emit('external-secrets-system-roles-toggled', {
+            userId: req.user.id,
+            enabled: body.systemRolesEnabled,
+        });
         try {
             await this.moduleRegistry.refreshModuleSettings('external-secrets');
         }
@@ -69,6 +75,7 @@ exports.ExternalSecretsSettingsController = ExternalSecretsSettingsController =
     __metadata("design:paramtypes", [external_secrets_config_1.ExternalSecretsConfig,
         external_secrets_settings_service_ee_1.ExternalSecretsSettingsService,
         backend_common_1.ModuleRegistry,
-        backend_common_1.Logger])
+        backend_common_1.Logger,
+        event_service_1.EventService])
 ], ExternalSecretsSettingsController);
 //# sourceMappingURL=external-secrets-settings.controller.ee.js.map

package/dist/modules/external-secrets.ee/external-secrets-settings.controller.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"external-secrets-settings.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/external-secrets.ee/external-secrets-settings.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAkE;AAClE,wDAA6D;AAC7D,gDAAsF;AAGtF,8EAA0E;AAC1E,uDAAsD;AAEtD,uEAAkE;AAClE,iGAAwF;AAGjF,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC7C,YACkB,MAA6B,EAC7B,eAA+C,EAC/C,cAA8B,EAC9B,MAAc;QAHd,WAAM,GAAN,MAAM,CAAuB;QAC7B,oBAAe,GAAf,eAAe,CAAgC;QAC/C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAGJ,gBAAgB,CAAC,IAAa,EAAE,GAAa,EAAE,IAAkB;QAChE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,EAAE,CAAC;YACjD,IAAA,mCAAiB,EAChB,GAAG,EACH,IAAI,gCAAc,CAAC,uDAAuD,CAAC,CAC3E,CAAC;YACF,OAAO;QACR,CAAC;QACD,IAAI,EAAE,CAAC;IACR,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,IAAa,EACb,IAAc,EACR,IAAsC;QAE5C,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC1E,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,EAAE;gBAC/E,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;QAED,OAAO;YACN,kBAAkB,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE;SACrE,CAAC;IACH,CAAC;CACD,CAAA;AAxCY,8EAAiC;AAS7C;IADC,IAAA,uBAAU,GAAE;;;;yEAUZ;AAIK;IAFL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,wBAAW,EAAC,gCAAgC,CAAC;IAI5C,WAAA,iBAAI,CAAA;;qDAAO,4CAAgC;;uEAc5C;4CAvCW,iCAAiC;IAD7C,IAAA,2BAAc,EAAC,4BAA4B,CAAC;qCAGlB,+CAAqB;QACZ,qEAA8B;QAC/B,+BAAc;QACtB,uBAAM;GALpB,iCAAiC,CAwC7C"}
+{"version":3,"file":"external-secrets-settings.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/external-secrets.ee/external-secrets-settings.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAkE;AAClE,wDAA6D;AAC7D,gDAAsF;AAItF,8EAA0E;AAC1E,0DAAsD;AACtD,uDAAsD;AAEtD,uEAAkE;AAClE,iGAAwF;AAGjF,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC7C,YACkB,MAA6B,EAC7B,eAA+C,EAC/C,cAA8B,EAC9B,MAAc,EACd,YAA0B;QAJ1B,WAAM,GAAN,MAAM,CAAuB;QAC7B,oBAAe,GAAf,eAAe,CAAgC;QAC/C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGJ,gBAAgB,CAAC,IAAa,EAAE,GAAa,EAAE,IAAkB;QAChE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,8BAA8B,EAAE,CAAC;YACjD,IAAA,mCAAiB,EAChB,GAAG,EACH,IAAI,gCAAc,CAAC,uDAAuD,CAAC,CAC3E,CAAC;YACF,OAAO;QACR,CAAC;QACD,IAAI,EAAE,CAAC;IACR,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,IAAc,EACR,IAAsC;QAE5C,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE1E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,uCAAuC,EAAE;YAC/D,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,OAAO,EAAE,IAAI,CAAC,kBAAkB;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,EAAE;gBAC/E,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;QAED,OAAO;YACN,kBAAkB,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE;SACrE,CAAC;IACH,CAAC;CACD,CAAA;AA/CY,8EAAiC;AAU7C;IADC,IAAA,uBAAU,GAAE;;;;yEAUZ;AAIK;IAFL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,wBAAW,EAAC,gCAAgC,CAAC;IAI5C,WAAA,iBAAI,CAAA;;qDAAO,4CAAgC;;uEAoB5C;4CA9CW,iCAAiC;IAD7C,IAAA,2BAAc,EAAC,4BAA4B,CAAC;qCAGlB,+CAAqB;QACZ,qEAA8B;QAC/B,+BAAc;QACtB,uBAAM;QACA,4BAAY;GANhC,iCAAiC,CA+C7C"}

package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js

@@ -52,17 +52,17 @@ let SecretProvidersConnectionsController = class SecretProvidersConnectionsContr
             providerKey: body.providerKey,
             type: body.type,
         });
-        const savedConnection = await this.connectionsService.createConnection(body, req.user.id, 'secretsProviderConnection:user');
+        const savedConnection = await this.connectionsService.createConnection(body, req.user.id, 'secretsProviderConnection:user', req.user.role?.slug);
         return this.connectionsService.toPublicConnection(savedConnection);
     }
     async updateConnection(req, _res, providerKey, body) {
         this.logger.debug('Updating connection', { providerKey });
-        const connection = await this.connectionsService.updateGlobalConnection(providerKey, body, req.user.id);
+        const connection = await this.connectionsService.updateGlobalConnection(providerKey, body, req.user.id, req.user.role?.slug);
         return this.connectionsService.toPublicConnection(connection);
     }
     async deleteConnection(req, res, providerKey) {
         this.logger.debug('Deleting connection', { providerKey });
-        await this.connectionsService.deleteConnection(providerKey, req.user.id);
+        await this.connectionsService.deleteConnection(providerKey, req.user.id, req.user.role?.slug);
         res.status(204).send();
         return;
     }
@@ -78,11 +78,11 @@ let SecretProvidersConnectionsController = class SecretProvidersConnectionsContr
     }
     async testConnection(req, _res, providerKey) {
         this.logger.debug('Testing provider connection', { providerKey });
-        return await this.connectionsService.testConnection(providerKey, req.user.id);
+        return await this.connectionsService.testConnection(providerKey, req.user.id, req.user.role?.slug);
     }
     async reloadConnectionSecrets(req, _res, providerKey) {
         this.logger.debug('Reloading secrets for secret provider connection', { providerKey });
-        return await this.connectionsService.reloadConnectionSecrets(providerKey, req.user.id);
+        return await this.connectionsService.reloadConnectionSecrets(providerKey, req.user.id, req.user.role?.slug);
     }
 };
 exports.SecretProvidersConnectionsController = SecretProvidersConnectionsController;

package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"secrets-providers-connections.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/external-secrets.ee/secrets-providers-connections.controller.ee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"secrets-providers-connections.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/external-secrets.ee/secrets-providers-connections.controller.ee.ts"],"names":[],"mappings":"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"}

package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.d.ts

@@ -20,21 +20,21 @@ export declare class SecretsProvidersConnectionsService {
     private readonly redactionService;
     private readonly eventService;
     constructor(logger: Logger, repository: SecretsProviderConnectionRepository, projectAccessRepository: ProjectSecretsProviderAccessRepository, credentialDependencyService: CredentialDependencyService, providerRegistry: ExternalSecretsProviderRegistry, cipher: Cipher, externalSecretsManager: ExternalSecretsManager, redactionService: RedactionService, eventService: EventService);
-    createConnection(proposedConnection: CreateSecretsProviderConnectionDto, userId: string, projectRole: SecretsProviderAccessRole): Promise<SecretsProviderConnection>;
+    createConnection(proposedConnection: CreateSecretsProviderConnectionDto, userId: string, projectRole: SecretsProviderAccessRole, userRole?: string): Promise<SecretsProviderConnection>;
     updateProjectConnection(providerKey: string, updates: {
         type?: string;
         settings?: IDataObject;
         isEnabled?: boolean;
-    }, userId: string): Promise<SecretsProviderConnection>;
+    }, userId: string, userRole?: string): Promise<SecretsProviderConnection>;
     updateGlobalConnection(providerKey: string, updates: {
         type?: string;
         projectIds?: string[];
         settings?: IDataObject;
         isEnabled?: boolean;
-    }, userId: string): Promise<SecretsProviderConnection>;
+    }, userId: string, userRole?: string): Promise<SecretsProviderConnection>;
     private applyConnectionUpdates;
     private syncAndEmitUpdate;
-    deleteConnection(providerKey: string, userId: string): Promise<SecretsProviderConnection>;
+    deleteConnection(providerKey: string, userId: string, userRole?: string): Promise<SecretsProviderConnection>;
     private findConnectionOrFail;
     getConnection(providerKey: string): Promise<SecretsProviderConnection>;
     listConnections(): Promise<SecretsProviderConnection[]>;
@@ -44,8 +44,8 @@ export declare class SecretsProvidersConnectionsService {
     toSecretCompletionsResponse(connections: SecretsProviderConnection[]): SecretCompletionsResponse;
     toPublicConnectionListItem(connection: SecretsProviderConnection): SecretProviderConnectionListItem;
     toPublicConnection(connection: SecretsProviderConnection): SecretProviderConnection;
-    testConnection(providerKey: string, userId: string): Promise<TestSecretProviderConnectionResponse>;
-    reloadConnectionSecrets(providerKey: string, userId: string): Promise<ReloadSecretProviderConnectionResponse>;
+    testConnection(providerKey: string, userId: string, userRole?: string): Promise<TestSecretProviderConnectionResponse>;
+    reloadConnectionSecrets(providerKey: string, userId: string, userRole?: string): Promise<ReloadSecretProviderConnectionResponse>;
     private extractProjectInfo;
     cleanupConnectionsForProjectDeletion(projectId: string): Promise<void>;
     private encryptConnectionSettings;

package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js

@@ -37,7 +37,7 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
         this.eventService = eventService;
         this.logger = this.logger.scoped('external-secrets');
     }
-    async createConnection(proposedConnection, userId, projectRole) {
+    async createConnection(proposedConnection, userId, projectRole, userRole) {
         const existing = await this.repository.findOne({
             where: { providerKey: proposedConnection.providerKey },
         });
@@ -65,19 +65,20 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
         await this.externalSecretsManager.syncProviderConnection(proposedConnection.providerKey);
         this.eventService.emit('external-secrets-connection-created', {
             userId,
+            userRole,
             providerKey: result.providerKey,
             vaultType: result.type,
             ...this.extractProjectInfo(result),
         });
         return result;
     }
-    async updateProjectConnection(providerKey, updates, userId) {
+    async updateProjectConnection(providerKey, updates, userId, userRole) {
         const connection = await this.findConnectionOrFail(providerKey);
         this.applyConnectionUpdates(connection, updates);
         await this.repository.save(connection);
-        return await this.syncAndEmitUpdate(providerKey, userId);
+        return await this.syncAndEmitUpdate(providerKey, userId, userRole);
     }
-    async updateGlobalConnection(providerKey, updates, userId) {
+    async updateGlobalConnection(providerKey, updates, userId, userRole) {
         const connection = await this.findConnectionOrFail(providerKey);
         this.applyConnectionUpdates(connection, updates);
         await this.repository.save(connection);
@@ -96,7 +97,7 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
             }));
             await this.projectAccessRepository.updateProjectAccess(connection.id, projectIdsToRemove, entriesToAdd);
         }
-        return await this.syncAndEmitUpdate(providerKey, userId);
+        return await this.syncAndEmitUpdate(providerKey, userId, userRole);
     }
     applyConnectionUpdates(connection, updates) {
         if (updates.type !== undefined) {
@@ -114,20 +115,21 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
             connection.isEnabled = updates.isEnabled;
         }
     }
-    async syncAndEmitUpdate(providerKey, userId) {
+    async syncAndEmitUpdate(providerKey, userId, userRole) {
         await this.externalSecretsManager.syncProviderConnection(providerKey);
         const result = (await this.repository.findOne({
             where: { providerKey },
         }));
         this.eventService.emit('external-secrets-connection-updated', {
             userId,
+            userRole,
             providerKey: result.providerKey,
             vaultType: result.type,
             ...this.extractProjectInfo(result),
         });
         return result;
     }
-    async deleteConnection(providerKey, userId) {
+    async deleteConnection(providerKey, userId, userRole) {
         const connection = await this.findConnectionOrFail(providerKey);
         const projectInfo = this.extractProjectInfo(connection);
         const dependencyId = connection.id.toString();
@@ -143,6 +145,7 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
         await this.externalSecretsManager.syncProviderConnection(providerKey);
         this.eventService.emit('external-secrets-connection-deleted', {
             userId,
+            userRole,
             providerKey: connection.providerKey,
             vaultType: connection.type,
             ...projectInfo,
@@ -230,13 +233,14 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
             updatedAt: connection.updatedAt.toISOString(),
         };
     }
-    async testConnection(providerKey, userId) {
+    async testConnection(providerKey, userId, userRole) {
         const connection = await this.getConnection(providerKey);
         const decryptedSettings = this.decryptConnectionSettings(connection.encryptedSettings);
         const result = await this.externalSecretsManager.testProviderSettings(connection.type, decryptedSettings);
         const response = api_types_1.testSecretProviderConnectionResponseSchema.parse(result);
         this.eventService.emit('external-secrets-connection-tested', {
             userId,
+            userRole,
             providerKey: connection.providerKey,
             vaultType: connection.type,
             ...this.extractProjectInfo(connection),
@@ -245,12 +249,13 @@ let SecretsProvidersConnectionsService = class SecretsProvidersConnectionsServic
         });
         return response;
     }
-    async reloadConnectionSecrets(providerKey, userId) {
+    async reloadConnectionSecrets(providerKey, userId, userRole) {
         try {
             const connection = await this.getConnection(providerKey);
             await this.externalSecretsManager.updateProvider(providerKey);
             this.eventService.emit('external-secrets-connection-reloaded', {
                 userId,
+                userRole,
                 providerKey: connection.providerKey,
                 vaultType: connection.type,
                 ...this.extractProjectInfo(connection),