n8n 2.14.2 → 2.15.1

package/dist/modules/otel/span-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"span-registry.js","sourceRoot":"","sources":["../../../src/modules/otel/span-registry.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IAAzB;QACS,UAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IA+CzC,CAAC;IA7CA,MAAM,CAAC,WAAW,CAAC,WAAmB;QACrC,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,WAAmB,EAAE,MAAc;QACjD,OAAO,GAAG,WAAW,IAAI,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,WAAmB,EAAE,IAAU;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,WAAW,CAAC,WAAmB;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,cAAc,CAAC,WAAmB;QACjC,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,MAAc,EAAE,IAAU;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,MAAc;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,MAAc;QAC7C,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,CAAC,WAAmB;QAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACF,CAAC;IACF,CAAC;CACD;AAhDD,oCAgDC"}

package/dist/modules/provisioning.ee/provisioning.module.js

@@ -44,6 +44,7 @@ const decorators_1 = require("@n8n/decorators");
 let ProvisioningModule = class ProvisioningModule {
     async init() {
         await Promise.resolve().then(() => __importStar(require('./provisioning.controller.ee')));
+        await Promise.resolve().then(() => __importStar(require('./role-mapping-rule.controller.ee')));
     }
 };
 exports.ProvisioningModule = ProvisioningModule;

package/dist/modules/provisioning.ee/provisioning.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"provisioning.module.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAgD;AAOzC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC9B,KAAK,CAAC,IAAI;QACT,wDAAa,8BAA8B,GAAC,CAAC;IAC9C,CAAC;CACD,CAAA;AAJY,gDAAkB;6BAAlB,kBAAkB;IAL9B,IAAA,0BAAa,EAAC;QACd,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC;QACpD,aAAa,EAAE,CAAC,MAAM,CAAC;KACvB,CAAC;GACW,kBAAkB,CAI9B"}
+{"version":3,"file":"provisioning.module.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAgD;AAOzC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC9B,KAAK,CAAC,IAAI;QACT,wDAAa,8BAA8B,GAAC,CAAC;QAC7C,wDAAa,mCAAmC,GAAC,CAAC;IACnD,CAAC;CACD,CAAA;AALY,gDAAkB;6BAAlB,kBAAkB;IAL9B,IAAA,0BAAa,EAAC;QACd,IAAI,EAAE,cAAc;QACpB,WAAW,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC;QACpD,aAAa,EAAE,CAAC,MAAM,CAAC;KACvB,CAAC;GACW,kBAAkB,CAK9B"}

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

@@ -0,0 +1,18 @@
+import { CreateRoleMappingRuleDto, ListRoleMappingRuleQueryDto, MoveRoleMappingRuleDto, PatchRoleMappingRuleDto } from '@n8n/api-types';
+import { LicenseState } from '@n8n/backend-common';
+import { AuthenticatedRequest } from '@n8n/db';
+import type { Response } from 'express';
+import type { RoleMappingRuleListResponse, RoleMappingRuleResponse } from './role-mapping-rule.service.ee';
+import { RoleMappingRuleService } from './role-mapping-rule.service.ee';
+export declare class RoleMappingRuleController {
+    private readonly roleMappingRuleService;
+    private readonly licenseState;
+    constructor(roleMappingRuleService: RoleMappingRuleService, licenseState: LicenseState);
+    list(_req: AuthenticatedRequest, res: Response, query: ListRoleMappingRuleQueryDto): Promise<RoleMappingRuleListResponse | Response>;
+    create(_req: AuthenticatedRequest, res: Response, body: CreateRoleMappingRuleDto): Promise<RoleMappingRuleResponse | Response>;
+    move(_req: AuthenticatedRequest, res: Response, body: MoveRoleMappingRuleDto, id: string): Promise<RoleMappingRuleResponse | Response>;
+    patch(_req: AuthenticatedRequest, res: Response, body: PatchRoleMappingRuleDto, id: string): Promise<RoleMappingRuleResponse | Response>;
+    delete(_req: AuthenticatedRequest, res: Response, id: string): Promise<{
+        success: true;
+    } | Response>;
+}

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

@@ -0,0 +1,105 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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 role_mapping_rule_service_ee_1 = require("./role-mapping-rule.service.ee");
+let RoleMappingRuleController = class RoleMappingRuleController {
+    constructor(roleMappingRuleService, licenseState) {
+        this.roleMappingRuleService = roleMappingRuleService;
+        this.licenseState = licenseState;
+    }
+    async list(_req, res, query) {
+        if (!this.licenseState.isProvisioningLicensed()) {
+            return res.status(403).json({ message: 'Provisioning is not licensed' });
+        }
+        return await this.roleMappingRuleService.list(query);
+    }
+    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);
+    }
+    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);
+    }
+    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);
+    }
+    async delete(_req, res, id) {
+        if (!this.licenseState.isProvisioningLicensed()) {
+            return res.status(403).json({ message: 'Provisioning is not licensed' });
+        }
+        await this.roleMappingRuleService.delete(id);
+        return { success: true };
+    }
+};
+exports.RoleMappingRuleController = RoleMappingRuleController;
+__decorate([
+    (0, decorators_1.Get)('/'),
+    (0, decorators_1.GlobalScope)('roleMappingRule:list'),
+    __param(2, decorators_1.Query),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.ListRoleMappingRuleQueryDto]),
+    __metadata("design:returntype", Promise)
+], RoleMappingRuleController.prototype, "list", null);
+__decorate([
+    (0, decorators_1.Post)('/'),
+    (0, decorators_1.GlobalScope)('roleMappingRule:create'),
+    __param(2, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.CreateRoleMappingRuleDto]),
+    __metadata("design:returntype", Promise)
+], RoleMappingRuleController.prototype, "create", null);
+__decorate([
+    (0, decorators_1.Post)('/:id/move'),
+    (0, decorators_1.GlobalScope)('roleMappingRule:update'),
+    __param(2, decorators_1.Body),
+    __param(3, (0, decorators_1.Param)('id')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.MoveRoleMappingRuleDto, String]),
+    __metadata("design:returntype", Promise)
+], RoleMappingRuleController.prototype, "move", null);
+__decorate([
+    (0, decorators_1.Patch)('/:id'),
+    (0, decorators_1.GlobalScope)('roleMappingRule:update'),
+    __param(2, decorators_1.Body),
+    __param(3, (0, decorators_1.Param)('id')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, api_types_1.PatchRoleMappingRuleDto, String]),
+    __metadata("design:returntype", Promise)
+], RoleMappingRuleController.prototype, "patch", null);
+__decorate([
+    (0, decorators_1.Delete)('/:id'),
+    (0, decorators_1.GlobalScope)('roleMappingRule:delete'),
+    __param(2, (0, decorators_1.Param)('id')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, String]),
+    __metadata("design:returntype", Promise)
+], RoleMappingRuleController.prototype, "delete", null);
+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])
+], RoleMappingRuleController);
+//# sourceMappingURL=role-mapping-rule.controller.ee.js.map

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

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

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

@@ -0,0 +1,34 @@
+import { CreateRoleMappingRuleDto, type ListRoleMappingRuleQueryInput, type PatchRoleMappingRuleInput } from '@n8n/api-types';
+import { ProjectRepository, RoleMappingRuleRepository, RoleRepository } from '@n8n/db';
+import type { z } from 'zod';
+type CreateRoleMappingRuleInput = z.infer<(typeof CreateRoleMappingRuleDto)['schema']>;
+export type RoleMappingRuleResponse = {
+    id: string;
+    expression: string;
+    role: string;
+    type: 'instance' | 'project';
+    order: number;
+    projectIds: string[];
+    createdAt: string;
+    updatedAt: string;
+};
+export type RoleMappingRuleListResponse = {
+    count: number;
+    items: RoleMappingRuleResponse[];
+};
+export declare class RoleMappingRuleService {
+    private readonly roleMappingRuleRepository;
+    private readonly roleRepository;
+    private readonly projectRepository;
+    constructor(roleMappingRuleRepository: RoleMappingRuleRepository, roleRepository: RoleRepository, projectRepository: ProjectRepository);
+    list(query: ListRoleMappingRuleQueryInput): Promise<RoleMappingRuleListResponse>;
+    create(dto: CreateRoleMappingRuleInput): Promise<RoleMappingRuleResponse>;
+    patch(id: string, dto: PatchRoleMappingRuleInput): Promise<RoleMappingRuleResponse>;
+    delete(id: string): Promise<void>;
+    move(id: string, targetIndex: number): Promise<RoleMappingRuleResponse>;
+    private applyOrder;
+    private normalizeOrderForType;
+    private assertOrderAvailable;
+    private toResponse;
+}
+export {};

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

@@ -0,0 +1,221 @@
+"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.RoleMappingRuleService = void 0;
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const typeorm_1 = require("@n8n/typeorm");
+const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
+const conflict_error_1 = require("../../errors/response-errors/conflict.error");
+const not_found_error_1 = require("../../errors/response-errors/not-found.error");
+const role_mapping_rule_validation_1 = require("./role-mapping-rule.validation");
+let RoleMappingRuleService = class RoleMappingRuleService {
+    constructor(roleMappingRuleRepository, roleRepository, projectRepository) {
+        this.roleMappingRuleRepository = roleMappingRuleRepository;
+        this.roleRepository = roleRepository;
+        this.projectRepository = projectRepository;
+    }
+    async list(query) {
+        const sortBy = query.sortBy ?? 'order:asc';
+        const [sortField, sortDir] = sortBy.split(':');
+        const direction = sortDir === 'desc' ? 'DESC' : 'ASC';
+        const order = sortField === 'createdAt'
+            ? { createdAt: direction, id: 'ASC' }
+            : sortField === 'updatedAt'
+                ? { updatedAt: direction, id: 'ASC' }
+                : { order: direction, id: 'ASC' };
+        const where = query.type ? { type: query.type } : {};
+        const [entities, count] = await this.roleMappingRuleRepository.findAndCount({
+            where,
+            relations: ['projects', 'role'],
+            order,
+            skip: query.skip,
+            take: query.take,
+        });
+        return {
+            count,
+            items: entities.map((entity) => this.toResponse(entity)),
+        };
+    }
+    async create(dto) {
+        const uniqueProjectIds = (0, role_mapping_rule_validation_1.assertAndNormalizeProjectIdsForRuleType)(dto.type, dto.projectIds, []);
+        const role = await this.roleRepository.findOne({ where: { slug: dto.role } });
+        if (!role) {
+            throw new not_found_error_1.NotFoundError(`Could not find role with slug "${dto.role}"`);
+        }
+        (0, role_mapping_rule_validation_1.assertRoleCompatibleWithMappingType)(role, dto.type);
+        await this.assertOrderAvailable(dto.type, dto.order);
+        const projects = uniqueProjectIds.length > 0
+            ? await this.projectRepository.findBy({ id: (0, typeorm_1.In)(uniqueProjectIds) })
+            : [];
+        if (projects.length !== uniqueProjectIds.length) {
+            throw new bad_request_error_1.BadRequestError('One or more projects were not found');
+        }
+        const rule = new db_1.RoleMappingRule();
+        rule.expression = dto.expression;
+        rule.role = role;
+        rule.type = dto.type;
+        rule.order = dto.order;
+        rule.projects = projects;
+        const saved = await this.roleMappingRuleRepository.save(rule);
+        await this.normalizeOrderForType(dto.type);
+        const loaded = await this.roleMappingRuleRepository.findOneOrFail({
+            where: { id: saved.id },
+            relations: ['projects', 'role'],
+        });
+        return this.toResponse(loaded);
+    }
+    async patch(id, dto) {
+        if (typeof id !== 'string' || id.length === 0) {
+            throw new bad_request_error_1.BadRequestError('Rule id is required');
+        }
+        if (dto === undefined || dto === null || Object.keys(dto).length === 0) {
+            throw new bad_request_error_1.BadRequestError('At least one field is required');
+        }
+        const rule = await this.roleMappingRuleRepository.findOne({
+            where: { id },
+            relations: ['projects', 'role'],
+        });
+        if (!rule) {
+            throw new not_found_error_1.NotFoundError('Could not find role mapping rule');
+        }
+        const originalType = rule.type;
+        const mergedType = dto.type ?? originalType;
+        const mergedOrder = dto.order ?? rule.order;
+        const mergedExpression = dto.expression ?? rule.expression;
+        const mergedRoleSlug = dto.role ?? rule.role.slug;
+        const fallbackProjectIds = rule.projects.map((p) => p.id);
+        const uniqueProjectIds = (0, role_mapping_rule_validation_1.assertAndNormalizeProjectIdsForRuleType)(mergedType, dto.projectIds, fallbackProjectIds);
+        const role = mergedRoleSlug === rule.role.slug
+            ? rule.role
+            : await this.roleRepository.findOne({ where: { slug: mergedRoleSlug } });
+        if (!role) {
+            throw new not_found_error_1.NotFoundError(`Could not find role with slug "${mergedRoleSlug}"`);
+        }
+        (0, role_mapping_rule_validation_1.assertRoleCompatibleWithMappingType)(role, mergedType);
+        await this.assertOrderAvailable(mergedType, mergedOrder, id);
+        const projects = uniqueProjectIds.length > 0
+            ? await this.projectRepository.findBy({ id: (0, typeorm_1.In)(uniqueProjectIds) })
+            : [];
+        if (projects.length !== uniqueProjectIds.length) {
+            throw new bad_request_error_1.BadRequestError('One or more projects were not found');
+        }
+        rule.expression = mergedExpression;
+        rule.role = role;
+        rule.type = mergedType;
+        rule.order = mergedOrder;
+        rule.projects = projects;
+        await this.roleMappingRuleRepository.save(rule);
+        await this.normalizeOrderForType(mergedType);
+        if (originalType !== mergedType) {
+            await this.normalizeOrderForType(originalType);
+        }
+        const loaded = await this.roleMappingRuleRepository.findOneOrFail({
+            where: { id: rule.id },
+            relations: ['projects', 'role'],
+        });
+        return this.toResponse(loaded);
+    }
+    async delete(id) {
+        if (typeof id !== 'string' || id.length === 0) {
+            throw new bad_request_error_1.BadRequestError('Rule id is required');
+        }
+        const rule = await this.roleMappingRuleRepository.findOne({ where: { id } });
+        if (!rule) {
+            throw new not_found_error_1.NotFoundError('Could not find role mapping rule');
+        }
+        const ruleType = rule.type;
+        await this.roleMappingRuleRepository.remove(rule);
+        await this.normalizeOrderForType(ruleType);
+    }
+    async move(id, targetIndex) {
+        if (typeof id !== 'string' || id.length === 0) {
+            throw new bad_request_error_1.BadRequestError('Rule id is required');
+        }
+        const rule = await this.roleMappingRuleRepository.findOne({
+            where: { id },
+            relations: ['projects', 'role'],
+        });
+        if (!rule) {
+            throw new not_found_error_1.NotFoundError('Could not find role mapping rule');
+        }
+        const type = rule.type;
+        const all = await this.roleMappingRuleRepository.find({
+            where: { type },
+            select: ['id', 'order'],
+            order: { order: 'ASC' },
+        });
+        const clampedIndex = Math.min(targetIndex, all.length - 1);
+        const currentIndex = all.findIndex((r) => r.id === id);
+        const reordered = [...all];
+        reordered.splice(currentIndex, 1);
+        reordered.splice(clampedIndex, 0, all[currentIndex]);
+        await this.applyOrder(reordered.map((r) => r.id));
+        const loaded = await this.roleMappingRuleRepository.findOneOrFail({
+            where: { id },
+            relations: ['projects', 'role'],
+        });
+        return this.toResponse(loaded);
+    }
+    async applyOrder(orderedIds) {
+        if (orderedIds.length === 0)
+            return;
+        await this.roleMappingRuleRepository.manager.transaction(async (tx) => {
+            const offset = orderedIds.length + 1000;
+            for (let i = 0; i < orderedIds.length; i++) {
+                await tx.update(db_1.RoleMappingRule, { id: orderedIds[i] }, { order: offset + i });
+            }
+            for (let i = 0; i < orderedIds.length; i++) {
+                await tx.update(db_1.RoleMappingRule, { id: orderedIds[i] }, { order: i });
+            }
+        });
+    }
+    async normalizeOrderForType(type) {
+        const rules = await this.roleMappingRuleRepository.find({
+            where: { type },
+            select: ['id', 'order'],
+            order: { order: 'ASC' },
+        });
+        if (rules.length === 0)
+            return;
+        if (rules.every((r, i) => r.order === i))
+            return;
+        await this.applyOrder(rules.map((r) => r.id));
+    }
+    async assertOrderAvailable(type, order, excludeRuleId) {
+        const existingAtOrder = await this.roleMappingRuleRepository.findOne({
+            where: { type, order },
+        });
+        if (existingAtOrder && existingAtOrder.id !== excludeRuleId) {
+            throw new conflict_error_1.ConflictError(`A role mapping rule already exists with type "${type}" and order ${order}. Use a different order value.`);
+        }
+    }
+    toResponse(loaded) {
+        return {
+            id: loaded.id,
+            expression: loaded.expression,
+            role: loaded.role.slug,
+            type: loaded.type,
+            order: loaded.order,
+            projectIds: loaded.projects.map((p) => p.id),
+            createdAt: loaded.createdAt.toISOString(),
+            updatedAt: loaded.updatedAt.toISOString(),
+        };
+    }
+};
+exports.RoleMappingRuleService = RoleMappingRuleService;
+exports.RoleMappingRuleService = RoleMappingRuleService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [db_1.RoleMappingRuleRepository,
+        db_1.RoleRepository,
+        db_1.ProjectRepository])
+], RoleMappingRuleService);
+//# sourceMappingURL=role-mapping-rule.service.ee.js.map

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

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

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

@@ -0,0 +1,3 @@
+import type { Role } from '@n8n/db';
+export declare function assertRoleCompatibleWithMappingType(role: Role, type: 'instance' | 'project'): void;
+export declare function assertAndNormalizeProjectIdsForRuleType(type: 'instance' | 'project', explicitProjectIds: string[] | undefined, fallbackWhenOmitted: string[]): string[];

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertRoleCompatibleWithMappingType = assertRoleCompatibleWithMappingType;
+exports.assertAndNormalizeProjectIdsForRuleType = assertAndNormalizeProjectIdsForRuleType;
+const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
+function assertRoleCompatibleWithMappingType(role, type) {
+    if (type === 'instance' && role.roleType !== 'global') {
+        throw new bad_request_error_1.BadRequestError('Instance mapping rules must use a global role');
+    }
+    if (type === 'project' && role.roleType !== 'project') {
+        throw new bad_request_error_1.BadRequestError('Project mapping rules must use a project role');
+    }
+}
+function assertAndNormalizeProjectIdsForRuleType(type, explicitProjectIds, fallbackWhenOmitted) {
+    if (type === 'instance') {
+        if (explicitProjectIds !== undefined && explicitProjectIds.length > 0) {
+            throw new bad_request_error_1.BadRequestError('projectIds must be omitted or empty when type is instance');
+        }
+        return [];
+    }
+    const ids = explicitProjectIds !== undefined
+        ? [...new Set(explicitProjectIds)]
+        : [...new Set(fallbackWhenOmitted)];
+    if (ids.length === 0) {
+        throw new bad_request_error_1.BadRequestError('projectIds is required when type is project');
+    }
+    return ids;
+}
+//# sourceMappingURL=role-mapping-rule.validation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"role-mapping-rule.validation.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/role-mapping-rule.validation.ts"],"names":[],"mappings":";;AAIA,kFAWC;AAMD,0FAsBC;AAzCD,kFAA6E;AAE7E,SAAgB,mCAAmC,CAClD,IAAU,EACV,IAA4B;IAE5B,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACvD,MAAM,IAAI,mCAAe,CAAC,+CAA+C,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACvD,MAAM,IAAI,mCAAe,CAAC,+CAA+C,CAAC,CAAC;IAC5E,CAAC;AACF,CAAC;AAMD,SAAgB,uCAAuC,CACtD,IAA4B,EAC5B,kBAAwC,EACxC,mBAA6B;IAE7B,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,IAAI,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,mCAAe,CAAC,2DAA2D,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,GAAG,GACR,kBAAkB,KAAK,SAAS;QAC/B,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAEtC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,mCAAe,CAAC,6CAA6C,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,GAAG,CAAC;AACZ,CAAC"}

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

@@ -992,6 +992,12 @@ let SourceControlImportService = class SourceControlImportService {
                             dataTable: { id: dataTable.id },
                         });
                         columnEntities.push(columnEntity);
+                        if (!isNewTable && existingColumnIds.has(column.id)) {
+                            const oldName = existingColumnNameMap.get(column.id);
+                            if (oldName && oldName !== column.name) {
+                                await this.dataTableDDLService.renameColumn(dataTable.id, oldName, column.name, dbType, trx);
+                            }
+                        }
                         if (!isNewTable && !existingColumnIds.has(column.id)) {
                             await this.dataTableDDLService.addColumn(dataTable.id, columnEntity, dbType, trx);
                         }