npm - n8n - Versions diffs - 2.29.7 → 2.30.0 - Mend

n8n 2.29.7 → 2.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (685) hide show

package/dist/controllers/oauth/oauth2-credential.controller.js CHANGED Viewed

@@ -19,18 +19,21 @@ const decorators_1 = require("@n8n/decorators");
 const omit_1 = __importDefault(require("lodash/omit"));
 const set_1 = __importDefault(require("lodash/set"));
 const split_1 = __importDefault(require("lodash/split"));
+const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const n8n_workflow_1 = require("n8n-workflow");
+const credentials_overwrites_1 = require("../../credentials-overwrites");
 const event_service_1 = require("../../events/event.service");
 const external_hooks_1 = require("../../external-hooks");
 const oauth_jwe_service_proxy_1 = require("../../oauth/oauth-jwe-service.proxy");
 const oauth_service_1 = require("../../oauth/oauth.service");
 let OAuth2CredentialController = class OAuth2CredentialController {
-    constructor(oauthService, logger, externalHooks, oauthJweServiceProxy, eventService) {
+    constructor(oauthService, logger, externalHooks, oauthJweServiceProxy, eventService, credentialsOverwrites) {
         this.oauthService = oauthService;
         this.logger = logger;
         this.externalHooks = externalHooks;
         this.oauthJweServiceProxy = oauthJweServiceProxy;
         this.eventService = eventService;
+        this.credentialsOverwrites = credentialsOverwrites;
     }
     async getAuthUri(req, res) {
         const credential = await this.oauthService.getCredentialForAuthFlow(req);
@@ -106,20 +109,23 @@ let OAuth2CredentialController = class OAuth2CredentialController {
                         user: { id: state.userId },
                         credentialType: credential.type,
                         credentialId: credential.id,
+                        supportsManagedAuth: this.credentialsOverwrites.supportsManagedAuth(credential.type),
+                        usesManagedAuth: this.credentialsOverwrites.usesManagedAuth(credential.type, decryptedDataOriginal),
                     });
                 }
                 return res.render('oauth-callback');
             }
         }
         catch (e) {
-            const error = (0, n8n_workflow_1.ensureError)(e);
-            return this.oauthService.renderCallbackError(res, error.message, 'body' in error ? (0, n8n_workflow_1.jsonStringify)(error.body) : undefined);
+            const error = (0, ensure_error_1.ensureError)(e);
+            this.logger.error('OAuth2 callback failed', { error, cause: error.cause });
+            return this.oauthService.renderCallbackError(res, error.message, this.oauthService.extractCallbackErrorReason(error));
         }
     }
     convertCredentialToOptions(credential) {
         const options = {
             clientId: credential.clientId,
-            clientSecret: credential.clientSecret ?? '',
+            ...(0, client_oauth2_1.resolveClientAuthOptions)(credential),
             accessTokenUri: credential.accessTokenUrl ?? '',
             authorizationUri: credential.authUrl ?? '',
             authentication: credential.authentication ?? 'header',
@@ -158,6 +164,7 @@ exports.OAuth2CredentialController = OAuth2CredentialController = __decorate([
         backend_common_1.Logger,
         external_hooks_1.ExternalHooks,
         oauth_jwe_service_proxy_1.OAuthJweServiceProxy,
-        event_service_1.EventService])
+        event_service_1.EventService,
+        credentials_overwrites_1.CredentialsOverwrites])
 ], OAuth2CredentialController);
 //# sourceMappingURL=oauth2-credential.controller.js.map

package/dist/controllers/oauth/oauth2-credential.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,~~sDAAkD~~;~~AAClD~~,gDAAsD;AAEtD,uDAA+B;AAC/B,qDAA6B;AAC7B,yDAAiC;AAEjC,+~~CAAqE~~;~~AAErE~~,0DAAsD;AACtD,qDAAiD;AACjD,6EAAuE;AACvE,yDAAmE;AAI5D,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YACkB,YAA0B,EAC1B,MAAc,EACd,aAA4B,EAC5B,oBAA0C,EAC1C,YAA0B;~~QAJ1B~~,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,iBAAY,GAAZ,YAAY,CAAc;~~IACzC~~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~~qBAC3B~~,CAAC,CAAC;gBACJ,CAAC;gBAED,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;YAC7B,~~OAAO,~~IAAI,CAAC,~~YAAY~~,CAAC,~~mBAAmB~~,~~CAC3C~~,~~GAAG~~,~~EACH~~,KAAK,~~CAAC~~,~~OAAO~~,~~EACb~~,~~MAAM~~,~~IAAI~~,KAAK,CAAC,CAAC,CAAC,~~IAAA~~,~~4BAAa~~,~~EAAC~~,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,~~SAAS~~,~~CACvD,~~CAAC;QACH,CAAC;IACF,CAAC;IAEO,0BAA0B,CAAC,UAAgC;QAClE,MAAM,OAAO,GAAwB;YACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,~~YAAY~~,~~EAAE~~,UAAU,CAAC~~,YAAY,IAAI,EAAE~~;~~YAC3C~~,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,EAAE;YAC/C,gBAAgB,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;YAC1C,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,QAAQ;YACrD,WAAW,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,GAAiB,WAAW;YACxE,MAAM,EAAE,IAAA,eAAK,EAAC,UAAU,CAAC,KAAK,IAAI,QAAQ,EAAE,GAAG,CAAC;YAChD,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;YAC5D,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,eAAe,EAAE,UAAU,CAAC,eAAe,IAAI,KAAK;SACpD,CAAC;QAEF,IACC,UAAU,CAAC,wBAAwB;YACnC,OAAO,UAAU,CAAC,wBAAwB,KAAK,QAAQ,EACtD,CAAC;YACF,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAyB,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAE1F,IAAI,UAAU,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAA;~~AA9KY~~,gEAA0B;~~AAWhC~~;IADL,IAAA,gBAAG,EAAC,OAAO,CAAC;;;;4DAKZ;AAIK;IADL,IAAA,gBAAG,EAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC;;;;~~gEA+HrE~~;~~qCAjJW~~,0BAA0B;IADtC,IAAA,2BAAc,EAAC,oBAAoB,CAAC;qCAGJ,4BAAY;QAClB,uBAAM;QACC,8BAAa;QACN,8CAAoB;QAC5B,4BAAY;~~GANhC~~,0BAA0B,~~CA8KtC~~"}
1	+ {"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/posthog.controller.d.ts CHANGED Viewed

@@ -1,4 +1,10 @@
+import { AuthenticatedRequest } from '@n8n/db';
 import { StaticRouterMetadata } from '@n8n/decorators';
+import type { ClientRequest } from 'node:http';
+export declare function maskIp(ip: string): string;
+export declare function setPostHogProxyHeaders(proxyReq: ClientRequest, req: AuthenticatedRequest & {
+    rawBody?: Buffer;
+}): void;
 export declare class PostHogController {
     static routers: StaticRouterMetadata[];
 }

package/dist/controllers/posthog.controller.js CHANGED Viewed

@@ -7,11 +7,46 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostHogController = void 0;
+exports.maskIp = maskIp;
+exports.setPostHogProxyHeaders = setPostHogProxyHeaders;
 const config_1 = require("@n8n/config");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const express_1 = require("express");
 const http_proxy_middleware_1 = require("http-proxy-middleware");
+function expandIpv6Groups(ip) {
+    const [head, tail] = ip.split('%')[0].split('::');
+    const headGroups = head ? head.split(':') : [];
+    if (tail === undefined) {
+        return headGroups;
+    }
+    const tailGroups = tail ? tail.split(':') : [];
+    const fillCount = Math.max(0, 8 - headGroups.length - tailGroups.length);
+    const fill = Array.from({ length: fillCount }, () => '0');
+    return [...headGroups, ...fill, ...tailGroups];
+}
+function maskIp(ip) {
+    const v4Mapped = /^::ffff:(\d{1,3}(?:\.\d{1,3}){3})$/i.exec(ip);
+    const ipv4 = v4Mapped ? v4Mapped[1] : ip;
+    if (/^\d{1,3}(?:\.\d{1,3}){3}$/.test(ipv4)) {
+        return ipv4.replace(/\.\d{1,3}$/, '.0');
+    }
+    if (ip.includes(':')) {
+        const groups = expandIpv6Groups(ip);
+        return `${groups[0] ?? '0'}:${groups[1] ?? '0'}:${groups[2] ?? '0'}::`;
+    }
+    return ip;
+}
+function setPostHogProxyHeaders(proxyReq, req) {
+    proxyReq.removeHeader('cookie');
+    if (req.ip) {
+        proxyReq.setHeader('X-PH-Client-IP', maskIp(req.ip));
+    }
+    if (req.method === 'POST' && req.rawBody) {
+        proxyReq.setHeader('Content-Length', req.rawBody.length.toString());
+        proxyReq.write(req.rawBody);
+    }
+}
 let PostHogController = class PostHogController {
 };
 exports.PostHogController = PostHogController;
@@ -26,14 +61,7 @@ PostHogController.routers = [
                 target: targetUrl,
                 changeOrigin: true,
                 on: {
-                    proxyReq: (proxyReq, req) => {
-                        proxyReq.removeHeader('cookie');
-                        const expressReq = req;
-                        if (req.method === 'POST' && expressReq.rawBody) {
-                            proxyReq.setHeader('Content-Length', expressReq.rawBody.length.toString());
-                            proxyReq.write(expressReq.rawBody);
-                        }
-                    },
+                    proxyReq: (proxyReq, req) => setPostHogProxyHeaders(proxyReq, req),
                 },
             });
             router.use(proxy);

package/dist/controllers/posthog.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"posthog.controller.js","sourceRoot":"","sources":["../../src/controllers/posthog.controller.ts"],"names":[],"mappings":";;;;;;;;;~~AAAA~~,wCAA2C;AAE3C,gDAAuE;AACvE,gCAAoC;AACpC,qCAAiC;AACjC,iEAA8D;~~AAGvD~~,~~IAAM~~,~~iBAAiB~~,~~GAAvB~~,MAAM,~~iBAAiB;;AAAjB~~,~~8CAAiB;AACtB~~,~~yBAAO~~,~~GAA2B;IACxC;QACC,~~IAAI,EAAE,GAAG;~~QACT~~,MAAM,~~EAAE~~,CAAC,GAAG,EAAE;~~YACb~~,~~MAAM~~,MAAM,GAAG,~~IAAA~~,~~gBAAM~~,~~GAAE~~,CAAC;~~YACxB~~,MAAM,~~YAAY~~,GAAG,~~cAAS~~,CAAC,GAAG,CAAC,~~qBAAY~~,CAAC,CAAC;~~YACjD~~,MAAM,~~SAAS~~,GAAG,~~YAAY~~,CAAC,~~WAAW~~,CAAC,~~aAAa~~,CAAC,OAAO,CAAC;~~YAEjE~~,MAAM,~~KAAK~~,GAAG,~~IAAA~~,~~6CAAqB~~,~~EAAC~~;~~gBACnC~~,MAAM,EAAE,~~SAAS~~;~~gBACjB~~,YAAY,EAAE,IAAI;~~gBAClB~~,~~EAAE~~,EAAE~~;oBACH~~,QAAQ,EAAE,CAAC,~~QAAQ~~,EAAE,GAAG,EAAE,~~EAAE~~;~~wBAC3B~~,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;~~wBAGhC~~,MAAM,~~UAAU~~,GAAG,~~GAAkD~~,CAAC;~~wBACtE~~,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,~~UAAU~~,CAAC,OAAO,EAAE,CAAC;~~4BACjD~~,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,~~UAAU~~,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;~~4BAC3E~~,QAAQ,CAAC,KAAK,CAAC,~~UAAU~~,CAAC,OAAO,CAAC,CAAC;~~wBACpC~~,CAAC;~~oBACF~~,CAAC;~~iBACD~~;aACD,CAAC,CAAC;YAGH,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAElB,OAAO,MAAM,CAAC;QACf,CAAC,CAAC,EAAE;QACJ,QAAQ,EAAE,IAAI;KACd;CACD,~~AAhCa~~,~~CAgCZ~~;~~4BAjCU~~,iBAAiB;IAD7B,IAAA,2BAAc,EAAC,KAAK,CAAC;GACT,iBAAiB,~~CAkC7B~~"}
1	+ {"version":3,"file":"posthog.controller.js","sourceRoot":"","sources":["../../src/controllers/posthog.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/project.controller.d.ts CHANGED Viewed

@@ -48,6 +48,7 @@ export declare class ProjectController {
     getMyProjects(req: AuthenticatedRequest, _res: Response): Promise<ProjectRequest.GetMyProjectsResponse>;
     getPersonalProject(req: AuthenticatedRequest): Promise<{
         scopes: Scope[];
+        rolesManaged: boolean;
         name: string;
         type: "personal" | "team";
         icon: {
@@ -75,6 +76,7 @@ export declare class ProjectController {
     }>;
     getProject(req: AuthenticatedRequest, _res: Response, projectId: string): Promise<ProjectRequest.ProjectWithRelations>;
     updateProject(req: AuthenticatedRequest, _res: Response, payload: UpdateProjectDto, projectId: string): Promise<void>;
+    private assertProjectRolesNotManaged;
     addProjectUsers(req: AuthenticatedRequest, res: Response, projectId: string, payload: AddUsersToProjectDto): Promise<Response<any, Record<string, any>>>;
     changeProjectUserRole(req: AuthenticatedRequest, res: Response, projectId: string, userId: string, body: ChangeUserRoleInProject): Promise<Response<any, Record<string, any>>>;
     deleteProjectUser(req: AuthenticatedRequest, res: Response, projectId: string, userId: string): Promise<Response<any, Record<string, any>>>;

package/dist/controllers/project.controller.js CHANGED Viewed

@@ -127,12 +127,14 @@ let ProjectController = class ProjectController {
         return {
             ...project,
             scopes,
+            rolesManaged: false,
         };
     }
     async getProject(req, _res, projectId) {
-        const [{ id, name, icon, type, description, customTelemetryTags }, relations] = await Promise.all([
+        const [{ id, name, icon, type, description, customTelemetryTags }, relations, rolesManaged] = await Promise.all([
             this.projectsService.getProject(projectId),
             this.projectsService.getProjectRelations(projectId),
+            this.provisioningService.isProjectRoleManaged(),
         ]);
         const myRelation = relations.find((r) => r.userId === req.user.id);
         return {
@@ -155,6 +157,7 @@ let ProjectController = class ProjectController {
                     ...(myRelation ? { project: myRelation.role.scopes.map((scope) => scope.slug) } : {}),
                 }),
             ],
+            rolesManaged,
         };
     }
     async updateProject(req, _res, payload, projectId) {
@@ -168,7 +171,13 @@ let ProjectController = class ProjectController {
                 : {}),
         });
     }
+    async assertProjectRolesNotManaged() {
+        if (await this.provisioningService.isProjectRoleManaged()) {
+            throw new forbidden_error_1.ForbiddenError('Project roles are managed automatically and cannot be changed manually');
+        }
+    }
     async addProjectUsers(req, res, projectId, payload) {
+        await this.assertProjectRolesNotManaged();
         try {
             const { added, conflicts, project } = await this.projectsService.addUsersWithConflictSemantics(projectId, payload.relations);
             if (added.length > 0) {
@@ -200,9 +209,7 @@ let ProjectController = class ProjectController {
         }
     }
     async changeProjectUserRole(req, res, projectId, userId, body) {
-        if (await this.provisioningService.isProjectRoleManaged()) {
-            throw new forbidden_error_1.ForbiddenError('Project roles are managed automatically and cannot be changed manually');
-        }
+        await this.assertProjectRolesNotManaged();
         try {
             await this.projectsService.changeUserRoleInProject(projectId, userId, body.role);
             const relations = await this.projectsService.getProjectRelations(projectId);
@@ -222,6 +229,7 @@ let ProjectController = class ProjectController {
         }
     }
     async deleteProjectUser(req, res, projectId, userId) {
+        await this.assertProjectRolesNotManaged();
         await this.projectsService.deleteUserFromProject(projectId, userId);
         const relations = await this.projectsService.getProjectRelations(projectId);
         this.eventService.emit('team-project-updated', {

package/dist/controllers/project.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAOwB;AACxB,gCAAkE;AAClE,gDAYyB;AACzB,kDAAyF;AAGzF,0CAAuC;AAGvC,kFAA6E;AAC7E,8EAA0E;AAC1E,8EAAyE;AACzE,0DAAsD;AACtD,+FAAwF;AAExF,sEAIuC;AACvC,mDAA+D;AAGxD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,eAA+B,EAC/B,iBAAoC,EACpC,YAA0B,EAC1B,oBAA0C,EAC1C,mBAAwC;QAJxC,oBAAe,GAAf,eAAe,CAAgB;QAC/B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;IACvD,CAAC;IAGE,AAAN,KAAK,CAAC,cAAc,CACnB,GAAyB,EACzB,GAAa,EACN,OAA6B;QAEpC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAC7E,GAAG,CAAC,IAAI,EACR,OAAO,CACP,CAAC;QAKF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1E,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB;QACrB,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;IACtD,CAAC;IASK,AAAN,KAAK,CAAC,oBAAoB,CACzB,GAAyB,EACzB,GAAa,EACN,OAA6B;QAEpC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAC5E,GAAG,CAAC,IAAI,EACR,OAAO,CACP,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1E,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IAMK,AAAN,KAAK,CAAC,aAAa,CAAC,GAAyB,EAAE,IAAc,EAAQ,OAAyB;QAC7F,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEhF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,SAAS,EAAE,OAAO,CAAC,SAAS;aAC5B,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mCAAmC,CAC9E,GAAG,CAAC,IAAI,CAAC,EAAE,EACX,OAAO,CAAC,EAAE,CACV,CAAC;YAEF,OAAO;gBACN,GAAG,OAAO;gBACV,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE;oBACP,GAAG,IAAA,2BAAa,EAAC;wBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;wBACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;qBAC/D,CAAC;iBACF;aACD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,8CAAyB,EAAE,CAAC;gBAC5C,MAAM,IAAI,mCAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,GAAyB,EACzB,IAAc;QAEd,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClF,MAAM,gBAAgB,GAAG,IAAA,4BAAc,EAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC;YAChE,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;gBACpC,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,IAAA,aAAG,EAAC,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aAChD,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;QAEN,MAAM,OAAO,GAAyC,EAAE,CAAC;QAEzD,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAiD,MAAM,CAAC,MAAM,CACzE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,EACzC,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAClC,CAAC;YAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CACjB,GAAG,IAAA,2BAAa,EAAC;oBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;oBACxC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBAClD,CAAC,CACF,CAAC;YACH,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;YACxC,MAAM,MAAM,GAAiD,MAAM,CAAC,MAAM,CACzE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,EACtC;gBAIC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,MAAM,EAAE,EAAE;aACV,CACD,CAAC;YAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,2BAAa,EAAC,EAAE,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACpF,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAGD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACpD,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAC,GAAyB;QACjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,IAAI,+BAAa,CAAC,iDAAiD,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mCAAmC,CAC9E,GAAG,CAAC,IAAI,CAAC,EAAE,EACX,OAAO,CAAC,EAAE,CACV,CAAC;QACF,MAAM,MAAM,GAAY;YACvB,GAAG,IAAA,2BAAa,EAAC;gBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;gBACxC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;aAC/D,CAAC;SACF,CAAC;QACF,OAAO;YACN,GAAG,OAAO;YACV,MAAM;SACN,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACM,SAAiB;QAErC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,mBAAmB,EAAE,EAAE,SAAS,CAAC,GAC5E,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC;YAC1C,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC;SACnD,CAAC,CAAC;QACJ,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnE,OAAO;YACN,EAAE;YACF,IAAI;YACJ,IAAI;YACJ,IAAI;YACJ,WAAW;YACX,mBAAmB;YACnB,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;gBACb,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;gBACnB,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS;gBAC3B,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ;gBACzB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI;aACjB,CAAC,CAAC;YACH,MAAM,EAAE;gBACP,GAAG,IAAA,2BAAa,EAAC;oBAChB,MAAM,EAAE,IAAA,oCAAsB,EAAC,GAAG,CAAC,IAAI,CAAC;oBACxC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrF,CAAC;aACF;SACD,CAAC;IACH,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAClB,GAAyB,EACzB,IAAc,EACR,OAAyB,EACX,SAAiB;QAErC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACxB,SAAS;YACT,GAAG,CAAC,OAAO,CAAC,mBAAmB,KAAK,SAAS;gBAC5C,CAAC,CAAC,EAAE,0BAA0B,EAAE,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE;gBACpE,CAAC,CAAC,EAAE,CAAC;SACN,CAAC,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,eAAe,CACpB,GAAyB,EACzB,GAAa,EACO,SAAiB,EAC/B,OAA6B;QAEnC,IAAI,CAAC;YACJ,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAClC,MAAM,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YAExF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;oBACnD,MAAM,EAAE,GAAG,CAAC,IAAI;oBAChB,UAAU,EAAE,KAAK;oBACjB,OAAO,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;iBAC/C,CAAC,CAAC;YACJ,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxE,SAAS;aACT,CAAC,CAAC;YAKH,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5F,CAAC;YACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACrE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,+CAA0B,EAAE,CAAC;gBAC7C,MAAM,IAAI,mCAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAC1B,GAAyB,EACzB,GAAa,EACO,SAAiB,EACpB,MAAc,EACzB,IAA6B;QAEnC,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,EAAE,CAAC;YAC3D,MAAM,IAAI,gCAAc,CACvB,wEAAwE,CACxE,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACxB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxE,SAAS;aACT,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,+CAA0B,EAAE,CAAC;gBAC7C,MAAM,IAAI,mCAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;IACF,CAAC;IAIK,AAAN,KAAK,CAAC,iBAAiB,CACtB,GAAyB,EACzB,GAAa,EACO,SAAiB,EACpB,MAAc;QAE/B,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACpE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACxB,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE,SAAS;SACT,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAClB,GAAyB,EACzB,IAAc,EACP,KAAuB,EACV,SAAiB;QAErC,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE;YAC7D,gBAAgB,EAAE,KAAK,CAAC,UAAU;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC9C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACxB,SAAS;YACT,WAAW,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ;YACnE,eAAe,EAAE,KAAK,CAAC,UAAU;SACjC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AA7VY,8CAAiB;AAUvB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;IAIP,WAAA,kBAAK,CAAA;;qDAAU,gCAAoB;;uDAepC;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,CAAC;;;;yDAGb;AASK;IAFL,IAAA,gBAAG,EAAC,qBAAqB,CAAC;IAC1B,IAAA,wBAAW,EAAC,WAAW,CAAC;IAIvB,WAAA,kBAAK,CAAA;;qDAAU,gCAAoB;;6DAQpC;AAMK;IAJL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,wBAAW,EAAC,gBAAgB,CAAC;IAE7B,IAAA,qBAAQ,EAAC,wBAAwB,CAAC;IAC6B,WAAA,iBAAI,CAAA;;qDAAU,4BAAgB;;sDA+B7F;AAGK;IADL,IAAA,gBAAG,EAAC,cAAc,CAAC;;;;sDA4DnB;AAGK;IADL,IAAA,gBAAG,EAAC,WAAW,CAAC;;;;2DAqBhB;AAIK;IAFL,IAAA,gBAAG,EAAC,aAAa,CAAC;IAClB,IAAA,yBAAY,EAAC,cAAc,CAAC;IAI3B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;;;mDA8BnB;AAIK;IAFL,IAAA,kBAAK,EAAC,aAAa,CAAC;IACpB,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,iBAAI,CAAA;IACJ,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;qDADJ,4BAAgB;;sDAY/B;AAIK;IAFL,IAAA,iBAAI,EAAC,mBAAmB,CAAC;IACzB,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,iBAAI,CAAA;;6DAAU,gCAAoB;;wDAoCnC;AAIK;IAFL,IAAA,kBAAK,EAAC,2BAA2B,CAAC;IAClC,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,kBAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,iBAAI,CAAA;;qEAAO,mCAAuB;;8DAwBnC;AAIK;IAFL,IAAA,mBAAM,EAAC,2BAA2B,CAAC;IACnC,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,kBAAK,EAAC,QAAQ,CAAC,CAAA;;;;0DAWhB;AAIK;IAFL,IAAA,mBAAM,EAAC,aAAa,CAAC;IACrB,IAAA,yBAAY,EAAC,gBAAgB,CAAC;IAI7B,WAAA,kBAAK,CAAA;IACL,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;qDADL,4BAAgB;;sDAc9B;4BA5VW,iBAAiB;IAD7B,IAAA,2BAAc,EAAC,WAAW,CAAC;qCAGQ,mCAAc;QACZ,sBAAiB;QACtB,4BAAY;QACJ,4BAAoB;QACrB,6CAAmB;GAN9C,iBAAiB,CA6V7B"}
1	+ {"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/role.controller.d.ts CHANGED Viewed

@@ -8,9 +8,10 @@ export declare class RoleController {
     private readonly roleService;
     private readonly eventService;
     constructor(roleService: RoleService, eventService: EventService);
+    private assertCanManageRoleType;
     getAllRoles(_req: AuthenticatedRequest, _res: Response, query: RoleListQueryDto): Promise<Record<string, RoleDTO[]>>;
-    getRoleProjectMembers(_req: AuthenticatedRequest, _res: Response, slug: string, projectId: string): Promise<RoleProjectMembersResponse>;
-    getRoleAssignments(_req: AuthenticatedRequest, _res: Response, slug: string): Promise<RoleAssignmentsResponse>;
+    getRoleProjectMembers(req: AuthenticatedRequest, _res: Response, slug: string, projectId: string): Promise<RoleProjectMembersResponse>;
+    getRoleAssignments(req: AuthenticatedRequest, _res: Response, slug: string): Promise<RoleAssignmentsResponse>;
     getRoleMembers(_req: AuthenticatedRequest, _res: Response, slug: string): Promise<RoleMembersResponse>;
     getRoleBySlug(_req: AuthenticatedRequest, _res: Response, slug: string, query: RoleGetQueryDto): Promise<RoleDTO>;
     updateRole(req: AuthenticatedRequest, _res: Response, slug: string, updateRole: UpdateRoleDto): Promise<RoleDTO>;

package/dist/controllers/role.controller.js CHANGED Viewed

@@ -16,13 +16,23 @@ exports.RoleController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
+const permissions_1 = require("@n8n/permissions");
 const event_service_1 = require("../events/event.service");
 const role_service_1 = require("../services/role.service");
+const constants_2 = require("../constants");
+const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
 let RoleController = class RoleController {
     constructor(roleService, eventService) {
         this.roleService = roleService;
         this.eventService = eventService;
     }
+    assertCanManageRoleType(user, roleType) {
+        if ((0, permissions_1.hasGlobalScope)(user, 'role:manage'))
+            return;
+        if (roleType === 'project' && (0, permissions_1.hasGlobalScope)(user, 'role:manageProject'))
+            return;
+        throw new forbidden_error_1.ForbiddenError(constants_2.RESPONSE_ERROR_MESSAGES.MISSING_SCOPE);
+    }
     async getAllRoles(_req, _res, query) {
         const allRoles = await this.roleService.getAllRoles(query.withUsageCount);
         return {
@@ -32,11 +42,15 @@ let RoleController = class RoleController {
             workflow: allRoles.filter((r) => r.roleType === 'workflow'),
         };
     }
-    async getRoleProjectMembers(_req, _res, slug, projectId) {
+    async getRoleProjectMembers(req, _res, slug, projectId) {
+        const role = await this.roleService.getRole(slug);
+        this.assertCanManageRoleType(req.user, role.roleType);
         const result = await this.roleService.getRoleProjectMembers(slug, projectId);
         return api_types_1.RoleProjectMembersResponseDto.parse(result);
     }
-    async getRoleAssignments(_req, _res, slug) {
+    async getRoleAssignments(req, _res, slug) {
+        const role = await this.roleService.getRole(slug);
+        this.assertCanManageRoleType(req.user, role.roleType);
         const result = await this.roleService.getRoleAssignments(slug);
         return api_types_1.RoleAssignmentsResponseDto.parse(result);
     }
@@ -48,6 +62,8 @@ let RoleController = class RoleController {
         return await this.roleService.getRole(slug, query.withUsageCount);
     }
     async updateRole(req, _res, slug, updateRole) {
+        const role = await this.roleService.getRole(slug);
+        this.assertCanManageRoleType(req.user, role.roleType);
         const result = await this.roleService.updateCustomRole(slug, updateRole);
         this.eventService.emit('custom-role-updated', {
             userId: req.user.id,
@@ -57,6 +73,8 @@ let RoleController = class RoleController {
         return result;
     }
     async deleteRole(req, _res, slug) {
+        const role = await this.roleService.getRole(slug);
+        this.assertCanManageRoleType(req.user, role.roleType);
         const result = await this.roleService.removeCustomRole(slug);
         this.eventService.emit('custom-role-deleted', {
             userId: req.user.id,
@@ -65,6 +83,7 @@ let RoleController = class RoleController {
         return result;
     }
     async createRole(req, _res, createRole) {
+        this.assertCanManageRoleType(req.user, createRole.roleType);
         const result = await this.roleService.createCustomRole(createRole);
         this.eventService.emit('custom-role-created', {
             userId: req.user.id,
@@ -85,7 +104,6 @@ __decorate([
 ], RoleController.prototype, "getAllRoles", null);
 __decorate([
     (0, decorators_1.Get)('/:slug/assignments/:projectId/members'),
-    (0, decorators_1.GlobalScope)('role:manage'),
     __param(2, (0, decorators_1.Param)('slug')),
     __param(3, (0, decorators_1.Param)('projectId')),
     __metadata("design:type", Function),
@@ -94,7 +112,6 @@ __decorate([
 ], RoleController.prototype, "getRoleProjectMembers", null);
 __decorate([
     (0, decorators_1.Get)('/:slug/assignments'),
-    (0, decorators_1.GlobalScope)('role:manage'),
     __param(2, (0, decorators_1.Param)('slug')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Response, String]),
@@ -118,7 +135,6 @@ __decorate([
 ], RoleController.prototype, "getRoleBySlug", null);
 __decorate([
     (0, decorators_1.Patch)('/:slug'),
-    (0, decorators_1.GlobalScope)('role:manage'),
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.CUSTOM_ROLES),
     __param(2, (0, decorators_1.Param)('slug')),
     __param(3, decorators_1.Body),
@@ -128,7 +144,6 @@ __decorate([
 ], RoleController.prototype, "updateRole", null);
 __decorate([
     (0, decorators_1.Delete)('/:slug'),
-    (0, decorators_1.GlobalScope)('role:manage'),
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.CUSTOM_ROLES),
     __param(2, (0, decorators_1.Param)('slug')),
     __metadata("design:type", Function),
@@ -137,7 +152,6 @@ __decorate([
 ], RoleController.prototype, "deleteRole", null);
 __decorate([
     (0, decorators_1.Post)('/'),
-    (0, decorators_1.GlobalScope)('role:manage'),
     (0, decorators_1.Licensed)(constants_1.LICENSE_FEATURES.CUSTOM_ROLES),
     __param(2, decorators_1.Body),
     __metadata("design:type", Function),

package/dist/controllers/role.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../src/controllers/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAQwB;AAMxB,8CAAkD;AAElD,gDAWyB;~~AAGzB~~,0DAAsD;AACtD,0DAAsD;~~AAG/C~~,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,WAAwB,EACxB,YAA0B;QAD1B,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;~~IAGE~~,AAAN,KAAK,CAAC,WAAW,CAChB,IAA0B,EAC1B,IAAc,EACP,KAAuB;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1E,OAAO;YACN,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;YACvD,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC;YACzD,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,YAAY,CAAC;YAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC;SAC3D,CAAC;IACH,CAAC;~~IAIK~~,AAAN,KAAK,CAAC,qBAAqB,CAC1B,~~IAA0B~~,~~EAC1B~~,IAAc,EACC,IAAY,EACP,SAAiB;QAErC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC7E,OAAO,yCAA6B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;~~IAIK~~,AAAN,KAAK,CAAC,kBAAkB,CACvB,~~IAA0B~~,~~EAC1B~~,IAAc,EACC,IAAY;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC/D,OAAO,sCAA0B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACC,IAAY;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3D,OAAO,kCAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,IAA0B,EAC1B,IAAc,EACC,IAAY,EACpB,KAAsB;QAE7B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC;~~IAKK~~,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACC,IAAY,EACrB,UAAyB;QAE/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;~~IAKK~~,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACC,IAAY;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;~~IAKK~~,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACR,UAAyB;QAE/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;~~AAnHY~~,wCAAc;~~AAOpB~~;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;IAIP,WAAA,kBAAK,CAAA;;6CADA,QAAQ;QACA,4BAAgB;;iDAS9B;~~AAIK~~;~~IAFL~~,IAAA,gBAAG,EAAC,uCAAuC,CAAC;~~IAC5C~~,~~IAAA,wBAAW,EAAC,aAAa,CAAC;IAIzB,~~WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;6CAFb,QAAQ;;~~2DAMd~~;~~AAIK~~;~~IAFL~~,IAAA,gBAAG,EAAC,oBAAoB,CAAC;~~IACzB~~,~~IAAA,wBAAW,EAAC,aAAa,CAAC;IAIzB,~~WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;~~wDAKd~~;AAIK;IAFL,IAAA,gBAAG,EAAC,gBAAgB,CAAC;IACrB,IAAA,wBAAW,EAAC,WAAW,CAAC;IAIvB,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;oDAKd;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,CAAC;IAIZ,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,kBAAK,CAAA;;6CAFA,QAAQ,UAEA,2BAAe;;mDAG7B;~~AAKK~~;~~IAHL~~,IAAA,kBAAK,EAAC,QAAQ,CAAC;IACf,IAAA,~~wBAAW,EAAC,aAAa,CAAC;IAC1B,IAAA,~~qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,iBAAI,CAAA;;6CAFC,QAAQ,UAEI,yBAAa;;~~gDAS~~/B;~~AAKK~~;~~IAHL~~,IAAA,mBAAM,EAAC,QAAQ,CAAC;IAChB,IAAA,~~wBAAW,EAAC,aAAa,CAAC;IAC1B,IAAA,~~qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;~~gDASd~~;~~AAKK~~;~~IAHL~~,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,~~wBAAW,EAAC,aAAa,CAAC;IAC1B,IAAA,~~qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,iBAAI,CAAA;;6CADC,QAAQ;QACI,yBAAa;;~~gDAS~~/B;~~yBAlHW~~,cAAc;IAD1B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGO,0BAAW;QACV,4BAAY;GAHhC,cAAc,~~CAmH1B~~"}
1	+ {"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../src/controllers/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAQwB;AAMxB,8CAAkD;AAElD,gDAWyB;AACzB,kDAAkF;AAElF,0DAAsD;AACtD,0DAAsD;AACtD,2CAAsD;AACtD,8EAA0E;AAGnE,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,WAAwB,EACxB,YAA0B;QAD1B,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEI,uBAAuB,CAAC,IAAU,EAAE,QAAuB;QAClE,IAAI,IAAA,4BAAc,EAAC,IAAI,EAAE,aAAa,CAAC;YAAE,OAAO;QAChD,IAAI,QAAQ,KAAK,SAAS,IAAI,IAAA,4BAAc,EAAC,IAAI,EAAE,oBAAoB,CAAC;YAAE,OAAO;QACjF,MAAM,IAAI,gCAAc,CAAC,mCAAuB,CAAC,aAAa,CAAC,CAAC;IACjE,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAChB,IAA0B,EAC1B,IAAc,EACP,KAAuB;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1E,OAAO;YACN,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;YACvD,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC;YACzD,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,YAAY,CAAC;YAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC;SAC3D,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,qBAAqB,CAC1B,GAAyB,EACzB,IAAc,EACC,IAAY,EACP,SAAiB;QAErC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC7E,OAAO,yCAA6B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CACvB,GAAyB,EACzB,IAAc,EACC,IAAY;QAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC/D,OAAO,sCAA0B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACC,IAAY;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3D,OAAO,kCAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,IAA0B,EAC1B,IAAc,EACC,IAAY,EACpB,KAAsB;QAE7B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACC,IAAY,EACrB,UAAyB;QAE/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACC,IAAY;QAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACR,UAAyB;QAE/B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;AA7HY,wCAAc;AAapB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;IAIP,WAAA,kBAAK,CAAA;;6CADA,QAAQ;QACA,4BAAgB;;iDAS9B;AAGK;IADL,IAAA,gBAAG,EAAC,uCAAuC,CAAC;IAI3C,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;6CAFb,QAAQ;;2DAQd;AAGK;IADL,IAAA,gBAAG,EAAC,oBAAoB,CAAC;IAIxB,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;wDAOd;AAIK;IAFL,IAAA,gBAAG,EAAC,gBAAgB,CAAC;IACrB,IAAA,wBAAW,EAAC,WAAW,CAAC;IAIvB,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;oDAKd;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,CAAC;IAIZ,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,kBAAK,CAAA;;6CAFA,QAAQ,UAEA,2BAAe;;mDAG7B;AAIK;IAFL,IAAA,kBAAK,EAAC,QAAQ,CAAC;IACf,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,iBAAI,CAAA;;6CAFC,QAAQ,UAEI,yBAAa;;gDAW/B;AAIK;IAFL,IAAA,mBAAM,EAAC,QAAQ,CAAC;IAChB,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;gDAWd;AAIK;IAFL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,iBAAI,CAAA;;6CADC,QAAQ;QACI,yBAAa;;gDAU/B;yBA5HW,cAAc;IAD1B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGO,0BAAW;QACV,4BAAY;GAHhC,cAAc,CA6H1B"}

package/dist/controllers/users.controller.d.ts CHANGED Viewed

@@ -37,6 +37,7 @@ export declare class UsersController {
             readonly NO_USER: "Target user not found";
             readonly NO_ADMIN_ON_OWNER: "Admin cannot change role on global owner";
             readonly NO_OWNER_ON_OWNER: "Owner cannot change role on global owner";
+            readonly CANNOT_CHANGE_OWN_ROLE: "Cannot change your own global role";
         };
     };
     private removeSupplementaryFields;
@@ -65,12 +66,12 @@ export declare class UsersController {
             email?: string | null | undefined;
             firstName?: string | null | undefined;
             lastName?: string | null | undefined;
-            isOwner?: boolean | undefined;
             mfaEnabled?: boolean | undefined;
+            isOwner?: boolean | undefined;
             isPending?: boolean | undefined;
             projectRelations?: {
-                id: string;
                 name: string;
+                id: string;
                 role: string;
             }[] | null | undefined;
             signInType?: string | undefined;

package/dist/controllers/users.controller.js CHANGED Viewed

@@ -259,7 +259,10 @@ let UsersController = UsersController_1 = class UsersController {
         if (await this.provisioningService.isInstanceRoleManaged()) {
             throw new forbidden_error_1.ForbiddenError('Instance roles are managed automatically and cannot be changed manually');
         }
-        const { NO_ADMIN_ON_OWNER, NO_USER, NO_OWNER_ON_OWNER } = UsersController_1.ERROR_MESSAGES.CHANGE_ROLE;
+        const { NO_ADMIN_ON_OWNER, NO_USER, NO_OWNER_ON_OWNER, CANNOT_CHANGE_OWN_ROLE } = UsersController_1.ERROR_MESSAGES.CHANGE_ROLE;
+        if (req.user.id === id) {
+            throw new forbidden_error_1.ForbiddenError(CANNOT_CHANGE_OWN_ROLE);
+        }
         const targetUser = await this.userRepository.findOne({
             where: { id },
             relations: ['role'],
@@ -291,6 +294,7 @@ UsersController.ERROR_MESSAGES = {
         NO_USER: 'Target user not found',
         NO_ADMIN_ON_OWNER: 'Admin cannot change role on global owner',
         NO_OWNER_ON_OWNER: 'Owner cannot change role on global owner',
+        CANNOT_CHANGE_OWN_ROLE: 'Cannot change your own global role',
     },
 };
 __decorate([

package/dist/controllers/users.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/controllers/users.controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"users.controller.js","sourceRoot":"","sources":["../../src/controllers/users.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAOwB;AACxB,wDAA6D;AAE7D,gCAWiB;AACjB,gDAWyB;AACzB,gCAAoC;AACpC,kDAAkD;AAGlD,sDAAkD;AAClD,2EAAuE;AACvE,kFAA6E;AAC7E,8EAA0E;AAC1E,8EAAyE;AACzE,0DAAsD;AACtD,qDAAiD;AACjD,+FAAwF;AAExF,8DAA0D;AAC1D,wDAAoD;AACpD,wDAAoD;AACpD,0DAAsD;AACtD,mEAA+D;AAGxD,IAAM,eAAe,uBAArB,MAAM,eAAe;IAC3B,YACkB,MAAc,EACd,aAA4B,EAC5B,2BAAwD,EACxD,wBAAkD,EAClD,cAA8B,EAC9B,WAAwB,EACxB,WAAwB,EACxB,iBAAoC,EACpC,eAAgC,EAChC,kBAAsC,EACtC,YAA0B,EAC1B,aAA4B,EAC5B,UAAsB,EACtB,UAAsB,EACtB,mBAAwC,EACxC,cAA8B;QAf9B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAiB;QAChC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;QACtB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAEJ,IAAY,gBAAgB;QAC3B,OAAO,kDAAO,yCAAyC,IAAE,IAAI,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CACtF,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAC/B,CAAC;IACH,CAAC;IAWO,yBAAyB,CAChC,WAAuC,EACvC,gBAAoC,EACpC,WAAiB;QAEjB,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;QAIpC,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACpD,KAAK,MAAM,IAAI,IAAI,WAAW;gBAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAChD,CAAC;QAID,IAAI,MAAM,EAAE,CAAC;YACZ,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC,OAAO,CAAC;gBACpB,OAAO,IAAI,CAAC,SAAS,CAAC;gBACtB,OAAO,IAAI,CAAC,UAAU,CAAC;YACxB,CAAC;QACF,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAA,4BAAc,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACvE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/B,OAAO,mBAAmB,IAAI,IAAI,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE;gBACvD,CAAC,CAAC,4BAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC9B,CAAC,CAAC,0BAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CACd,GAAyB,EACzB,IAAc,EACP,gBAAoC;QAE3C,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAE1F,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,eAAe,EAAE,CAAC;QAEnD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC;QAEhC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAChD,IAAI,gBAAgB,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3E,OAAO,IAAI,CAAC,IAAI,CAAC;YAClB,CAAC;YACD,OAAO;gBACN,GAAG,IAAI;gBACP,gBAAgB,EAAE,CAAC,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBAClD,EAAE,EAAE,EAAE,CAAC,SAAS;oBAChB,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI;oBAClB,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI;iBACrB,CAAC,CAAC;aACH,CAAC;QACH,CAAC,CAAC,CACF,CAAC;QAEF,OAAO,2BAAe,CAAC,KAAK,CAAC;YAC5B,KAAK;YACL,KAAK,EAAE,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC;SAC9E,CAAC,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAC,GAAkC;QAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;YAC5B,SAAS,EAAE,CAAC,MAAM,CAAC;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QAED,IACC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI,EACxC,CAAC;YACF,MAAM,IAAI,gCAAc,CAAC,6CAA6C,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO,EAAE,IAAI,EAAE,CAAC;IACjB,CAAC;IAIK,AAAN,KAAK,CAAC,kBAAkB,CAAC,GAAqD,EAAE,IAAc;QAC7F,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAEhC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QAEnF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,+BAAa,CAAC,4CAA4C,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CACjC;YACC,SAAS;YACT,SAAS;SACT,EACD;YACC,SAAS,EAAE,KAAK;SAChB,CACD,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,UAAU,GAAG,GAAG,OAAO,iBAAiB,KAAK,EAAE,CAAC;QAEtD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC7B,CAAC;IAIK,AAAN,KAAK,CAAC,kBAAkB,CACvB,IAA0B,EAC1B,IAAc,EACR,OAAiC,EAC1B,EAAU;QAEvB,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YACpD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,EAAE,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAOK,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuB;QACvC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAEtC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,oFAAoF,EACpF,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CACvB,CAAC;YACF,MAAM,IAAI,mCAAe,CAAC,6BAA6B,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAEjC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YACtD,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;YACzB,SAAS,EAAE,CAAC,MAAM,CAAC;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,+BAAa,CACtB,gFAAgF,CAChF,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI,EAAE,CAAC;YACvD,MAAM,IAAI,gCAAc,CAAC,mCAAmC,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,+BAA+B,CAC3F,YAAY,CAAC,EAAE,CACf,CAAC;QAEF,IAAI,UAAU,KAAK,uBAAuB,CAAC,EAAE,EAAE,CAAC;YAC/C,MAAM,IAAI,mCAAe,CACxB,iGAAiG,CACjG,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC;QACjB,IAAI,iBAAiB,GAAmB,IAAI,CAAC;QAE7C,IAAI,UAAU,EAAE,CAAC;YAChB,iBAAiB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAE/E,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxB,MAAM,IAAI,+BAAa,CACtB,oFAAoF,CACpF,CAAC;YACH,CAAC;YAED,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,EAAE,CAAC;YAEjD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;gBAC5D,gBAAgB,EAAE;oBACjB,SAAS,EAAE,mBAAmB;iBAC9B;aACD,CAAC,CAAC;YAEH,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC;YAE7B,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC7D,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CACrC,uBAAuB,CAAC,EAAE,EAC1B,mBAAmB,EACnB,GAAG,CACH,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CACxC,uBAAuB,CAAC,EAAE,EAC1B,mBAAmB,EACnB,GAAG,CACH,CAAC;gBAEF,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,CACnD,uBAAuB,CAAC,EAAE,EAC1B,mBAAmB,EACnB,GAAG,CACH,CAAC;YACH,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC;gBAClC,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;gBAC5B,KAAK,EAAE,EAAE,SAAS,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;aACxE,CAAC;YACF,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC;gBACrC,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;gBAChC,KAAK,EAAE,EAAE,SAAS,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;aAC1E,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;QAEtF,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,oBAAoB,EAAE,CAAC;YACnD,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACnE,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;QAID,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YACrD,IAAI,iBAAiB,EAAE,CAAC;gBACvB,MAAM,gBAAgB,CAAC,6BAA6B,CACnD,uBAAuB,CAAC,EAAE,EAC1B,iBAAiB,CAAC,EAAE,CACpB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,MAAM,gBAAgB,CAAC,0BAA0B,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;YAC/E,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC7D,MAAM,GAAG,CAAC,MAAM,CAAC,iBAAY,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,MAAM,GAAG,CAAC,MAAM,CAAC,YAAO,EAAE,EAAE,EAAE,EAAE,uBAAuB,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,MAAM,GAAG,CAAC,MAAM,CAAC,SAAI,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE;YACtC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,SAAS,EAAE,KAAK;YAChB,mBAAmB,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;YAClE,YAAY,EAAE,UAAU;YACxB,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa;YAC/D,eAAe,EAAE,YAAY;SAC7B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAKK,AAAN,KAAK,CAAC,gBAAgB,CACrB,GAAyB,EACzB,CAAW,EACL,OAA6B,EACtB,EAAU;QAEvB,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,EAAE,CAAC;YAC5D,MAAM,IAAI,gCAAc,CACvB,yEAAyE,CACzE,CAAC;QACH,CAAC;QAED,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,GAC9E,iBAAe,CAAC,cAAc,CAAC,WAAW,CAAC;QAE5C,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,gCAAc,CAAC,sBAAsB,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,MAAM,CAAC;SACnB,CAAC,CAAC;QACH,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,+BAAa,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,IACC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI;YAC7C,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI,EAC9C,CAAC;YACF,MAAM,IAAI,gCAAc,CAAC,iBAAiB,CAAC,CAAC;QAC7C,CAAC;QAED,IACC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI;YAC7C,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAiB,CAAC,IAAI,EAC9C,CAAC;YACF,MAAM,IAAI,gCAAc,CAAC,iBAAiB,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC3C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,YAAY,EAAE,UAAU,CAAC,EAAE;YAC3B,iBAAiB,EAAE,OAAO,CAAC,WAAW;YACtC,SAAS,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;;AA7WW,0CAAe;AA0BpB,8BAAc,GAAG;IACvB,WAAW,EAAE;QACZ,OAAO,EAAE,uBAAuB;QAChC,iBAAiB,EAAE,0CAA0C;QAC7D,iBAAiB,EAAE,0CAA0C;QAC7D,sBAAsB,EAAE,oCAAoC;KAC5D;CACQ,AAPW,CAOV;AAmCL;IAFL,IAAA,gBAAG,EAAC,GAAG,CAAC;IACR,IAAA,wBAAW,EAAC,WAAW,CAAC;IAIvB,WAAA,kBAAK,CAAA;;qDAAmB,8BAAkB;;gDA8B3C;AAIK;IAFL,IAAA,gBAAG,EAAC,0BAA0B,CAAC;IAC/B,IAAA,wBAAW,EAAC,oBAAoB,CAAC;;;;+DAmBjC;AAIK;IAFL,IAAA,iBAAI,EAAC,kBAAkB,CAAC;IACxB,IAAA,wBAAW,EAAC,yBAAyB,CAAC;;;;yDAyBtC;AAIK;IAFL,IAAA,kBAAK,EAAC,eAAe,CAAC;IACtB,IAAA,wBAAW,EAAC,aAAa,CAAC;IAIzB,WAAA,iBAAI,CAAA;IACJ,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;;qDADG,oCAAwB;;yDAWvC;AAOK;IAFL,IAAA,mBAAM,EAAC,MAAM,CAAC;IACd,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;iDAsI1B;AAKK;IAHL,IAAA,kBAAK,EAAC,WAAW,CAAC;IAClB,IAAA,wBAAW,EAAC,iBAAiB,CAAC;IAC9B,IAAA,qBAAQ,EAAC,0BAA0B,CAAC;IAInC,WAAA,iBAAI,CAAA;IACJ,WAAA,IAAA,kBAAK,EAAC,IAAI,CAAC,CAAA;;qDADG,gCAAoB;;uDAgDnC;0BA7WW,eAAe;IAD3B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGE,uBAAM;QACC,8BAAa;QACC,gCAA2B;QAC9B,6BAAwB;QAClC,mBAAc;QACjB,0BAAW;QACX,0BAAW;QACL,sBAAiB;QACnB,kCAAe;QACZ,wCAAkB;QACxB,4BAAY;QACX,8BAAa;QAChB,wBAAU;QACV,wBAAU;QACD,6CAAmB;QACxB,+BAAc;GAjBpC,eAAe,CA8W3B"}

package/dist/credentials/credentials.controller.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ import { CredentialConnectionStatusProxy } from './credential-connection-status-
 import { CredentialsFinderService } from './credentials-finder.service';
 import { CredentialsService } from './credentials.service';
 import { EnterpriseCredentialsService } from './credentials.service.ee';
+import { CredentialsOverwrites } from '../credentials-overwrites';
 import { EventService } from '../events/event.service';
 import { CredentialRequest } from '../requests';
 import { NamingService } from '../services/naming.service';
@@ -23,7 +24,8 @@ export declare class CredentialsController {
     private readonly eventService;
     private readonly credentialsFinderService;
     private readonly connectionStatusProxy;
-    constructor(globalConfig: GlobalConfig, credentialsService: CredentialsService, enterpriseCredentialsService: EnterpriseCredentialsService, namingService: NamingService, licenseState: LicenseState, logger: Logger, userManagementMailer: UserManagementMailer, sharedCredentialsRepository: SharedCredentialsRepository, projectRelationRepository: ProjectRelationRepository, eventService: EventService, credentialsFinderService: CredentialsFinderService, connectionStatusProxy: CredentialConnectionStatusProxy);
+    private readonly credentialsOverwrites;
+    constructor(globalConfig: GlobalConfig, credentialsService: CredentialsService, enterpriseCredentialsService: EnterpriseCredentialsService, namingService: NamingService, licenseState: LicenseState, logger: Logger, userManagementMailer: UserManagementMailer, sharedCredentialsRepository: SharedCredentialsRepository, projectRelationRepository: ProjectRelationRepository, eventService: EventService, credentialsFinderService: CredentialsFinderService, connectionStatusProxy: CredentialConnectionStatusProxy, credentialsOverwrites: CredentialsOverwrites);
     getMany(req: CredentialRequest.GetMany, _res: unknown, query: CredentialsGetManyRequestQuery): Promise<import("@n8n/db").CredentialsEntity[]>;
     getProjectCredentials(req: CredentialRequest.ForWorkflow): Promise<{
         id: string;