unleash-server 5.4.3 → 5.5.0

package/dist/lib/routes/client-api/metrics.test.js

@@ -238,4 +238,31 @@ test('should return a 200 if required fields are there', async () => {
     })
         .expect(202);
 });
+test('should return 204 if metrics are disabled by feature flag', async () => {
+    const { request: localRequest } = await getSetup({
+        experimental: {
+            flags: {
+                disableMetrics: true,
+            },
+        },
+    });
+    await localRequest
+        .post('/api/client/metrics')
+        .send({
+        appName: 'demo',
+        someParam: 'some-value',
+        somOtherParam: 'some--other-value',
+        bucket: {
+            start: Date.now(),
+            stop: Date.now(),
+            toggles: {
+                toggleLastSeen: {
+                    yes: 200,
+                    no: 0,
+                },
+            },
+        },
+    })
+        .expect(204);
+});
 //# sourceMappingURL=metrics.test.js.map

package/dist/lib/routes/client-api/metrics.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/routes/controller.d.ts

@@ -1,5 +1,5 @@
 import { IRouter, Request, Response, RequestHandler } from 'express';
-import { IUnleashConfig } from '../types/option';
+import { IUnleashConfig } from '../types';
 interface IRequestHandler<P = any, ResBody = any, ReqBody = any, ReqQuery = any> {
     (req: Request<P, ResBody, ReqBody, ReqQuery>, res: Response<ResBody>): Promise<void> | void;
 }

package/dist/lib/routes/controller.js

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
-const permissions_1 = require("../types/permissions");
+const types_1 = require("../types");
 const util_1 = require("./util");
 const content_type_checker_1 = __importDefault(require("../middleware/content_type_checker"));
 const error_1 = require("../error");
 const checkPermission = (permission = []) => async (req, res, next) => {
-    const permissions = (Array.isArray(permission) ? permission : [permission]).filter((p) => p !== permissions_1.NONE);
+    const permissions = (Array.isArray(permission) ? permission : [permission]).filter((p) => p !== types_1.NONE);
     if (!permissions.length) {
         return next();
     }
@@ -18,6 +18,13 @@ const checkPermission = (permission = []) => async (req, res, next) => {
     }
     return res.status(403).json(new error_1.PermissionError(permissions)).end();
 };
+const checkPrivateProjectPermissions = () => async (req, res, next) => {
+    if (!req.checkPrivateProjectPermissions ||
+        (await req.checkPrivateProjectPermissions())) {
+        return next();
+    }
+    return res.status(404).end();
+};
 /**
  * Base class for Controllers to standardize binding to express Router.
  *
@@ -49,9 +56,9 @@ class Controller {
             : [(0, content_type_checker_1.default)(...acceptedContentTypes), ...middleware];
     }
     route(options) {
-        this.app[options.method](options.path, checkPermission(options.permission), this.useContentTypeMiddleware(options), this.useRouteErrorHandler(options.handler.bind(this)));
+        this.app[options.method](options.path, checkPermission(options.permission), checkPrivateProjectPermissions(), this.useContentTypeMiddleware(options), this.useRouteErrorHandler(options.handler.bind(this)));
     }
-    get(path, handler, permission = permissions_1.NONE) {
+    get(path, handler, permission = types_1.NONE) {
         this.route({
             method: 'get',
             path,
@@ -59,7 +66,7 @@ class Controller {
             permission,
         });
     }
-    post(path, handler, permission = permissions_1.NONE, ...acceptedContentTypes) {
+    post(path, handler, permission = types_1.NONE, ...acceptedContentTypes) {
         this.route({
             method: 'post',
             path,
@@ -68,7 +75,7 @@ class Controller {
             acceptedContentTypes,
         });
     }
-    put(path, handler, permission = permissions_1.NONE, ...acceptedContentTypes) {
+    put(path, handler, permission = types_1.NONE, ...acceptedContentTypes) {
         this.route({
             method: 'put',
             path,
@@ -77,7 +84,7 @@ class Controller {
             acceptedContentTypes,
         });
     }
-    patch(path, handler, permission = permissions_1.NONE, ...acceptedContentTypes) {
+    patch(path, handler, permission = types_1.NONE, ...acceptedContentTypes) {
         this.route({
             method: 'patch',
             path,
@@ -86,7 +93,7 @@ class Controller {
             acceptedContentTypes,
         });
     }
-    delete(path, handler, permission = permissions_1.NONE) {
+    delete(path, handler, permission = types_1.NONE) {
         this.route({
             method: 'delete',
             path,
@@ -95,8 +102,8 @@ class Controller {
             acceptAnyContentType: true,
         });
     }
-    fileupload(path, filehandler, handler, permission = permissions_1.NONE) {
-        this.app.post(path, checkPermission(permission), filehandler.bind(this), this.useRouteErrorHandler(handler.bind(this)));
+    fileupload(path, filehandler, handler, permission = types_1.NONE) {
+        this.app.post(path, checkPermission(permission), checkPrivateProjectPermissions(), filehandler.bind(this), this.useRouteErrorHandler(handler.bind(this)));
     }
     use(path, router) {
         this.app.use(path, router);

package/dist/lib/routes/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/lib/routes/controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/lib/routes/controller.ts"],"names":[],"mappings":"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"}

package/dist/lib/routes/proxy-api/index.js

@@ -63,6 +63,7 @@ class ProxyController extends controller_1.default {
                     requestBody: (0, openapi_1.createRequestSchema)('clientMetricsSchema'),
                     responses: {
                         200: openapi_1.emptyResponse,
+                        204: openapi_1.emptyResponse,
                         ...(0, openapi_1.getStandardResponses)(400, 401, 404),
                     },
                 }),
@@ -116,6 +117,10 @@ class ProxyController extends controller_1.default {
         if (!this.config.flagResolver.isEnabled('embedProxy')) {
             throw new notfound_error_1.default();
         }
+        if (this.config.flagResolver.isEnabled('disableMetrics')) {
+            res.sendStatus(204);
+            return;
+        }
         await this.services.proxyService.registerProxyMetrics(req.user, req.body, req.ip);
         res.sendStatus(200);
     }

package/dist/lib/routes/proxy-api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/proxy-api/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/proxy-api/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/schema/role-schema.js

@@ -8,9 +8,11 @@ const joi_1 = __importDefault(require("joi"));
 exports.permissionRoleSchema = joi_1.default
     .object()
     .keys({
-    id: joi_1.default.number().required(),
+    id: joi_1.default.number(),
+    name: joi_1.default.string(),
     environment: joi_1.default.string().optional().allow('').allow(null).default(''),
 })
+    .or('id', 'name')
     .options({ stripUnknown: true, allowUnknown: false, abortEarly: false });
 exports.roleSchema = joi_1.default
     .object()

package/dist/lib/schema/role-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"role-schema.js","sourceRoot":"","sources":["../../../src/lib/schema/role-schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAET,QAAA,oBAAoB,GAAG,aAAG;KAClC,MAAM,EAAE;KACR,IAAI,CAAC;IACF,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CACzE,CAAC;KACD,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AAEhE,QAAA,UAAU,GAAG,aAAG;KACxB,MAAM,EAAE;KACR,IAAI,CAAC;IACF,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACtE,WAAW,EAAE,aAAG;SACX,KAAK,EAAE;SACP,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,EAAE;SACV,KAAK,CAAC,4BAAoB,CAAC;CACnC,CAAC;KACD,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC"}
+{"version":3,"file":"role-schema.js","sourceRoot":"","sources":["../../../src/lib/schema/role-schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAET,QAAA,oBAAoB,GAAG,aAAG;KAClC,MAAM,EAAE;KACR,IAAI,CAAC;IACF,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE;IAClB,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CACzE,CAAC;KACD,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;KAChB,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;AAEhE,QAAA,UAAU,GAAG,aAAG;KACxB,MAAM,EAAE;KACR,IAAI,CAAC;IACF,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACtE,WAAW,EAAE,aAAG;SACX,KAAK,EAAE;SACP,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,EAAE;SACV,KAAK,CAAC,4BAAoB,CAAC;CACnC,CAAC;KACD,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC"}

package/dist/lib/schema/role-schema.test.js

@@ -35,7 +35,7 @@ test('role schema rejects a role with a broken permission list', async () => {
         await role_schema_1.roleSchema.validateAsync(role);
     }
     catch (error) {
-        expect(error.details[0].message).toBe('"permissions[0].id" is required');
+        expect(error.details[0].message).toBe('"permissions[0]" must contain at least one of [id, name]');
     }
 });
 test('role schema allows a role with an empty permission list', async () => {

package/dist/lib/schema/role-schema.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"role-schema.test.js","sourceRoot":"","sources":["../../../src/lib/schema/role-schema.test.ts"],"names":[],"mappings":";;AAAA,+CAA2C;AAE3C,IAAI,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;IACzD,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG;QACT,WAAW,EAAE,EAAE;KAClB,CAAC;IAEF,IAAI;QACA,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;KACxC;IAAC,OAAO,KAAK,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KAC/D;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;IACnE,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,EAAE;KAClB,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE;YACT;gBACI,+BAA+B,EAAE,IAAI;aACxC;SACJ;KACJ,CAAC;IAEF,IAAI;QACA,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;KACxC;IAAC,OAAO,KAAK,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CACjC,iCAAiC,CACpC,CAAC;KACL;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;IACvE,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,EAAE;KAClB,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;IAC1D,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;IAChE,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,SAAS;KAClB,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AACjD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;IACtD,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,mBAAmB;KAChC,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"role-schema.test.js","sourceRoot":"","sources":["../../../src/lib/schema/role-schema.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/segments/segment-service-interface.d.ts

@@ -5,7 +5,7 @@ export interface ISegmentService {
     addToStrategy(id: number, strategyId: string): Promise<void>;
     getByStrategy(strategyId: string): Promise<ISegment[]>;
     get(id: number): Promise<ISegment>;
-    getStrategies(id: number): Promise<IFeatureStrategy[]>;
+    getStrategies(id: number, userId: number): Promise<IFeatureStrategy[]>;
     validateName(name: string): Promise<void>;
     getActive(): Promise<ISegment[]>;
     getActiveForClient(): Promise<IClientSegment[]>;

package/dist/lib/services/access-service.d.ts

@@ -1,27 +1,36 @@
-import User, { IProjectUser, IUser } from '../types/user';
-import { IAccessInfo, IProjectRoleUsage, IRole, IRoleWithPermissions, IRoleWithProject, IUserPermission, IUserRole } from '../types/stores/access-store';
+import User, { IUser } from '../types/user';
+import { IAccessInfo, IGroupWithProjectRoles, IProjectRoleUsage, IRole, IRoleDescriptor, IRoleWithPermissions, IRoleWithProject, IUserPermission, IUserRole, IUserWithProjectRoles } from '../types/stores/access-store';
 import { IUnleashStores } from '../types/stores';
 import { IAvailablePermissions, ICustomRole, IPermission, IRoleData, IUserWithRole, RoleName } from '../types/model';
-import { IGroup, IGroupModelWithProjectRole } from '../types/group';
+import { IGroup } from '../types/group';
 import { GroupService } from './group-service';
-import { IUnleashConfig } from 'lib/types';
+import { IUnleashConfig, IUserAccessOverview } from 'lib/types';
+/** @deprecated prefer to use NamePermissionRef */
+export declare type IdPermissionRef = Pick<IPermission, 'id' | 'environment'>;
+export declare type NamePermissionRef = Pick<IPermission, 'name' | 'environment'>;
+export declare type PermissionRef = IdPermissionRef | NamePermissionRef;
 interface IRoleCreation {
     name: string;
     description: string;
     type?: 'root-custom' | 'custom';
-    permissions?: IPermission[];
+    permissions?: PermissionRef[];
 }
 export interface IRoleValidation {
     name: string;
     description?: string;
-    permissions?: Pick<IPermission, 'id' | 'environment'>[];
+    permissions?: PermissionRef[];
 }
-interface IRoleUpdate {
+export interface IRoleUpdate {
     id: number;
     name: string;
     description: string;
     type?: 'root-custom' | 'custom';
-    permissions?: IPermission[];
+    permissions?: PermissionRef[];
+}
+export interface AccessWithRoles {
+    roles: IRoleDescriptor[];
+    groups: IGroupWithProjectRoles[];
+    users: IUserWithProjectRoles[];
 }
 export declare class AccessService {
     private store;
@@ -45,8 +54,15 @@ export declare class AccessService {
     getPermissions(): Promise<IAvailablePermissions>;
     addUserToRole(userId: number, roleId: number, projectId: string): Promise<void>;
     addGroupToRole(groupId: number, roleId: number, createdBy: string, projectId: string): Promise<void>;
-    addAccessToProject(users: IAccessInfo[], groups: IAccessInfo[], projectId: string, roleId: number, createdBy: string): Promise<void>;
+    addRoleAccessToProject(users: IAccessInfo[], groups: IAccessInfo[], projectId: string, roleId: number, createdBy: string): Promise<void>;
+    addAccessToProject(roles: number[], groups: number[], users: number[], projectId: string, createdBy: string): Promise<void>;
+    setProjectRolesForUser(projectId: string, userId: number, roles: number[]): Promise<void>;
+    getProjectRolesForUser(projectId: string, userId: number): Promise<number[]>;
+    setProjectRolesForGroup(projectId: string, groupId: number, roles: number[], createdBy: string): Promise<void>;
+    getProjectRolesForGroup(projectId: string, groupId: number): Promise<number[]>;
     getRoleByName(roleName: string): Promise<IRole>;
+    removeUserAccess(projectId: string, userId: number): Promise<void>;
+    removeGroupAccess(projectId: string, groupId: number): Promise<void>;
     setUserRootRole(userId: number, role: number | RoleName): Promise<void>;
     getUserRootRoles(userId: number): Promise<IRoleWithProject[]>;
     removeUserFromRole(userId: number, roleId: number, projectId: string): Promise<void>;
@@ -64,8 +80,9 @@ export declare class AccessService {
     wipeUserPermissions(userId: number): Promise<void[]>;
     getUsersForRole(roleId: number): Promise<IUser[]>;
     getGroupsForRole(roleId: number): Promise<IGroup[]>;
-    getProjectUsersForRole(roleId: number, projectId?: string): Promise<IProjectUser[]>;
-    getProjectRoleAccess(projectId: string): Promise<[IRole[], IUserWithRole[], IGroupModelWithProjectRole[]]>;
+    getProjectUsersForRole(roleId: number, projectId?: string): Promise<IUserWithRole[]>;
+    getProjectUsers(projectId: string): Promise<IUserWithProjectRoles[]>;
+    getProjectRoleAccess(projectId: string): Promise<AccessWithRoles>;
     getProjectRoleUsage(roleId: number): Promise<IProjectRoleUsage[]>;
     createDefaultProjectRoles(owner: IUser, projectId: string): Promise<void>;
     removeDefaultProjectRoles(owner: User, projectId: string): Promise<void>;
@@ -80,5 +97,6 @@ export declare class AccessService {
     validateRoleIsUnique(roleName: string, existingId?: number): Promise<void>;
     validateRoleIsNotBuiltIn(roleId: number): Promise<void>;
     validateRole(role: IRoleValidation, existingId?: number): Promise<IRoleCreation>;
+    getUserAccessOverview(): Promise<IUserAccessOverview[]>;
 }
 export {};

package/dist/lib/services/access-service.js

@@ -126,12 +126,33 @@ class AccessService {
     async addGroupToRole(groupId, roleId, createdBy, projectId) {
         return this.store.addGroupToRole(groupId, roleId, createdBy, projectId);
     }
-    async addAccessToProject(users, groups, projectId, roleId, createdBy) {
-        return this.store.addAccessToProject(users, groups, projectId, roleId, createdBy);
+    async addRoleAccessToProject(users, groups, projectId, roleId, createdBy) {
+        return this.store.addRoleAccessToProject(users, groups, projectId, roleId, createdBy);
+    }
+    async addAccessToProject(roles, groups, users, projectId, createdBy) {
+        return this.store.addAccessToProject(roles, groups, users, projectId, createdBy);
+    }
+    async setProjectRolesForUser(projectId, userId, roles) {
+        await this.store.setProjectRolesForUser(projectId, userId, roles);
+    }
+    async getProjectRolesForUser(projectId, userId) {
+        return this.store.getProjectRolesForUser(projectId, userId);
+    }
+    async setProjectRolesForGroup(projectId, groupId, roles, createdBy) {
+        await this.store.setProjectRolesForGroup(projectId, groupId, roles, createdBy);
+    }
+    async getProjectRolesForGroup(projectId, groupId) {
+        return this.store.getProjectRolesForGroup(projectId, groupId);
     }
     async getRoleByName(roleName) {
         return this.roleStore.getRoleByName(roleName);
     }
+    async removeUserAccess(projectId, userId) {
+        await this.store.removeUserAccess(projectId, userId);
+    }
+    async removeGroupAccess(projectId, groupId) {
+        await this.store.removeGroupAccess(projectId, groupId);
+    }
     async setUserRootRole(userId, role) {
         const newRootRole = await this.resolveRootRole(role);
         if (newRootRole) {
@@ -168,7 +189,7 @@ class AccessService {
         if (isProjectPermission(permission) && !environment) {
             throw new Error(`ProjectId cannot be empty for permission=${permission}`);
         }
-        return this.store.addPermissionsToRole(roleId, [permission], environment);
+        return this.store.addPermissionsToRole(roleId, [{ name: permission }], environment);
     }
     //This actually only exists for testing purposes
     async removePermissionFromRole(roleId, permission, environment) {
@@ -237,19 +258,36 @@ class AccessService {
                 return {
                     ...user,
                     addedAt: role.addedAt,
+                    roleId,
                 };
             });
         }
         return [];
     }
+    async getProjectUsers(projectId) {
+        const projectUsers = await this.store.getProjectUsers(projectId);
+        if (projectUsers.length > 0) {
+            const users = await this.accountStore.getAllWithId(projectUsers.map((u) => u.id));
+            return users.flatMap((user) => {
+                return projectUsers
+                    .filter((u) => u.id === user.id)
+                    .map((groupUser) => ({
+                    ...user,
+                    ...groupUser,
+                }));
+            });
+        }
+        return [];
+    }
     async getProjectRoleAccess(projectId) {
         const roles = await this.roleStore.getProjectRoles();
-        const users = await Promise.all(roles.map(async (role) => {
-            const projectUsers = await this.getProjectUsersForRole(role.id, projectId);
-            return projectUsers.map((u) => ({ ...u, roleId: role.id }));
-        }));
+        const users = await this.getProjectUsers(projectId);
         const groups = await this.groupService.getProjectGroups(projectId);
-        return [roles, users.flat(), groups];
+        return {
+            roles,
+            groups,
+            users,
+        };
     }
     async getProjectRoleUsage(roleId) {
         return this.store.getProjectUserAndGroupCountsForRole(roleId);
@@ -310,9 +348,11 @@ class AccessService {
         const newRole = await this.roleStore.create(baseRole);
         if (rolePermissions) {
             if (roleType === constants_1.CUSTOM_ROOT_ROLE_TYPE) {
-                await this.store.addPermissionsToRole(newRole.id, rolePermissions.map(({ name }) => name));
+                // this branch uses named permissions
+                await this.store.addPermissionsToRole(newRole.id, rolePermissions);
             }
             else {
+                // this branch uses id permissions
                 await this.store.addEnvironmentPermissionsToRole(newRole.id, rolePermissions);
             }
         }
@@ -338,7 +378,7 @@ class AccessService {
         if (rolePermissions) {
             await this.store.wipePermissionsFromRole(newRole.id);
             if (roleType === constants_1.CUSTOM_ROOT_ROLE_TYPE) {
-                await this.store.addPermissionsToRole(newRole.id, rolePermissions.map(({ name }) => name));
+                await this.store.addPermissionsToRole(newRole.id, rolePermissions);
             }
             else {
                 await this.store.addEnvironmentPermissionsToRole(newRole.id, rolePermissions);
@@ -377,6 +417,9 @@ class AccessService {
         await this.validateRoleIsUnique(role.name, existingId);
         return cleanedRole;
     }
+    async getUserAccessOverview() {
+        return this.store.getUserAccessOverview();
+    }
 }
 exports.AccessService = AccessService;
 //# sourceMappingURL=access-service.js.map

package/dist/lib/services/access-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"access-service.js","sourceRoot":"","sources":["../../../src/lib/services/access-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"access-service.js","sourceRoot":"","sources":["../../../src/lib/services/access-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAAoD;AAiBpD,0CAOwB;AAExB,mFAAyD;AAEzD,mFAAwD;AACxD,uDAAmD;AACnD,iDAM2B;AAC3B,8CAAmD;AACnD,+FAAqE;AACrE,6EAAmD;AAKnD,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC;AAE9B,MAAM,aAAa,GAAG;IAClB,WAAW,CAAC,cAAc;IAC1B,WAAW,CAAC,cAAc;IAC1B,WAAW,CAAC,cAAc;IAC1B,WAAW,CAAC,cAAc;IAC1B,WAAW,CAAC,cAAc;CAC7B,CAAC;AAkCF,MAAM,mBAAmB,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAE/E,MAAa,aAAa;IAiBtB,YACI,EACI,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,UAAU,GAQb,EACD,EACI,SAAS,EACT,YAAY,GACqC,EACrD,YAA0B;QAE1B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,6BAA6B,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CACf,IAAiD,EACjD,UAA6B,EAC7B,SAAkB,EAClB,WAAoB;QAEpB,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9C,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAEnB,MAAM,iBAAiB,GACnB,gBAAgB,CAAC,MAAM,KAAK,CAAC;YACzB,CAAC,CAAC,cAAc,gBAAgB,CAAC,CAAC,CAAC,EAAE;YACrC,CAAC,CAAC,gBAAgB,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAExD,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,YAAY,iBAAiB,YAAY,IAAI,CAAC,EAAE,eAAe,SAAS,iBAAiB,WAAW,EAAE,CACzG,CAAC;QAEF,IAAI;YACA,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO,KAAK;iBACP,MAAM,CACH,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,CAAC,OAAO;gBACV,CAAC,CAAC,OAAO,KAAK,SAAS;gBACvB,CAAC,CAAC,OAAO,KAAK,wBAAY,CACjC;iBACA,MAAM,CACH,CAAC,CAAC,EAAE,EAAE,CACF,CAAC,CAAC,CAAC,WAAW;gBACd,CAAC,CAAC,WAAW,KAAK,WAAW;gBAC7B,CAAC,CAAC,WAAW,KAAK,oBAAQ,CACjC;iBACA,IAAI,CACD,CAAC,CAAC,EAAE,EAAE,CACF,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC;gBACvC,CAAC,CAAC,UAAU,KAAK,KAAK,CAC7B,CAAC;SACT;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,kBAAkB,iBAAiB,YAAY,IAAI,CAAC,EAAE,cAAc,SAAS,EAAE,EAC/E,CAAC,CACJ,CAAC;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACjC;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,IAAiD;QAEjD,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,OAAO,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACjC,UAAU,EAAE,CAAC;aAChB,CAAC,CAAC,CAAC;SACP;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC;QACvE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAE1D,MAAM,eAAe,GAAG,mBAAmB,CAAC,MAAM,CAC9C,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAChC,CAAC;QAEF,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACxD,OAAO,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/D,OAAO,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,MAAM,yBAAyB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACvD,OAAO;gBACH,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,WAAW,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;oBACnD,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,UAAU,EAAE,CAAC;gBACpD,CAAC,CAAC;aACL,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,OAAO;YACH,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,kBAAkB;YAC3B,YAAY,EAAE,yBAAyB;SAC1C,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CACf,MAAc,EACd,MAAc,EACd,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,OAAe,EACf,MAAc,EACd,SAAiB,EACjB,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,KAAoB,EACpB,MAAqB,EACrB,SAAiB,EACjB,MAAc,EACd,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,CACpC,KAAK,EACL,MAAM,EACN,SAAS,EACT,MAAM,EACN,SAAS,CACZ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,KAAe,EACf,MAAgB,EAChB,KAAe,EACf,SAAiB,EACjB,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAChC,KAAK,EACL,MAAM,EACN,KAAK,EACL,SAAS,EACT,SAAS,CACZ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,SAAiB,EACjB,MAAc,EACd,KAAe;QAEf,MAAM,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,SAAiB,EACjB,MAAc;QAEd,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,uBAAuB,CACzB,SAAiB,EACjB,OAAe,EACf,KAAe,EACf,SAAiB;QAEjB,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CACpC,SAAS,EACT,OAAO,EACP,KAAK,EACL,SAAS,CACZ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB,CACzB,SAAiB,EACjB,OAAe;QAEf,OAAO,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAAgB;QAChC,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,SAAiB,EAAE,MAAc;QACpD,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,SAAiB,EAAE,OAAe;QACtD,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,MAAc,EACd,IAAuB;QAEvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,WAAW,EAAE;YACb,IAAI;gBACA,MAAM,IAAI,CAAC,KAAK,CAAC,wBAAwB,CACrC,MAAM,EACN,2BAAe,CAClB,CAAC;gBAEF,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAC1B,MAAM,EACN,WAAW,CAAC,EAAE,EACd,yBAAe,CAClB,CAAC;aACL;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,IAAI,KAAK,CACX,sBAAsB,WAAW,CAAC,IAAI,cAAc,MAAM,EAAE,CAC/D,CAAC;aACL;SACJ;aAAM;YACH,MAAM,IAAI,wBAAY,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;SAC7D;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC7D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,2BAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,MAAc,EACd,MAAc,EACd,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,OAAe,EACf,MAAc,EACd,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,MAAc,EACd,MAAc,EACd,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,MAAc,EACd,MAAc,EACd,SAAiB;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACxE,CAAC;IAED,gDAAgD;IAChD,KAAK,CAAC,mBAAmB,CACrB,MAAc,EACd,UAAkB,EAClB,WAAoB;QAEpB,IAAI,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE;YACjD,MAAM,IAAI,KAAK,CACX,4CAA4C,UAAU,EAAE,CAC3D,CAAC;SACL;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAClC,MAAM,EACN,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EACtB,WAAW,CACd,CAAC;IACN,CAAC;IAED,gDAAgD;IAChD,KAAK,CAAC,wBAAwB,CAC1B,MAAc,EACd,UAAkB,EAClB,WAAoB;QAEpB,IAAI,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE;YACjD,MAAM,IAAI,KAAK,CACX,4CAA4C,UAAU,EAAE,CAC3D,CAAC;SACL;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,wBAAwB,CACtC,MAAM,EACN,UAAU,EACV,WAAW,CACd,CAAC;IACN,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxE,OAAO;YACH,GAAG,IAAI;YACP,WAAW,EAAE,eAAe;SAC/B,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc;QAC5B,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YACtB,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;SAC/B,CAAC,CAAC;QACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,SAAiB;QACtC,OAAO,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAc;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,MAAM,CAAC;YAChD,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,MAAM,CAAC;SACjD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc;QAChC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;SACrD;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACjC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACrD;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,MAAc,EACd,SAAkB;QAElB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,sBAAsB,CACxD,MAAM,EACN,SAAS,CACZ,CAAC;QACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACrD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACtB,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE,CAAE,CAAC;gBAC5D,OAAO;oBACH,GAAG,IAAI;oBACP,OAAO,EAAE,IAAI,CAAC,OAAQ;oBACtB,MAAM;iBACT,CAAC;YACN,CAAC,CAAC,CAAC;SACN;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAiB;QACnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEjE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAC9C,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAChC,CAAC;YACF,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC1B,OAAO,YAAY;qBACd,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;qBAC/B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oBACjB,GAAG,IAAI;oBACP,GAAG,SAAS;iBACf,CAAC,CAAC,CAAC;YACZ,CAAC,CAAC,CAAC;SACN;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QACxC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;QAErD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAEnE,OAAO;YACH,KAAK;YACL,MAAM;YACN,KAAK;SACR,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAc;QACpC,OAAO,IAAI,CAAC,KAAK,CAAC,mCAAmC,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,KAAY,EACZ,SAAiB;QAEjB,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAChD;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAQ,CAAC,KAAK,CAAC,CAAC;QAErE,sEAAsE;QACtE,IAAI,KAAK,CAAC,EAAE,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,UAAU,KAAK,CAAC,EAAE,aAAa,SAAS,eAAe,SAAS,CAAC,EAAE,EAAE,CACxE,CAAC;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;SACrE;IACL,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,KAAW,EACX,SAAiB;QAEjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,YAAY;QACd,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,eAAe,CACxB,QAA2B;QAE3B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,IAAuB,CAAC;QAC5B,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAC9B,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;SACnD;aAAM;YACH,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;SACrD;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAkB;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAmB;QAChC,4EAA4E;QAC5E,MAAM,QAAQ,GACV,IAAI,CAAC,IAAI,KAAK,iCAAqB;YAC/B,CAAC,CAAC,iCAAqB;YACvB,CAAC,CAAC,oCAAwB,CAAC;QAEnC,IACI,QAAQ,KAAK,iCAAqB;YAClC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,2BAA2B,CAAC,EAC1D;YACE,MAAM,IAAI,iCAAqB,CAC3B,oCAAoC,CACvC,CAAC;SACL;QAED,MAAM,QAAQ,GAAG;YACb,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAClC,QAAQ;SACX,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,eAAe,EAAE;YACjB,IAAI,QAAQ,KAAK,iCAAqB,EAAE;gBACpC,qCAAqC;gBACrC,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CACjC,OAAO,CAAC,EAAE,EACV,eAAe,CAClB,CAAC;aACL;iBAAM;gBACH,kCAAkC;gBAClC,MAAM,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAC5C,OAAO,CAAC,EAAE,EACV,eAAe,CAClB,CAAC;aACL;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAiB;QAC9B,MAAM,QAAQ,GACV,IAAI,CAAC,IAAI,KAAK,iCAAqB;YAC/B,CAAC,CAAC,iCAAqB;YACvB,CAAC,CAAC,oCAAwB,CAAC;QAEnC,IACI,QAAQ,KAAK,iCAAqB;YAClC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,2BAA2B,CAAC,EAC1D;YACE,MAAM,IAAI,iCAAqB,CAC3B,oCAAoC,CACvC,CAAC;SACL;QAED,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG;YACb,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,QAAQ;SACX,CAAC;QACF,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,eAAe,EAAE;YACjB,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,QAAQ,KAAK,iCAAqB,EAAE;gBACpC,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CACjC,OAAO,CAAC,EAAE,EACV,eAAe,CAClB,CAAC;aACL;iBAAM;gBACH,MAAM,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAC5C,OAAO,CAAC,EAAE,EACV,eAAe,CAClB,CAAC;aACL;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACvB,MAAM,IAAI,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC;QAExC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAEnD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/C,MAAM,IAAI,2BAAc,CACpB,2BAA2B,SAAS,CAAC,MAAM,eAAe,UAAU,CAAC,MAAM,uGAAuG,CACrL,CAAC;SACL;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,QAAgB,EAChB,UAAmB;QAEnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACpE,IAAI,MAAM,EAAE;YACR,MAAM,IAAI,2BAAe,CACrB,6CAA6C,QAAQ,EAAE,CAC1D,CAAC;SACL;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,MAAc;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,IACI,IAAI,CAAC,IAAI,KAAK,oCAAwB;YACtC,IAAI,CAAC,IAAI,KAAK,iCAAqB,EACrC;YACE,MAAM,IAAI,iCAAqB,CAC3B,mCAAmC,CACtC,CAAC;SACL;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CACd,IAAqB,EACrB,UAAmB;QAEnB,MAAM,WAAW,GAAG,MAAM,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,UAAU,EAAE;YACZ,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;SACnD;QACD,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACvD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,qBAAqB;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;IAC9C,CAAC;CACJ;AAhpBD,sCAgpBC"}

package/dist/lib/services/access-service.test.js

@@ -137,6 +137,7 @@ test('should be able to validate and cleanup with additional properties', async
         permissions: [
             {
                 id: 1,
+                name: 'name',
                 environment: 'development',
             },
         ],
@@ -169,7 +170,7 @@ test('throws error when trying to delete a project role in use by group', async
     const eventStore = new fake_event_store_1.default();
     const groupStore = new fake_group_store_1.default();
     groupStore.getAllWithId = async () => {
-        return [{ name: 'group' }];
+        return [{ id: 1, name: 'group' }];
     };
     const accountStore = new fake_account_store_1.FakeAccountStore();
     const roleStore = new fake_role_store_1.default();

package/dist/lib/services/access-service.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"access-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/access-service.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"access-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/access-service.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/addon-service.js

@@ -80,11 +80,13 @@ class AddonService {
             this.fetchAddonConfigs().then((addonInstances) => {
                 addonInstances
                     .filter((addon) => addon.events.includes(eventName))
-                    .filter((addon) => !addon.projects ||
+                    .filter((addon) => !event.project ||
+                    !addon.projects ||
                     addon.projects.length == 0 ||
                     addon.projects[0] === WILDCARD_OPTION ||
                     addon.projects.includes(event.project))
-                    .filter((addon) => !addon.environments ||
+                    .filter((addon) => !event.environment ||
+                    !addon.environments ||
                     addon.environments.length == 0 ||
                     addon.environments[0] === WILDCARD_OPTION ||
                     addon.environments.includes(event.environment))