n8n 2.15.1 → 2.17.0

package/dist/modules/provisioning.ee/role-mapping-rule.controller.ee.js

@@ -16,11 +16,13 @@ exports.RoleMappingRuleController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
+const event_service_1 = require("../../events/event.service");
 const role_mapping_rule_service_ee_1 = require("./role-mapping-rule.service.ee");
 let RoleMappingRuleController = class RoleMappingRuleController {
-    constructor(roleMappingRuleService, licenseState) {
+    constructor(roleMappingRuleService, licenseState, eventService) {
         this.roleMappingRuleService = roleMappingRuleService;
         this.licenseState = licenseState;
+        this.eventService = eventService;
     }
     async list(_req, res, query) {
         if (!this.licenseState.isProvisioningLicensed()) {
@@ -28,29 +30,56 @@ let RoleMappingRuleController = class RoleMappingRuleController {
         }
         return await this.roleMappingRuleService.list(query);
     }
-    async create(_req, res, body) {
+    async create(req, res, body) {
         if (!this.licenseState.isProvisioningLicensed()) {
             return res.status(403).json({ message: 'Provisioning is not licensed' });
         }
-        return await this.roleMappingRuleService.create(body);
+        const result = await this.roleMappingRuleService.create(body);
+        this.eventService.emit('role-mapping-rule-created', {
+            user: { id: req.user.id, email: req.user.email },
+            ruleId: result.id,
+            ruleType: result.type,
+            expression: result.expression,
+            role: result.role,
+        });
+        return result;
     }
-    async move(_req, res, body, id) {
+    async move(req, res, body, id) {
         if (!this.licenseState.isProvisioningLicensed()) {
             return res.status(403).json({ message: 'Provisioning is not licensed' });
         }
-        return await this.roleMappingRuleService.move(id, body.targetIndex);
+        const result = await this.roleMappingRuleService.move(id, body.targetIndex);
+        this.eventService.emit('role-mapping-rule-updated', {
+            user: { id: req.user.id, email: req.user.email },
+            ruleId: result.id,
+            ruleType: result.type,
+            patchedFields: ['order'],
+        });
+        return result;
     }
-    async patch(_req, res, body, id) {
+    async patch(req, res, body, id) {
         if (!this.licenseState.isProvisioningLicensed()) {
             return res.status(403).json({ message: 'Provisioning is not licensed' });
         }
-        return await this.roleMappingRuleService.patch(id, body);
+        const result = await this.roleMappingRuleService.patch(id, body);
+        this.eventService.emit('role-mapping-rule-updated', {
+            user: { id: req.user.id, email: req.user.email },
+            ruleId: result.id,
+            ruleType: result.type,
+            patchedFields: Object.keys(body),
+        });
+        return result;
     }
-    async delete(_req, res, id) {
+    async delete(req, res, id) {
         if (!this.licenseState.isProvisioningLicensed()) {
             return res.status(403).json({ message: 'Provisioning is not licensed' });
         }
-        await this.roleMappingRuleService.delete(id);
+        const { ruleType } = await this.roleMappingRuleService.delete(id);
+        this.eventService.emit('role-mapping-rule-deleted', {
+            user: { id: req.user.id, email: req.user.email },
+            ruleId: id,
+            ruleType,
+        });
         return { success: true };
     }
 };
@@ -100,6 +129,7 @@ __decorate([
 exports.RoleMappingRuleController = RoleMappingRuleController = __decorate([
     (0, decorators_1.RestController)('/role-mapping-rule'),
     __metadata("design:paramtypes", [role_mapping_rule_service_ee_1.RoleMappingRuleService,
-        backend_common_1.LicenseState])
+        backend_common_1.LicenseState,
+        event_service_1.EventService])
 ], RoleMappingRuleController);
 //# sourceMappingURL=role-mapping-rule.controller.ee.js.map

package/dist/modules/provisioning.ee/role-mapping-rule.controller.ee.js.map

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

package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.d.ts

@@ -24,7 +24,9 @@ export declare class RoleMappingRuleService {
     list(query: ListRoleMappingRuleQueryInput): Promise<RoleMappingRuleListResponse>;
     create(dto: CreateRoleMappingRuleInput): Promise<RoleMappingRuleResponse>;
     patch(id: string, dto: PatchRoleMappingRuleInput): Promise<RoleMappingRuleResponse>;
-    delete(id: string): Promise<void>;
+    delete(id: string): Promise<{
+        ruleType: 'instance' | 'project';
+    }>;
     move(id: string, targetIndex: number): Promise<RoleMappingRuleResponse>;
     private applyOrder;
     private normalizeOrderForType;

package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js

@@ -135,6 +135,7 @@ let RoleMappingRuleService = class RoleMappingRuleService {
         const ruleType = rule.type;
         await this.roleMappingRuleRepository.remove(rule);
         await this.normalizeOrderForType(ruleType);
+        return { ruleType };
     }
     async move(id, targetIndex) {
         if (typeof id !== 'string' || id.length === 0) {

package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js.map

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

package/dist/modules/provisioning.ee/role-resolver-types.d.ts

@@ -23,9 +23,21 @@ export interface RoleMappingConfig {
     projectRoleRules: RoleMappingRule[];
     fallbackInstanceRole: string;
 }
+export interface ResolvedInstanceRole {
+    role: string;
+    matchedRuleId: string | null;
+    expression: string | null;
+    isFallback: boolean;
+}
+export interface ResolvedProjectRole {
+    projectId: string;
+    role: string;
+    matchedRuleId: string;
+    expression: string;
+}
 export interface ResolvedRoles {
-    instanceRole: string;
-    projectRoles: Map<string, string>;
+    instanceRole: ResolvedInstanceRole;
+    projectRoles: Map<string, ResolvedProjectRole>;
 }
 export interface ProjectInfo {
     id: string;

package/dist/modules/provisioning.ee/role-resolver.service.ee.js

@@ -54,19 +54,24 @@ let RoleResolverService = class RoleResolverService {
             if (!rule.enabled)
                 continue;
             if (this.evaluateExpression(rule.expression, context)) {
-                return rule.role;
+                return {
+                    role: rule.role,
+                    matchedRuleId: rule.id,
+                    expression: rule.expression,
+                    isFallback: false,
+                };
             }
         }
-        return fallback;
+        return { role: fallback, matchedRuleId: null, expression: null, isFallback: true };
     }
     resolveProjectRoles(rules, context, projects) {
-        const result = new Map();
+        const matched = new Map();
         for (const rule of rules) {
             if (!rule.enabled)
                 continue;
             if (!rule.projectId)
                 continue;
-            if (result.has(rule.projectId))
+            if (matched.has(rule.projectId))
                 continue;
             const project = projects.get(rule.projectId);
             if (!project) {
@@ -75,10 +80,15 @@ let RoleResolverService = class RoleResolverService {
             }
             const enrichedContext = (0, claims_context_builder_1.withProjectContext)(context, project);
             if (this.evaluateExpression(rule.expression, enrichedContext)) {
-                result.set(rule.projectId, rule.role);
+                matched.set(rule.projectId, {
+                    projectId: rule.projectId,
+                    role: rule.role,
+                    matchedRuleId: rule.id,
+                    expression: rule.expression,
+                });
             }
         }
-        return result;
+        return matched;
     }
     evaluateExpression(expression, context) {
         try {

package/dist/modules/provisioning.ee/role-resolver.service.ee.js.map

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

package/dist/modules/redaction/executions/execution-redaction.service.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from '@n8n/backend-common';
+import { LicenseState, Logger } from '@n8n/backend-common';
 import type { ExecutionRedaction, ExecutionRedactionOptions, RedactableExecution } from '../../../executions/execution-redaction';
 import { EventService } from '../../../events/event.service';
 import { WorkflowFinderService } from '../../../workflows/workflow-finder.service';
@@ -6,11 +6,12 @@ import { FullItemRedactionStrategy } from './strategies/full-item-redaction.stra
 import { NodeDefinedFieldRedactionStrategy } from './strategies/node-defined-field-redaction.strategy';
 export declare class ExecutionRedactionService implements ExecutionRedaction {
     private readonly logger;
+    private readonly licenseState;
     private readonly workflowFinderService;
     private readonly eventService;
     private readonly fullItemRedactionStrategy;
     private readonly nodeDefinedFieldRedactionStrategy;
-    constructor(logger: Logger, workflowFinderService: WorkflowFinderService, eventService: EventService, fullItemRedactionStrategy: FullItemRedactionStrategy, nodeDefinedFieldRedactionStrategy: NodeDefinedFieldRedactionStrategy);
+    constructor(logger: Logger, licenseState: LicenseState, workflowFinderService: WorkflowFinderService, eventService: EventService, fullItemRedactionStrategy: FullItemRedactionStrategy, nodeDefinedFieldRedactionStrategy: NodeDefinedFieldRedactionStrategy);
     init(): Promise<void>;
     processExecution(execution: RedactableExecution, options: ExecutionRedactionOptions): Promise<RedactableExecution>;
     processExecutions(executions: RedactableExecution[], options: ExecutionRedactionOptions): Promise<void>;

package/dist/modules/redaction/executions/execution-redaction.service.js

@@ -20,8 +20,9 @@ const full_item_redaction_strategy_1 = require("./strategies/full-item-redaction
 const node_defined_field_redaction_strategy_1 = require("./strategies/node-defined-field-redaction.strategy");
 const MANUAL_MODES = new Set(['manual']);
 let ExecutionRedactionService = class ExecutionRedactionService {
-    constructor(logger, workflowFinderService, eventService, fullItemRedactionStrategy, nodeDefinedFieldRedactionStrategy) {
+    constructor(logger, licenseState, workflowFinderService, eventService, fullItemRedactionStrategy, nodeDefinedFieldRedactionStrategy) {
         this.logger = logger;
+        this.licenseState = licenseState;
         this.workflowFinderService = workflowFinderService;
         this.eventService = eventService;
         this.fullItemRedactionStrategy = fullItemRedactionStrategy;
@@ -134,6 +135,8 @@ let ExecutionRedactionService = class ExecutionRedactionService {
             (policy === 'manual-only' && !MANUAL_MODES.has(execution.mode)));
     }
     resolvePolicy(execution) {
+        if (!this.licenseState.isDataRedactionLicensed())
+            return 'none';
         return (execution.data.executionData?.runtimeData?.redaction?.policy ??
             execution.workflowData.settings?.redactionPolicy ??
             'none');
@@ -143,6 +146,7 @@ exports.ExecutionRedactionService = ExecutionRedactionService;
 exports.ExecutionRedactionService = ExecutionRedactionService = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [backend_common_1.Logger,
+        backend_common_1.LicenseState,
         workflow_finder_service_1.WorkflowFinderService,
         event_service_1.EventService,
         full_item_redaction_strategy_1.FullItemRedactionStrategy,

package/dist/modules/redaction/executions/execution-redaction.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"execution-redaction.service.js","sourceRoot":"","sources":["../../../../src/modules/redaction/executions/execution-redaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAQlC,8EAA0E;AAC1E,0FAAqF;AACrF,0DAAsD;AACtD,iFAA4E;AAM5E,4FAAsF;AACtF,8GAAuG;AAEvG,MAAM,YAAY,GAAqC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AAepE,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACrC,YACkB,MAAc,EACd,qBAA4C,EAC5C,YAA0B,EAC1B,yBAAoD,EACpD,iCAAoE;QAJpE,WAAM,GAAN,MAAM,CAAQ;QACd,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,sCAAiC,GAAjC,iCAAiC,CAAmC;IACnF,CAAC;IAEJ,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAChE,CAAC;IAUD,KAAK,CAAC,gBAAgB,CACrB,SAA8B,EAC9B,OAAkC;QAElC,MAAM,UAAU,GAAG,CAAC,SAAS,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAClD,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IAUD,KAAK,CAAC,iBAAiB,CACtB,UAAiC,EACjC,OAAkC;QAElC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAIpC,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;QACzE,IAAI,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QACtC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC5E,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,+BAA+B,CAC/E,iBAAiB,EACjB,OAAO,CAAC,IAAI,EACZ,CAAC,kBAAkB,CAAC,CACpB,CAAC;QACH,CAAC;QAGD,IAAI,OAAO,CAAC,mBAAmB,KAAK,KAAK,EAAE,CAAC;YAE3C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACpC,IAAI,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC3C,MAAM,IAAI,gCAAc,EAAE,CAAC;gBAC5B,CAAC;YACF,CAAC;YAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;oBAE9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,+BAA+B,EAAE;wBACvD,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,WAAW,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE;wBAC/B,UAAU,EAAE,SAAS,CAAC,UAAU;wBAChC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE;wBAClC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE;wBAClC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;wBAC9C,eAAe,EAAE,qDAAqD;qBACtE,CAAC,CAAC;oBACH,MAAM,IAAI,2CAAmB,CAC5B,gGAAgG,EAChG,EAAE,SAAS,EAAE,4BAA4B,EAAE,aAAa,EAAE,kBAAkB,EAAE,EAC9E,wDAAwD,CACxD,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QAMD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAE9D,MAAM,aAAa,GAAG,WAAW;gBAChC,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,kBAAkB,IAAI,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACjE,MAAM,OAAO,GAAqB;gBACjC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;gBAChD,aAAa;gBACb,qBAAqB,EAAE,WAAW;gBAClC,IAAI,EAAE,IAAI,GAAG,EAAE;aACf,CAAC;YACF,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;YAEzF,IAAI,MAAM,GAAG,SAAS,CAAC;YACvB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;gBACjF,IAAI,CAAC,UAAU;oBAAE,SAAS;gBAC1B,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;gBACpC,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;YACxB,CAAC;YAED,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjC,MAAM,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvC,CAAC;YAID,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;gBAC3D,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC;YAC1D,CAAC;QACF,CAAC;QAGD,IAAI,OAAO,CAAC,mBAAmB,KAAK,KAAK,EAAE,CAAC;YAC3C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACpC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,yBAAyB,EAAE;oBACjD,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,WAAW,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE;oBAC/B,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE;oBAClC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,EAAE;oBAClC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;iBAC9C,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;IACF,CAAC;IAYO,aAAa,CACpB,SAA8B,EAC9B,OAAyB,EACzB,kBAA2B,EAC3B,qBAA8B;QAE9B,MAAM,QAAQ,GAAkC,EAAE,CAAC;QAEnD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,gBAAgB,GACrB,OAAO,CAAC,mBAAmB,KAAK,KAAK;YACrC,CAAC,OAAO,CAAC,mBAAmB,KAAK,IAAI;gBACpC,qBAAqB;gBACrB,CAAC,CAAC,kBAAkB;oBACnB,CAAC,MAAM,KAAK,KAAK;wBAChB,CAAC,MAAM,KAAK,YAAY,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;wBAC9D,CAAC,MAAM,KAAK,aAAa,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtE,IAAI,gBAAgB,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEtD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAUO,qBAAqB,CAAC,SAA8B;QAC3D,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CACpF,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAChE,CAAC;IACH,CAAC;IAUO,kBAAkB,CAAC,SAA8B;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC7C,OAAO,CACN,MAAM,KAAK,MAAM;YACjB,CAAC,MAAM,KAAK,YAAY,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC7D,CAAC,MAAM,KAAK,aAAa,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAC/D,CAAC;IACH,CAAC;IAQO,aAAa,CAAC,SAA8B;QACnD,OAAO,CACN,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM;YAC5D,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe;YAChD,MAAM,CACN,CAAC;IACH,CAAC;CACD,CAAA;AA/NY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,YAAO,GAAE;qCAGiB,uBAAM;QACS,+CAAqB;QAC9B,4BAAY;QACC,wDAAyB;QACjB,yEAAiC;GAN1E,yBAAyB,CA+NrC"}
+{"version":3,"file":"execution-redaction.service.js","sourceRoot":"","sources":["../../../../src/modules/redaction/executions/execution-redaction.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/redaction/redaction.module.js

@@ -43,14 +43,8 @@ exports.RedactionModule = void 0;
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const execution_redaction_proxy_service_1 = require("../../executions/execution-redaction-proxy.service");
-function isExecutionRedactionEnabled() {
-    return process.env.N8N_ENV_FEAT_EXECUTION_REDACTION === 'true';
-}
 let RedactionModule = class RedactionModule {
     async init() {
-        if (!isExecutionRedactionEnabled()) {
-            return;
-        }
         const { ExecutionRedactionService } = await Promise.resolve().then(() => __importStar(require('./executions/execution-redaction.service')));
         const executionRedactionService = di_1.Container.get(ExecutionRedactionService);
         await executionRedactionService.init();

package/dist/modules/redaction/redaction.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redaction.module.js","sourceRoot":"","sources":["../../../src/modules/redaction/redaction.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAgD;AAChD,gCAAoC;AAEpC,sGAAgG;AAEhG,SAAS,2BAA2B;IACnC,OAAO,OAAO,CAAC,GAAG,CAAC,gCAAgC,KAAK,MAAM,CAAC;AAChE,CAAC;AAGM,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,2BAA2B,EAAE,EAAE,CAAC;YACpC,OAAO;QACR,CAAC;QACD,MAAM,EAAE,yBAAyB,EAAE,GAAG,wDAAa,0CAA0C,GAAC,CAAC;QAC/F,MAAM,yBAAyB,GAAG,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAC3E,MAAM,yBAAyB,CAAC,IAAI,EAAE,CAAC;QAEvC,MAAM,8BAA8B,GAAG,cAAS,CAAC,GAAG,CAAC,kEAA8B,CAAC,CAAC;QACrF,8BAA8B,CAAC,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;IACjF,CAAC;CACD,CAAA;AAZY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;GACjD,eAAe,CAY3B"}
+{"version":3,"file":"redaction.module.js","sourceRoot":"","sources":["../../../src/modules/redaction/redaction.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAgD;AAChD,gCAAoC;AAEpC,sGAAgG;AAGzF,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,KAAK,CAAC,IAAI;QACT,MAAM,EAAE,yBAAyB,EAAE,GAAG,wDAAa,0CAA0C,GAAC,CAAC;QAC/F,MAAM,yBAAyB,GAAG,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAC3E,MAAM,yBAAyB,CAAC,IAAI,EAAE,CAAC;QAEvC,MAAM,8BAA8B,GAAG,cAAS,CAAC,GAAG,CAAC,kEAA8B,CAAC,CAAC;QACrF,8BAA8B,CAAC,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;IACjF,CAAC;CACD,CAAA;AATY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;GACjD,eAAe,CAS3B"}

package/dist/modules/source-control.ee/source-control-context.factory.d.ts

@@ -0,0 +1,12 @@
+import { ProjectRepository, WorkflowRepository } from '@n8n/db';
+import type { User } from '@n8n/db';
+import { SourceControlContext } from './types/source-control-context';
+export declare class SourceControlContextFactory {
+    private readonly projectRepository;
+    private readonly workflowRepository;
+    constructor(projectRepository: ProjectRepository, workflowRepository: WorkflowRepository);
+    createContext(user: User): Promise<SourceControlContext>;
+    private fetchAllProjects;
+    private fetchAuthorizedProjects;
+    private fetchAccessibleWorkflowIds;
+}

package/dist/modules/source-control.ee/source-control-context.factory.js

@@ -0,0 +1,112 @@
+"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.SourceControlContextFactory = void 0;
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const permissions_1 = require("@n8n/permissions");
+const typeorm_1 = require("@n8n/typeorm");
+const source_control_context_1 = require("./types/source-control-context");
+let SourceControlContextFactory = class SourceControlContextFactory {
+    constructor(projectRepository, workflowRepository) {
+        this.projectRepository = projectRepository;
+        this.workflowRepository = workflowRepository;
+    }
+    async createContext(user) {
+        if ((0, permissions_1.hasGlobalScope)(user, 'project:update')) {
+            return new source_control_context_1.SourceControlContext(user, await this.fetchAllProjects(), []);
+        }
+        const [authorizedProjects, accessibleWorkflowIds] = await Promise.all([
+            this.fetchAuthorizedProjects(user),
+            this.fetchAccessibleWorkflowIds(user),
+        ]);
+        return new source_control_context_1.SourceControlContext(user, authorizedProjects, accessibleWorkflowIds);
+    }
+    async fetchAllProjects() {
+        const projects = await this.projectRepository.find();
+        const personalProjects = projects.filter((p) => p.type === 'personal');
+        if (personalProjects.length > 0) {
+            const personalProjectIds = personalProjects.map((p) => p.id);
+            const ownerRelations = await this.projectRepository
+                .createQueryBuilder('project')
+                .leftJoinAndSelect('project.projectRelations', 'pr', 'pr.role = :ownerRole', {
+                ownerRole: 'project:personalOwner',
+            })
+                .leftJoinAndSelect('pr.role', 'role')
+                .leftJoinAndSelect('pr.user', 'user')
+                .where('project.id IN (:...ids)', { ids: personalProjectIds })
+                .select(['project.id', 'pr.userId', 'pr.projectId', 'role.slug', 'user.email'])
+                .getMany();
+            const relationsById = new Map(ownerRelations.map((p) => [p.id, p.projectRelations]));
+            for (const project of personalProjects) {
+                project.projectRelations = relationsById.get(project.id) ?? [];
+            }
+        }
+        for (const project of projects) {
+            if (project.type === 'team') {
+                project.projectRelations = [];
+            }
+        }
+        return projects;
+    }
+    async fetchAuthorizedProjects(user) {
+        const projectEntities = await this.projectRepository
+            .createQueryBuilder('project')
+            .innerJoin('project.projectRelations', 'pr', 'pr.userId = :userId', {
+            userId: user.id,
+        })
+            .innerJoin('pr.role', 'role')
+            .innerJoin('role.scopes', 'scope', 'scope.slug = :scope', {
+            scope: 'sourceControl:push',
+        })
+            .where('project.type = :type', { type: 'team' })
+            .select(['project.id'])
+            .getMany();
+        if (projectEntities.length === 0)
+            return [];
+        const ids = projectEntities.map((p) => p.id);
+        const projects = await this.projectRepository.find({
+            select: { id: true, name: true, type: true },
+            where: { id: (0, typeorm_1.In)(ids) },
+        });
+        for (const project of projects) {
+            project.projectRelations = [];
+        }
+        return projects;
+    }
+    async fetchAccessibleWorkflowIds(user) {
+        const where = {
+            shared: {
+                role: 'workflow:owner',
+                project: {
+                    type: 'team',
+                    projectRelations: {
+                        role: {
+                            scopes: {
+                                slug: 'sourceControl:push',
+                            },
+                        },
+                        userId: user.id,
+                    },
+                },
+            },
+        };
+        const workflows = await this.workflowRepository.find({ select: { id: true }, where });
+        return workflows.map((w) => w.id);
+    }
+};
+exports.SourceControlContextFactory = SourceControlContextFactory;
+exports.SourceControlContextFactory = SourceControlContextFactory = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [db_1.ProjectRepository,
+        db_1.WorkflowRepository])
+], SourceControlContextFactory);
+//# sourceMappingURL=source-control-context.factory.js.map

package/dist/modules/source-control.ee/source-control-context.factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control-context.factory.js","sourceRoot":"","sources":["../../../src/modules/source-control.ee/source-control-context.factory.ts"],"names":[],"mappings":"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"}

package/dist/modules/source-control.ee/source-control-export.service.ee.d.ts

@@ -1,12 +1,12 @@
 import type { SourceControlledFile } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import { FolderRepository, ProjectRepository, SharedCredentialsRepository, SharedWorkflowRepository, TagRepository, WorkflowRepository, WorkflowTagMappingRepository } from '@n8n/db';
-import { DataTableRepository } from '../../modules/data-table/data-table.repository';
 import { InstanceSettings } from 'n8n-core';
-import { VariablesService } from '../../environments.ee/variables/variables.service.ee';
 import { SourceControlScopedService } from './source-control-scoped.service';
 import type { ExportResult } from './types/export-result';
 import type { SourceControlContext } from './types/source-control-context';
+import { VariablesService } from '../../environments.ee/variables/variables.service.ee';
+import { DataTableRepository } from '../../modules/data-table/data-table.repository';
 export declare class SourceControlExportService {
     private readonly logger;
     private readonly variablesService;

package/dist/modules/source-control.ee/source-control-export.service.ee.js

@@ -15,20 +15,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlExportService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const db_1 = require("@n8n/db");
-const data_table_repository_1 = require("../../modules/data-table/data-table.repository");
 const di_1 = require("@n8n/di");
 const permissions_1 = require("@n8n/permissions");
 const typeorm_1 = require("@n8n/typeorm");
+const chunk_1 = __importDefault(require("lodash/chunk"));
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const promises_1 = require("node:fs/promises");
 const path_1 = __importDefault(require("path"));
-const workflow_formatter_1 = require("../../workflows/workflow.formatter");
-const chunk_1 = __importDefault(require("lodash/chunk"));
-const variables_service_ee_1 = require("../../environments.ee/variables/variables.service.ee");
 const constants_1 = require("./constants");
 const source_control_helper_ee_1 = require("./source-control-helper.ee");
 const source_control_scoped_service_1 = require("./source-control-scoped.service");
+const variables_service_ee_1 = require("../../environments.ee/variables/variables.service.ee");
+const data_table_repository_1 = require("../../modules/data-table/data-table.repository");
+const workflow_formatter_1 = require("../../workflows/workflow.formatter");
 let SourceControlExportService = class SourceControlExportService {
     constructor(logger, variablesService, tagRepository, projectRepository, sharedCredentialsRepository, sharedWorkflowRepository, workflowRepository, workflowTagMappingRepository, folderRepository, sourceControlScopedService, instanceSettings, dataTableRepository) {
         this.logger = logger;
@@ -319,14 +319,12 @@ let SourceControlExportService = class SourceControlExportService {
                     files: [],
                 };
             }
-            const allowedProjects = await this.sourceControlScopedService.getAuthorizedProjectsFromContext(context);
             const fileName = (0, source_control_helper_ee_1.getFoldersPath)(this.gitFolder);
-            const existingFolders = await (0, source_control_helper_ee_1.readFoldersFromSourceControlFile)(fileName);
-            const foldersToKeepUnchanged = context.hasAccessToAllProjects()
-                ? []
-                : existingFolders.folders.filter((folder) => {
-                    return !allowedProjects.some((project) => project.id === folder.homeProjectId);
-                });
+            let foldersToKeepUnchanged = [];
+            if (!context.hasAccessToAllProjects()) {
+                const existingFolders = await (0, source_control_helper_ee_1.readFoldersFromSourceControlFile)(fileName);
+                foldersToKeepUnchanged = existingFolders.folders.filter((folder) => !context.canAccessProject(folder.homeProjectId));
+            }
             const newFolders = foldersToKeepUnchanged.concat(...folders.map((f) => ({
                 id: f.id,
                 name: f.name,