@neohm/nestend 5.0.2 → 6.0.0

package/dist/auth/services/auth.service.js

@@ -16,8 +16,6 @@ const user_entity_1 = require("../entities/user.entity");
 const user_role_entity_1 = require("../entities/user.role.entity");
 const tenant_user_entity_1 = require("../entities/tenant.user.entity");
 const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
-const role_tier_enum_1 = require("../enums/role.tier.enum");
-const tenant_role_enum_1 = require("../enums/tenant.role.enum");
 const user_type_enum_1 = require("../enums/user.type.enum");
 const scope_service_1 = require("./scope.service");
 const token_service_1 = require("./token.service");
@@ -27,6 +25,8 @@ const auth_utilities_1 = require("../utilities/auth.utilities");
 const auth_config_1 = require("../utilities/auth.config");
 const access_revocation_1 = require("../utilities/access.revocation");
 const auth_message_enum_1 = require("../enums/auth.message.enum");
+const grant_authority_1 = require("../utilities/grant.authority");
+const role_catalogue_1 = require("../utilities/role.catalogue");
 let AuthService = class AuthService {
     constructor(tokenService, dataSource, scopeService, config) {
         this.tokenService = tokenService;
@@ -44,18 +44,69 @@ let AuthService = class AuthService {
         return this.resolveAccess();
     }
     async resolveAccess(roleIdentifier) {
+        const user = this.sessionUser();
+        const manager = this.dataSource.manager;
+        const [hierarchy, heldRoleIds] = await Promise.all([
+            role_catalogue_1.RoleCatalogue.load(manager, { tenantId: user.organization_id ?? null }),
+            role_catalogue_1.RoleCatalogue.heldRoleIds(manager, user.id, user.organization_id),
+        ]);
+        const holdsRole = !roleIdentifier || hierarchy.satisfiesRole(heldRoleIds, roleIdentifier);
+        if (!holdsRole && !this.impersonationYieldsRole(user))
+            throw new access_exception_1.AccessException(`This action requires at least the "${roleIdentifier}" role.`);
+        return { user, roles: await this.effectiveRoles(user, hierarchy) };
+    }
+    async validatePermission(...permissions) {
+        const user = this.sessionUser();
+        if (user.password_change_required)
+            throw new access_exception_1.AccessException('Change your one-time password before continuing.');
+        const manager = this.dataSource.manager;
+        const [hierarchy, heldRoleIds] = await Promise.all([
+            role_catalogue_1.RoleCatalogue.load(manager, {
+                tenantId: user.organization_id ?? null,
+                withPermissions: true,
+            }),
+            role_catalogue_1.RoleCatalogue.heldRoleIds(manager, user.id, user.organization_id),
+        ]);
+        const missing = permissions.find((permission) => !hierarchy.holdsPermission(heldRoleIds, permission));
+        if (missing && !this.impersonationYieldsRole(user))
+            throw new access_exception_1.AccessException(`This action requires the "${missing}" permission.`);
+        return { user, roles: await this.effectiveRoles(user, hierarchy) };
+    }
+    async validateGrantAuthority() {
+        const access = await this.validateRole();
+        const authority = await this.grantAuthorityOf(access.user);
+        if (!authority.any)
+            throw new access_exception_1.AccessException('This action requires global.admin or the top role of a scope.');
+        return { ...access, authority };
+    }
+    async grantAuthorityOf(user) {
+        const manager = this.dataSource.manager;
+        const [hierarchy, heldRoleIds] = await Promise.all([
+            role_catalogue_1.RoleCatalogue.load(manager, { tenantId: user.organization_id ?? null }),
+            role_catalogue_1.RoleCatalogue.heldRoleIds(manager, user.id, user.organization_id),
+        ]);
+        return new grant_authority_1.GrantAuthority(hierarchy, heldRoleIds, this.impersonationYieldsRole(user));
+    }
+    async effectiveAccess(user) {
+        const manager = this.dataSource.manager;
+        const [hierarchy, heldRoleIds] = await Promise.all([
+            role_catalogue_1.RoleCatalogue.load(manager, {
+                tenantId: user.organization_id ?? null,
+                withPermissions: true,
+            }),
+            role_catalogue_1.RoleCatalogue.heldRoleIds(manager, user.id, user.organization_id),
+        ]);
+        return hierarchy.access(heldRoleIds, this.impersonationYieldsRole(user));
+    }
+    sessionUser() {
         const user = auth_1.Auth.user();
         if (!user)
             throw new common_1.UnauthorizedException('Authentication required: no active session.');
+        return user;
+    }
+    async effectiveRoles(user, hierarchy) {
         const roles = await this.tenantRoles(user.id, user.organization_id);
-        const holdsRole = !roleIdentifier || this.satisfiesRole(roleIdentifier, roles);
-        if (!holdsRole && !this.impersonationYieldsRole(user)) {
-            const requirement = this.tierOf(roleIdentifier)
-                ? `at least the "${roleIdentifier}"`
-                : `the "${roleIdentifier}"`;
-            throw new access_exception_1.AccessException(`This action requires ${requirement} role.`);
-        }
-        return { user, roles };
+        return roles.filter((role) => !!hierarchy.role(role.id));
     }
     async tenantRoles(userId, tenantId) {
         if (!tenantId)
@@ -72,40 +123,6 @@ let AuthService = class AuthService {
             .map((userRole) => userRole.role)
             .filter((role) => !!role);
     }
-    satisfiesRole(required, roles) {
-        if (this.holdsGlobalAdmin(roles))
-            return true;
-        const requiredTier = this.tierOf(required);
-        if (!requiredTier)
-            return roles.some((role) => role.identifier === required);
-        const requiredModule = this.moduleOf(required);
-        const requiredRank = this.rankOf(requiredTier);
-        return roles.some((role) => {
-            const heldTier = this.tierOf(role.identifier);
-            return (!!heldTier &&
-                this.moduleOf(role.identifier) === requiredModule &&
-                this.rankOf(heldTier) >= requiredRank);
-        });
-    }
-    holdsGlobalAdmin(roles) {
-        return roles.some((role) => role.identifier === tenant_role_enum_1.TenantRole.GLOBAL_ADMIN);
-    }
-    tierOf(roleIdentifier) {
-        const separator = roleIdentifier.lastIndexOf('.');
-        if (separator < 1)
-            return null;
-        const tier = roleIdentifier.slice(separator + 1);
-        return Object.values(role_tier_enum_1.RoleTier).includes(tier)
-            ? tier
-            : null;
-    }
-    moduleOf(roleIdentifier) {
-        return roleIdentifier.slice(0, roleIdentifier.lastIndexOf('.'));
-    }
-    rankOf(tier) {
-        const seniority = Object.values(role_tier_enum_1.RoleTier);
-        return seniority.length - seniority.indexOf(tier);
-    }
     impersonationYieldsRole(user) {
         return auth_1.Auth.isImpersonating() && !!user.has_global_access;
     }
@@ -115,9 +132,7 @@ let AuthService = class AuthService {
         }
     }
     async validateAccess(scopeIdentifier, roleIdentifier) {
-        const user = auth_1.Auth.user();
-        if (!user)
-            throw new common_1.UnauthorizedException('Authentication required: no active session.');
+        const user = this.sessionUser();
         if (!user.organization_id)
             throw new access_exception_1.AccessException('This session is not working in an organization.');
         const scopes = await this.scopeService.tenantScopes(user.organization_id);
@@ -203,8 +218,7 @@ let AuthService = class AuthService {
     }
     async logout(rawRefreshToken) {
         const userId = auth_1.Auth.user()?.id ??
-            (await this.tokenService.verify('refresh', 'user', rawRefreshToken))
-                ?.sub;
+            (await this.tokenService.verify('refresh', 'user', rawRefreshToken))?.sub;
         if (!userId)
             return false;
         const sessionIdentifier = auth_1.Auth.session();

package/dist/auth/services/auth.service.js.map

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

package/dist/auth/services/role.service.d.ts

@@ -1,10 +1,12 @@
-import { DataSource } from 'typeorm';
+import { DataSource, EntityManager } from 'typeorm';
 import { DeleteResult } from '../../common/types/common.response.types';
 export declare class RoleService {
     private readonly dataSource;
     constructor(dataSource: DataSource);
     static isReservedIdentifier(identifier: string | null | undefined): boolean;
     deleteRole(roleUuid: string, actorId: string): Promise<DeleteResult>;
+    deletePermission(permissionUuid: string, actorId: string): Promise<DeleteResult>;
+    static setPermissions(manager: EntityManager, roleUuid: string, permissionIds: string[], actorId?: string): Promise<void>;
     private get roleRepository();
 }
 //# sourceMappingURL=role.service.d.ts.map

package/dist/auth/services/role.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/role.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAc,MAAM,SAAS,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAaxE,qBACa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAGnD,MAAM,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO;IASrE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAmB1E,OAAO,KAAK,cAAc,GAEzB;CACF"}
+{"version":3,"file":"role.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/role.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAkB,MAAM,SAAS,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAiBxE,qBACa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAGnD,MAAM,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO;IAUrE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAsBpE,gBAAgB,CACpB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,YAAY,CAAC;WAqBX,cAAc,CACzB,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;IA0BhB,OAAO,KAAK,cAAc,GAEzB;CACF"}

package/dist/auth/services/role.service.js

@@ -17,6 +17,9 @@ const not_found_exception_1 = require("../../global/exceptions/not.found.excepti
 const operation_exception_1 = require("../../global/exceptions/operation.exception");
 const system_role_entity_1 = require("../entities/system.role.entity");
 const user_role_entity_1 = require("../entities/user.role.entity");
+const api_key_role_entity_1 = require("../entities/api.key.role.entity");
+const permission_entity_1 = require("../entities/permission.entity");
+const role_permission_entity_1 = require("../entities/role.permission.entity");
 const tenant_role_enum_1 = require("../enums/tenant.role.enum");
 const RESERVED_IDENTIFIERS = new Set(Object.values(tenant_role_enum_1.TenantRole));
 let RoleService = RoleService_1 = class RoleService {
@@ -37,10 +40,44 @@ let RoleService = RoleService_1 = class RoleService {
             throw new operation_exception_1.OperationException(`The '${role.identifier}' role is reserved and cannot be deleted.`);
         await this.dataSource.transaction(async (trx) => {
             await trx.softDelete(user_role_entity_1.UserRoleEntity, { role_id: roleUuid });
+            await trx.softDelete(api_key_role_entity_1.ApiKeyRoleEntity, { role_id: roleUuid });
+            await trx.softDelete(role_permission_entity_1.RolePermissionEntity, { role_id: roleUuid });
             await trx.softDelete(system_role_entity_1.SystemRoleEntity, { id: roleUuid });
         });
         return { id: roleUuid, deleted: true, deleted_by: actorId };
     }
+    async deletePermission(permissionUuid, actorId) {
+        if (!(await this.dataSource
+            .getRepository(permission_entity_1.PermissionEntity)
+            .existsBy({ id: permissionUuid })))
+            throw new not_found_exception_1.NotFoundException('No permission exists for this id');
+        await this.dataSource.transaction(async (trx) => {
+            await trx.softDelete(role_permission_entity_1.RolePermissionEntity, {
+                permission_id: permissionUuid,
+            });
+            await trx.softDelete(permission_entity_1.PermissionEntity, { id: permissionUuid });
+        });
+        return { id: permissionUuid, deleted: true, deleted_by: actorId };
+    }
+    static async setPermissions(manager, roleUuid, permissionIds, actorId) {
+        const wanted = new Set(permissionIds);
+        const held = await manager.findBy(role_permission_entity_1.RolePermissionEntity, {
+            role_id: roleUuid,
+        });
+        const heldIds = new Set(held.map((grant) => grant.permission_id));
+        const removed = held.filter((grant) => !wanted.has(grant.permission_id));
+        if (removed.length)
+            await manager.softDelete(role_permission_entity_1.RolePermissionEntity, {
+                id: (0, typeorm_1.In)(removed.map((grant) => grant.id)),
+            });
+        const added = [...wanted].filter((id) => !heldIds.has(id));
+        if (added.length)
+            await manager.save(added.map((permission_id) => manager.create(role_permission_entity_1.RolePermissionEntity, {
+                role_id: roleUuid,
+                permission_id,
+                ...(actorId ? { created_by: actorId } : {}),
+            })));
+    }
     get roleRepository() {
         return this.dataSource.getRepository(system_role_entity_1.SystemRoleEntity);
     }

package/dist/auth/services/role.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/auth/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,qFAAgF;AAChF,qFAAiF;AAEjF,uEAAkE;AAClE,mEAA8D;AAC9D,gEAAuD;AAEvD,MAAM,oBAAoB,GAAwB,IAAI,GAAG,CACvD,MAAM,CAAC,MAAM,CAAC,6BAAU,CAAC,CAC1B,CAAC;AAOK,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACtB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAGvD,MAAM,CAAC,oBAAoB,CAAC,UAAqC;QAC/D,OAAO,CAAC,CAAC,UAAU,IAAI,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;IAOD,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,OAAe;QAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;YACvB,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;SACvC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,uCAAiB,CAAC,4BAA4B,CAAC,CAAC;QACrE,IAAI,aAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC;YACnD,MAAM,IAAI,wCAAkB,CAC1B,QAAQ,IAAI,CAAC,UAAU,2CAA2C,CACnE,CAAC;QAEJ,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9C,MAAM,GAAG,CAAC,UAAU,CAAC,iCAAc,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5D,MAAM,GAAG,CAAC,UAAU,CAAC,qCAAgB,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;IAC9D,CAAC;IAED,IAAY,cAAc;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,qCAAgB,CAAC,CAAC;IACzD,CAAC;CACF,CAAA;AAnCY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,WAAW,CAmCvB"}
+{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/auth/services/role.service.ts"],"names":[],"mappings":"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"}

package/dist/auth/services/scope.service.d.ts

@@ -12,6 +12,7 @@ export declare class ScopeService {
     childScopes(parentIds: string[]): Promise<ScopeEntity[]>;
     isChildScope(scopeUuid: string): Promise<boolean>;
     deleteScope(scopeUuid: string, actorId: string): Promise<DeleteResult>;
+    private deleteScopeRoles;
     private grantedTenantScopes;
     private get scopeRepository();
 }

package/dist/auth/services/scope.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/scope.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,aAAa,EAKd,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAWvD,qBACa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAG7C,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAYnD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAYxD,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAQ/D,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;IAQV,oBAAoB,CACxB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,CAAC;IASZ,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAOxD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAcjD,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAiB9D,mBAAmB;IAYjC,OAAO,KAAK,eAAe,GAE1B;CACF"}
+{"version":3,"file":"scope.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/scope.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,aAAa,EAKd,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAgBvD,qBACa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAG7C,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAYnD,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAYxD,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAQ/D,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,CAAC;IAQV,oBAAoB,CACxB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,MAAM,CAAC;IASZ,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAOxD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAejD,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAkB9D,gBAAgB;YAgChB,mBAAmB;IAYjC,OAAO,KAAK,eAAe,GAE1B;CACF"}

package/dist/auth/services/scope.service.js

@@ -16,6 +16,11 @@ const not_found_exception_1 = require("../../global/exceptions/not.found.excepti
 const api_scope_entity_1 = require("../entities/api.scope.entity");
 const scope_entity_1 = require("../entities/scope.entity");
 const tenant_scope_entity_1 = require("../entities/tenant.scope.entity");
+const api_key_role_entity_1 = require("../entities/api.key.role.entity");
+const permission_entity_1 = require("../entities/permission.entity");
+const role_permission_entity_1 = require("../entities/role.permission.entity");
+const system_role_entity_1 = require("../entities/system.role.entity");
+const user_role_entity_1 = require("../entities/user.role.entity");
 const scope_cascade_1 = require("../utilities/scope.cascade");
 let ScopeService = class ScopeService {
     constructor(dataSource) {
@@ -60,10 +65,37 @@ let ScopeService = class ScopeService {
         await this.dataSource.transaction(async (trx) => {
             await trx.softDelete(tenant_scope_entity_1.TenantScopeEntity, { scope_id: (0, typeorm_1.In)(scopeIds) });
             await trx.softDelete(api_scope_entity_1.ApiScopeEntity, { scope_id: (0, typeorm_1.In)(scopeIds) });
+            await this.deleteScopeRoles(trx, scopeIds);
             await trx.softDelete(scope_entity_1.ScopeEntity, { id: (0, typeorm_1.In)(scopeIds) });
         });
         return { id: scopeUuid, deleted: true, deleted_by: actorId };
     }
+    async deleteScopeRoles(trx, scopeIds) {
+        const [roles, permissions] = await Promise.all([
+            trx.find(system_role_entity_1.SystemRoleEntity, {
+                where: { scope_id: (0, typeorm_1.In)(scopeIds) },
+                select: { id: true },
+            }),
+            trx.find(permission_entity_1.PermissionEntity, {
+                where: { scope_id: (0, typeorm_1.In)(scopeIds) },
+                select: { id: true },
+            }),
+        ]);
+        const roleIds = roles.map((role) => role.id);
+        const permissionIds = permissions.map((permission) => permission.id);
+        if (permissionIds.length) {
+            await trx.softDelete(role_permission_entity_1.RolePermissionEntity, {
+                permission_id: (0, typeorm_1.In)(permissionIds),
+            });
+            await trx.softDelete(permission_entity_1.PermissionEntity, { id: (0, typeorm_1.In)(permissionIds) });
+        }
+        if (roleIds.length) {
+            await trx.softDelete(user_role_entity_1.UserRoleEntity, { role_id: (0, typeorm_1.In)(roleIds) });
+            await trx.softDelete(api_key_role_entity_1.ApiKeyRoleEntity, { role_id: (0, typeorm_1.In)(roleIds) });
+            await trx.softDelete(role_permission_entity_1.RolePermissionEntity, { role_id: (0, typeorm_1.In)(roleIds) });
+            await trx.softDelete(system_role_entity_1.SystemRoleEntity, { id: (0, typeorm_1.In)(roleIds) });
+        }
+    }
     async grantedTenantScopes(tenantUuid) {
         const grants = await this.dataSource
             .getRepository(tenant_scope_entity_1.TenantScopeEntity)

package/dist/auth/services/scope.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"scope.service.js","sourceRoot":"","sources":["../../../src/auth/services/scope.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scope.service.js","sourceRoot":"","sources":["../../../src/auth/services/scope.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAOiB;AACjB,qFAAgF;AAEhF,mEAA8D;AAC9D,2DAAuD;AACvD,yEAAoE;AACpE,yEAAmE;AACnE,qEAAiE;AACjE,+EAA0E;AAC1E,uEAAkE;AAClE,mEAA8D;AAC9D,8DAA0D;AAUnD,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAGvD,KAAK,CAAC,YAAY,CAAC,UAAkB;QACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CACvC,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAC3C,CAAC;QAEF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAMD,KAAK,CAAC,cAAc,CAAC,UAAkB;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CACvC,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAC3C,CAAC;QAEF,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAMD,KAAK,CAAC,eAAe,CAAC,OAAsB;QAC1C,OAAO,4BAAY,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAMD,KAAK,CAAC,eAAe,CACnB,UAAkB,EAClB,QAAkB,EAClB,OAAgB,EAChB,OAAuB;QAEvB,MAAM,GAAG,GAAG,CAAC,GAAkB,EAAE,EAAE,CACjC,4BAAY,CAAC,eAAe,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnE,IAAI,OAAO;YAAE,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;IAGD,KAAK,CAAC,oBAAoB,CACxB,UAAkB,EAClB,SAAkB,EAClB,OAAuB;QAEvB,OAAO,4BAAY,CAAC,eAAe,CACjC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAClC,UAAU,EACV,SAAS,CACV,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,WAAW,CAAC,SAAmB;QACnC,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEjC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,SAAiB;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;YACnC,EAAE,EAAE,SAAS;YACb,SAAS,EAAE,IAAA,aAAG,EAAC,IAAA,gBAAM,GAAE,CAAC;SACzB,CAAC,CAAC;IACL,CAAC;IAUD,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,OAAe;QAClD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3D,MAAM,IAAI,uCAAiB,CAAC,6BAA6B,CAAC,CAAC;QAE7D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnE,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAC9C,MAAM,GAAG,CAAC,UAAU,CAAC,uCAAiB,EAAE,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACpE,MAAM,GAAG,CAAC,UAAU,CAAC,iCAAc,EAAE,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC3C,MAAM,GAAG,CAAC,UAAU,CAAC,0BAAW,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;IAC/D,CAAC;IAGO,KAAK,CAAC,gBAAgB,CAC5B,GAAkB,EAClB,QAAkB;QAElB,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7C,GAAG,CAAC,IAAI,CAAC,qCAAgB,EAAE;gBACzB,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE;gBACjC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;aACrB,CAAC;YACF,GAAG,CAAC,IAAI,CAAC,oCAAgB,EAAE;gBACzB,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE;gBACjC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;aACrB,CAAC;SACH,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAErE,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,GAAG,CAAC,UAAU,CAAC,6CAAoB,EAAE;gBACzC,aAAa,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC;aACjC,CAAC,CAAC;YACH,MAAM,GAAG,CAAC,UAAU,CAAC,oCAAgB,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,GAAG,CAAC,UAAU,CAAC,iCAAc,EAAE,EAAE,OAAO,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/D,MAAM,GAAG,CAAC,UAAU,CAAC,sCAAgB,EAAE,EAAE,OAAO,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACjE,MAAM,GAAG,CAAC,UAAU,CAAC,6CAAoB,EAAE,EAAE,OAAO,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrE,MAAM,GAAG,CAAC,UAAU,CAAC,qCAAgB,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAGO,KAAK,CAAC,mBAAmB,CAC/B,UAAkB;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;aACjC,aAAa,CAAC,uCAAiB,CAAC;aAChC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAE1E,OAAO,MAAM;aACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;aAC3B,MAAM,CAAC,CAAC,KAAK,EAAwB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,IAAY,eAAe;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0BAAW,CAAC,CAAC;IACpD,CAAC;CACF,CAAA;AArJY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,YAAY,CAqJxB"}

package/dist/auth/services/tenant.invitation.service.d.ts

@@ -1,8 +1,9 @@
-import { DataSource } from 'typeorm';
+import { DataSource, EntityManager } from 'typeorm';
 import { SystemRoleEntity } from '../entities/system.role.entity';
 import { TenantInvitationEntity } from '../entities/tenant.invitation.entity';
 import { UserEntity } from '../entities/user.entity';
 import { OrganizationSummary, PendingInvitation } from '../types/auth.types';
+import { GrantAuthority } from '../utilities/grant.authority';
 import { TenantUserInvitedMailJob } from '../../notification/jobs/tenant.user.invited.mail.job';
 import { AuthService } from './auth.service';
 export declare class TenantInvitationService {
@@ -14,14 +15,15 @@ export declare class TenantInvitationService {
     pendingFor(user: UserEntity): Promise<PendingInvitation[]>;
     accept(invitationId: string): Promise<OrganizationSummary>;
     decline(invitationId: string): Promise<TenantInvitationEntity>;
-    revoke(invitationId: string, tenantId: string, actorId: string): Promise<TenantInvitationEntity>;
-    resend(invitationId: string, tenantId: string, actorId: string): Promise<TenantInvitationEntity>;
+    revoke(invitationId: string, tenantId: string, actorId: string, createdBy?: string): Promise<TenantInvitationEntity>;
+    resend(invitationId: string, tenantId: string, actorId: string, createdBy?: string): Promise<TenantInvitationEntity>;
     mailOneTimePassword(user: Pick<UserEntity, 'full_name' | 'email' | 'one_time_password_expires_at'>, invitation: TenantInvitationEntity, oneTimePassword: string): Promise<void>;
     static mailExpiry(invitationExpiresAt: Date, passwordExpiresAt: Date | null | undefined): Date;
     static expiresAt(): Date;
-    grantableRoles(): Promise<SystemRoleEntity[]>;
+    grantableRoles(authority: GrantAuthority): Promise<SystemRoleEntity[]>;
     private answerable;
     static mayAnswer(user: Pick<UserEntity, 'user_type' | 'email_verified_at'>): boolean;
+    static stillGrantable(manager: EntityManager, invitation: Pick<TenantInvitationEntity, 'tenant_id' | 'role_ids' | 'created_by'>): Promise<string[]>;
     private settle;
     private get invitationRepository();
 }

package/dist/auth/services/tenant.invitation.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.invitation.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/tenant.invitation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyC,MAAM,SAAS,CAAC;AAM5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKrD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAC;AAEhG,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAU7C,qBACa,uBAAuB;IAIhC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc;IALjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAGhD,WAAW,EAAE,WAAW,EAChC,UAAU,EAAE,UAAU,EACd,cAAc,EAAE,wBAAwB;IAIrD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA8C1D,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2C1D,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAc9D,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,sBAAsB,CAAC;IAuB5B,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,sBAAsB,CAAC;IAiE5B,mBAAmB,CACvB,IAAI,EAAE,IAAI,CACR,UAAU,EACV,WAAW,GAAG,OAAO,GAAG,8BAA8B,CACvD,EACD,UAAU,EAAE,sBAAsB,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAwChB,MAAM,CAAC,UAAU,CACf,mBAAmB,EAAE,IAAI,EACzB,iBAAiB,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,GACzC,IAAI;IAOP,MAAM,CAAC,SAAS,IAAI,IAAI;IAOlB,cAAc,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YASrC,UAAU;IA4BxB,MAAM,CAAC,SAAS,CACd,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC,GACxD,OAAO;YAKI,MAAM;IAiBpB,OAAO,KAAK,oBAAoB,GAE/B;CACF"}
+{"version":3,"file":"tenant.invitation.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/tenant.invitation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,aAAa,EAA0B,MAAM,SAAS,CAAC;AAM5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKrD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAC;AAEhG,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAU7C,qBACa,uBAAuB;IAIhC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc;IALjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAGhD,WAAW,EAAE,WAAW,EAChC,UAAU,EAAE,UAAU,EACd,cAAc,EAAE,wBAAwB;IAIrD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA+C1D,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2C1D,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAiB9D,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC;IA2B5B,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,sBAAsB,CAAC;IAkE5B,mBAAmB,CACvB,IAAI,EAAE,IAAI,CACR,UAAU,EACV,WAAW,GAAG,OAAO,GAAG,8BAA8B,CACvD,EACD,UAAU,EAAE,sBAAsB,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAwChB,MAAM,CAAC,UAAU,CACf,mBAAmB,EAAE,IAAI,EACzB,iBAAiB,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,GACzC,IAAI;IAOP,MAAM,CAAC,SAAS,IAAI,IAAI;IAOlB,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAkB9D,UAAU;IA4BxB,MAAM,CAAC,SAAS,CACd,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC,GACxD,OAAO;WAKG,cAAc,CACzB,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,IAAI,CACd,sBAAsB,EACtB,WAAW,GAAG,UAAU,GAAG,YAAY,CACxC,GACA,OAAO,CAAC,MAAM,EAAE,CAAC;YAeN,MAAM;IAiBpB,OAAO,KAAK,oBAAoB,GAE/B;CACF"}

package/dist/auth/services/tenant.invitation.service.js

@@ -25,6 +25,8 @@ const tenant_invitation_status_enum_1 = require("../enums/tenant.invitation.stat
 const user_type_enum_1 = require("../enums/user.type.enum");
 const tenant_invitation_default_enum_1 = require("../enums/tenant.invitation.default.enum");
 const auth_utilities_1 = require("../utilities/auth.utilities");
+const grant_authority_1 = require("../utilities/grant.authority");
+const role_catalogue_1 = require("../utilities/role.catalogue");
 const tenant_access_1 = require("../utilities/tenant.access");
 const tenant_user_invited_mail_job_1 = require("../../notification/jobs/tenant.user.invited.mail.job");
 const auth_service_1 = require("./auth.service");
@@ -80,7 +82,7 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
             throw new operation_exception_1.OperationException('This organization is no longer active.');
         await tenant_context_service_1.TenantContextService.run({ tenantUuid: tenant.id }, () => this.dataSource.transaction(async (trx) => {
             await this.settle(trx, invitation.id, tenant_invitation_status_enum_1.TenantInvitationStatus.ACCEPTED, user.id);
-            await tenant_access_1.TenantAccess.join(trx, user.id, tenant.id, invitation.role_ids, invitation.created_by);
+            await tenant_access_1.TenantAccess.join(trx, user.id, tenant.id, await TenantInvitationService_1.stillGrantable(trx, invitation), invitation.created_by);
             await trx.update(user_entity_1.UserEntity, { id: user.id, organization_id: (0, typeorm_1.IsNull)() }, { organization_id: tenant.id });
         }));
         return tenant;
@@ -91,10 +93,11 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
         await this.settle(this.dataSource.manager, invitation.id, tenant_invitation_status_enum_1.TenantInvitationStatus.DECLINED, user.id);
         return this.invitationRepository.findOneByOrFail({ id: invitation.id });
     }
-    async revoke(invitationId, tenantId, actorId) {
+    async revoke(invitationId, tenantId, actorId, createdBy) {
         const exists = await this.invitationRepository.existsBy({
             id: invitationId,
             tenant_id: tenantId,
+            ...(createdBy ? { created_by: createdBy } : {}),
         });
         if (!exists)
             throw new not_found_exception_1.NotFoundException('No invitation exists for this id');
@@ -107,10 +110,11 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
             throw new operation_exception_1.OperationException('Only a pending invitation can be revoked.');
         return this.invitationRepository.findOneByOrFail({ id: invitationId });
     }
-    async resend(invitationId, tenantId, actorId) {
+    async resend(invitationId, tenantId, actorId, createdBy) {
         const exists = await this.invitationRepository.existsBy({
             id: invitationId,
             tenant_id: tenantId,
+            ...(createdBy ? { created_by: createdBy } : {}),
         });
         if (!exists)
             throw new not_found_exception_1.NotFoundException('No invitation exists for this id');
@@ -190,10 +194,20 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
         const expiry = process.env.TENANT_INVITATION_EXPIRY || tenant_invitation_default_enum_1.TenantInvitationDefault.EXPIRY;
         return new Date(Date.now() + auth_utilities_1.AuthUtility.parseExpiryMs(expiry));
     }
-    async grantableRoles() {
+    async grantableRoles(authority) {
+        const roleIds = authority.grantableRoles().map((role) => role.id);
+        if (!roleIds.length)
+            return [];
         return this.dataSource.getRepository(system_role_entity_1.SystemRoleEntity).find({
-            where: { is_active: true },
-            select: { id: true, identifier: true, name: true, description: true },
+            where: { id: (0, typeorm_1.In)(roleIds), is_active: true },
+            select: {
+                id: true,
+                identifier: true,
+                name: true,
+                description: true,
+                scope_id: true,
+                priority: true,
+            },
             order: { name: 'ASC' },
         });
     }
@@ -216,6 +230,16 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
     static mayAnswer(user) {
         return user.user_type !== user_type_enum_1.UserType.SYSTEM_USER && !!user.email_verified_at;
     }
+    static async stillGrantable(manager, invitation) {
+        if (!invitation.created_by)
+            return invitation.role_ids;
+        const [hierarchy, heldRoleIds] = await Promise.all([
+            role_catalogue_1.RoleCatalogue.load(manager, { tenantId: invitation.tenant_id }),
+            role_catalogue_1.RoleCatalogue.heldRoleIds(manager, invitation.created_by, invitation.tenant_id),
+        ]);
+        const authority = new grant_authority_1.GrantAuthority(hierarchy, heldRoleIds);
+        return invitation.role_ids.filter((roleId) => authority.canGrant(roleId));
+    }
     async settle(manager, invitationId, status, userId) {
         const { affected } = await manager.update(tenant_invitation_entity_1.TenantInvitationEntity, { id: invitationId, status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING }, { status, user_id: userId, responded_at: new Date(), updated_by: userId });
         if (affected !== 1)

package/dist/auth/services/tenant.invitation.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.invitation.service.js","sourceRoot":"","sources":["../../../src/auth/services/tenant.invitation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,qCAA4E;AAC5E,+EAA2E;AAC3E,qFAAgF;AAChF,qFAAiF;AACjF,uEAAmE;AACnE,yFAAoF;AACpF,uEAAkE;AAClE,mFAA8E;AAC9E,yDAAqD;AACrD,0FAAgF;AAChF,4DAAmD;AACnD,4FAAkF;AAClF,gEAA0D;AAE1D,8DAA0D;AAC1D,uGAAgG;AAEhG,iDAA6C;AAWtC,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAGlC,YACmB,WAAwB,EAChC,UAAsB,EACd,cAAwC;QAFxC,gBAAW,GAAX,WAAW,CAAa;QAChC,eAAU,GAAV,UAAU,CAAY;QACd,mBAAc,GAAd,cAAc,CAA0B;QAL1C,WAAM,GAAG,IAAI,eAAM,CAAC,yBAAuB,CAAC,IAAI,CAAC,CAAC;IAMhE,CAAC;IAGJ,KAAK,CAAC,UAAU,CAAC,IAAgB;QAC/B,IAAI,CAAC,yBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QAExD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB;aAChD,kBAAkB,CAAC,GAAG,CAAC;aACvB,kBAAkB,CACjB,UAAU,EACV,GAAG,EACH,6CAA6C,CAC9C;aACA,iBAAiB,CAAC,WAAW,EAAE,GAAG,CAAC;aACnC,KAAK,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;aAC9D,QAAQ,CAAC,oBAAoB,EAAE;YAC9B,MAAM,EAAE,sDAAsB,CAAC,OAAO;SACvC,CAAC;aACD,QAAQ,CAAC,sBAAsB,CAAC;aAChC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC;aAC/B,OAAO,EAAE,CAAC;QAEb,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM;YAC1B,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU;iBAClB,aAAa,CAAC,qCAAgB,CAAC;iBAC/B,MAAM,CAAC,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACjD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAE/D,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACtC,EAAE,EAAE,UAAU,CAAC,EAAE;YACjB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI;YACnC,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE,SAAS,IAAI,IAAI;YACjD,KAAK,EAAE,UAAU,CAAC,QAAQ;iBACvB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBACrC,MAAM,CAAC,CAAC,IAAI,EAA4B,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBAClD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YAChE,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,UAAU,EAAE,UAAU,CAAC,UAAU;SAClC,CAAC,CAAC,CAAC;IACN,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,YAAoB;QAC/B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,4BAAY,CAAC,CAAC,OAAO,CAAC;YACvE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE;YACpD,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC7D,CAAC,CAAC;QACH,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,wCAAkB,CAAC,wCAAwC,CAAC,CAAC;QAGzE,MAAM,6CAAoB,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAC7D,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAGxC,MAAM,IAAI,CAAC,MAAM,CACf,GAAG,EACH,UAAU,CAAC,EAAE,EACb,sDAAsB,CAAC,QAAQ,EAC/B,IAAI,CAAC,EAAE,CACR,CAAC;YAEF,MAAM,4BAAY,CAAC,IAAI,CACrB,GAAG,EACH,IAAI,CAAC,EAAE,EACP,MAAM,CAAC,EAAE,EACT,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,UAAU,CACtB,CAAC;YAGF,MAAM,GAAG,CAAC,MAAM,CACd,wBAAU,EACV,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,eAAe,EAAE,IAAA,gBAAM,GAAE,EAAE,EAC1C,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,EAAE,CAC/B,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,YAAoB;QAChC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAE7D,MAAM,IAAI,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,OAAO,EACvB,UAAU,CAAC,EAAE,EACb,sDAAsB,CAAC,QAAQ,EAC/B,IAAI,CAAC,EAAE,CACR,CAAC;QACF,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC;IAGD,KAAK,CAAC,MAAM,CACV,YAAoB,EACpB,QAAgB,EAChB,OAAe;QAEf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YACtD,EAAE,EAAE,YAAY;YAChB,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,uCAAiB,CAAC,kCAAkC,CAAC,CAAC;QAElE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CACzD;YACE,EAAE,EAAE,YAAY;YAChB,SAAS,EAAE,QAAQ;YACnB,MAAM,EAAE,sDAAsB,CAAC,OAAO;SACvC,EACD,EAAE,MAAM,EAAE,sDAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAChE,CAAC;QACF,IAAI,QAAQ,KAAK,CAAC;YAChB,MAAM,IAAI,wCAAkB,CAAC,2CAA2C,CAAC,CAAC;QAE5E,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IACzE,CAAC;IAGD,KAAK,CAAC,MAAM,CACV,YAAoB,EACpB,QAAgB,EAChB,OAAe;QAEf,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YACtD,EAAE,EAAE,YAAY;YAChB,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM;YACT,MAAM,IAAI,uCAAiB,CAAC,kCAAkC,CAAC,CAAC;QAElE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CACzD;YACE,EAAE,EAAE,YAAY;YAChB,SAAS,EAAE,QAAQ;YACnB,MAAM,EAAE,sDAAsB,CAAC,OAAO;SACvC,EACD,EAAE,UAAU,EAAE,yBAAuB,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CACzE,CAAC;QACF,IAAI,QAAQ,KAAK,CAAC;YAChB,MAAM,IAAI,wCAAkB,CAAC,0CAA0C,CAAC,CAAC;QAE3E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB;aAC/C,kBAAkB,CAAC,GAAG,CAAC;aACvB,SAAS,CAAC,mBAAmB,CAAC;aAC9B,iBAAiB,CAAC,UAAU,EAAE,GAAG,CAAC;aAClC,iBAAiB,CAAC,WAAW,EAAE,GAAG,CAAC;aACnC,KAAK,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aACzC,YAAY,EAAE,CAAC;QAIlB,MAAM,aAAa,GAAG,UAAU,CAAC,eAAe,CAAC;QACjD,OAAQ,UAAkD,CAAC,eAAe,CAAC;QAC3E,IAAI,CAAC,aAAa;YAAE,OAAO,UAAU,CAAC;QAEtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,wBAAU,CAAC;aACzB,SAAS,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,OAAO,EAAE,wBAAwB,EAAE,CAAC;YACtC,MAAM,eAAe,GAAG,4BAAW,CAAC,uBAAuB,EAAE,CAAC;YAC9D,MAAM,iBAAiB,GAAG,4BAAW,CAAC,qBAAqB,EAAE,CAAC;YAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU;iBACvC,aAAa,CAAC,wBAAU,CAAC;iBACzB,MAAM,CACL,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAClD;gBACE,QAAQ,EAAE,MAAM,4BAAW,CAAC,YAAY,CAAC,eAAe,CAAC;gBACzD,4BAA4B,EAAE,iBAAiB;aAChD,CACF,CAAC;YAEJ,IAAI,QAAQ,KAAK,CAAC;gBAChB,MAAM,IAAI,CAAC,mBAAmB,CAC5B,EAAE,GAAG,OAAO,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,EAC/D,UAAU,EACV,eAAe,CAChB,CAAC;QACN,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAOD,KAAK,CAAC,mBAAmB,CACvB,IAGC,EACD,UAAkC,EAClC,eAAuB;QAEvB,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjD,UAAU,CAAC,MAAM;gBACf,IAAI,CAAC,UAAU;qBACZ,aAAa,CAAC,4BAAY,CAAC;qBAC3B,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC;YAC5C,UAAU,CAAC,OAAO;gBAChB,CAAC,UAAU,CAAC,UAAU;oBACpB,CAAC,CAAC,IAAI,CAAC,UAAU;yBACZ,aAAa,CAAC,wBAAU,CAAC;yBACzB,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC7C,CAAC,CAAC,IAAI,CAAC;YACX,IAAI,CAAC,UAAU;iBACZ,aAAa,CAAC,qCAAgB,CAAC;iBAC/B,MAAM,CAAC,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC3C,CAAC,CAAC;QAEH,MAAM,IAAI,GAA0B;YAClC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,IAAI,CAAC,KAAK;YACtB,WAAW,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE;YAC/B,UAAU,EAAE,OAAO,EAAE,SAAS,IAAI,EAAE;YACpC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAChD,iBAAiB,EAAE,eAAe;YAClC,UAAU,EAAE,yBAAuB,CAAC,UAAU,CAC5C,UAAU,CAAC,UAAU,EACrB,IAAI,CAAC,4BAA4B,CAClC,CAAC,WAAW,EAAE;SAChB,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,uDAAuD,UAAU,CAAC,EAAE,KAAM,KAAe,CAAC,OAAO,EAAE,CACpG,CAAC;QACJ,CAAC;IACH,CAAC;IAGD,MAAM,CAAC,UAAU,CACf,mBAAyB,EACzB,iBAA0C;QAE1C,OAAO,iBAAiB,IAAI,iBAAiB,GAAG,mBAAmB;YACjE,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,mBAAmB,CAAC;IAC1B,CAAC;IAGD,MAAM,CAAC,SAAS;QACd,MAAM,MAAM,GACV,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,wDAAuB,CAAC,MAAM,CAAC;QACzE,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,4BAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IAClE,CAAC;IAGD,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,qCAAgB,CAAC,CAAC,IAAI,CAAC;YAC1D,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC1B,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE;YACrE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;SACvB,CAAC,CAAC;IACL,CAAC;IAGO,KAAK,CAAC,UAAU,CACtB,YAAoB,EACpB,IAAgB;QAEhB,IAAI,IAAI,CAAC,SAAS,KAAK,yBAAQ,CAAC,WAAW;YACzC,MAAM,IAAI,kCAAe,CAAC,2CAA2C,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,iBAAiB;YACzB,MAAM,IAAI,kCAAe,CACvB,2DAA2D,CAC5D,CAAC;QAGJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE;SAC7D,CAAC,CAAC;QACH,IAAI,CAAC,UAAU;YACb,MAAM,IAAI,uCAAiB,CAAC,kCAAkC,CAAC,CAAC;QAClE,IAAI,UAAU,CAAC,MAAM,KAAK,sDAAsB,CAAC,OAAO;YACtD,MAAM,IAAI,wCAAkB,CAC1B,4CAA4C,CAC7C,CAAC;QACJ,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE;YAC/C,MAAM,IAAI,wCAAkB,CAAC,8BAA8B,CAAC,CAAC;QAE/D,OAAO,UAAU,CAAC;IACpB,CAAC;IAGD,MAAM,CAAC,SAAS,CACd,IAAyD;QAEzD,OAAO,IAAI,CAAC,SAAS,KAAK,yBAAQ,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC;IAC7E,CAAC;IAGO,KAAK,CAAC,MAAM,CAClB,OAAsB,EACtB,YAAoB,EACpB,MAA8B,EAC9B,MAAc;QAEd,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CACvC,iDAAsB,EACtB,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,sDAAsB,CAAC,OAAO,EAAE,EAC5D,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAC1E,CAAC;QACF,IAAI,QAAQ,KAAK,CAAC;YAChB,MAAM,IAAI,wCAAkB,CAC1B,4CAA4C,CAC7C,CAAC;IACN,CAAC;IAED,IAAY,oBAAoB;QAC9B,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,iDAAsB,CAAC,CAAC;IAC/D,CAAC;CACF,CAAA;AAjVY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;qCAKqB,0BAAW;QACpB,oBAAU;QACE,uDAAwB;GANhD,uBAAuB,CAiVnC"}
+{"version":3,"file":"tenant.invitation.service.js","sourceRoot":"","sources":["../../../src/auth/services/tenant.invitation.service.ts"],"names":[],"mappings":"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"}

package/dist/auth/services/tenant.membership.service.d.ts

@@ -6,6 +6,7 @@ import { SystemRoleEntity } from '../entities/system.role.entity';
 import { TenantUserEntity } from '../entities/tenant.user.entity';
 import { UserEntity } from '../entities/user.entity';
 import { AuthTokenPair, OrganizationSession, OrganizationSummary, TokenIssueContext } from '../types/auth.types';
+import { GrantAuthority } from '../utilities/grant.authority';
 import { AuthService } from './auth.service';
 export declare class TenantMembershipService {
     private readonly authService;
@@ -16,8 +17,9 @@ export declare class TenantMembershipService {
     landingTenant(user: UserEntity): Promise<string | undefined>;
     switchOrganization(dto: SwitchOrganizationDto, context?: TokenIssueContext): Promise<OrganizationSession>;
     leave(tenantId: string, dto: RefreshTokenDto, context?: TokenIssueContext): Promise<AuthTokenPair>;
-    setMemberRoles(userId: string, tenantId: string, roleIds: string[], actorId?: string, guardAdmin?: boolean): Promise<SystemRoleEntity[]>;
+    setMemberRoles(userId: string, tenantId: string, roleIds: string[], actorId?: string, guardAdmin?: boolean, authority?: GrantAuthority): Promise<SystemRoleEntity[]>;
     removeMember(userId: string, tenantId: string, actorId?: string, guardAdmin?: boolean): Promise<DeleteResult>;
+    private withinAuthority;
     private assertLiveRoles;
     setMemberActive(userId: string, tenantId: string, active: boolean, actorId?: string, guardAdmin?: boolean): Promise<TenantUserEntity>;
     private requireMembership;

package/dist/auth/services/tenant.membership.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.membership.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/tenant.membership.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAiC,MAAM,SAAS,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAO7C,qBACa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU;IAInC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAmB/D,mBAAmB,CACvB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAahC,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe5D,kBAAkB,CACtB,GAAG,EAAE,qBAAqB,EAC1B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAgCzB,KAAK,CACT,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,eAAe,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAuBnB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsBxB,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,YAAY,CAAC;YAYV,eAAe;IAyBvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,gBAAgB,CAAC;YAsBd,iBAAiB;IAiB/B,MAAM,CAAC,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAgB3E,OAAO,CAAC,gBAAgB;IAOxB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,cAAc,GAEzB;CACF"}
+{"version":3,"file":"tenant.membership.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/tenant.membership.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAiC,MAAM,SAAS,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAO7C,qBACa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU;IAInC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAmB/D,mBAAmB,CACvB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAahC,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe5D,kBAAkB,CACtB,GAAG,EAAE,qBAAqB,EAC1B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAgCzB,KAAK,CACT,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,eAAe,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAyBnB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,EACjB,SAAS,CAAC,EAAE,cAAc,GACzB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAmBxB,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,YAAY,CAAC;YAgBV,eAAe;YA4Bf,eAAe;IAyBvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,gBAAgB,CAAC;YAsBd,iBAAiB;IAiB/B,MAAM,CAAC,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAgB3E,OAAO,CAAC,gBAAgB;IAOxB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,cAAc,GAEzB;CACF"}