@neohm/nestend 4.1.1 → 5.0.1

package/dist/auth/services/login.throttle.service.d.ts

@@ -0,0 +1,18 @@
+import { CacheService } from '../../common/services/cache.service';
+import { ThrottleAction, ThrottleSubject } from '../types/auth.types';
+import { AuthConfig } from '../utilities/auth.config';
+export declare class LoginThrottleService {
+    private readonly cacheService;
+    private readonly logger;
+    private readonly limits;
+    constructor(cacheService: CacheService, config: AuthConfig);
+    protect<T>(action: ThrottleAction, subject: ThrottleSubject, attempt: () => Promise<T>): Promise<T>;
+    assertAllowed(action: ThrottleAction, subject: ThrottleSubject): Promise<void>;
+    recordFailure(action: ThrottleAction, account: string): Promise<void>;
+    clearFailures(action: ThrottleAction, account: string): Promise<void>;
+    private ipLimit;
+    private ipKey;
+    private accountKey;
+    private guarded;
+}
+//# sourceMappingURL=login.throttle.service.d.ts.map

package/dist/auth/services/login.throttle.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"login.throttle.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/login.throttle.service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EACL,cAAc,EAEd,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAatD,qBACa,oBAAoB;IAK7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAJ/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;gBAGrB,YAAY,EAAE,YAAY,EAC3C,MAAM,EAAE,UAAU;IAMd,OAAO,CAAC,CAAC,EACb,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACxB,OAAO,CAAC,CAAC,CAAC;IAcP,aAAa,CACjB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,IAAI,CAAC;IA6BV,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,aAAa,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3E,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,UAAU;YAKJ,OAAO;CActB"}

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

@@ -0,0 +1,98 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var LoginThrottleService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoginThrottleService = void 0;
+const common_1 = require("@nestjs/common");
+const cache_service_1 = require("../../common/services/cache.service");
+const hash_util_1 = require("../../global/utilities/hash.util");
+const auth_config_1 = require("../utilities/auth.config");
+const auth_default_enum_1 = require("../enums/auth.default.enum");
+const auth_message_enum_1 = require("../enums/auth.message.enum");
+let LoginThrottleService = LoginThrottleService_1 = class LoginThrottleService {
+    constructor(cacheService, config) {
+        this.cacheService = cacheService;
+        this.logger = new common_1.Logger(LoginThrottleService_1.name);
+        this.limits = config.throttle;
+    }
+    async protect(action, subject, attempt) {
+        await this.assertAllowed(action, subject);
+        try {
+            const result = await attempt();
+            if (subject.account)
+                await this.clearFailures(action, subject.account);
+            return result;
+        }
+        catch (error) {
+            if (subject.account && error instanceof common_1.UnauthorizedException)
+                await this.recordFailure(action, subject.account);
+            throw error;
+        }
+    }
+    async assertAllowed(action, subject) {
+        if (!this.limits.enabled)
+            return;
+        const overLimit = await this.guarded(async () => {
+            if (subject.ip) {
+                const hits = await this.cacheService.increment(this.ipKey(action, subject.ip), this.limits.ipWindowSeconds);
+                if (hits > this.ipLimit(action))
+                    return true;
+            }
+            if (subject.account) {
+                const failures = Number((await this.cacheService.getRaw(this.accountKey(action, subject.account))) ?? 0);
+                if (failures >= this.limits.accountLimit)
+                    return true;
+            }
+            return false;
+        });
+        if (overLimit)
+            throw new common_1.HttpException(auth_message_enum_1.AuthMessage.TOO_MANY_ATTEMPTS, common_1.HttpStatus.TOO_MANY_REQUESTS);
+    }
+    async recordFailure(action, account) {
+        if (!this.limits.enabled)
+            return;
+        await this.guarded(() => this.cacheService.increment(this.accountKey(action, account), this.limits.accountWindowSeconds));
+    }
+    async clearFailures(action, account) {
+        if (!this.limits.enabled)
+            return;
+        await this.guarded(() => this.cacheService.del(this.accountKey(action, account)));
+    }
+    ipLimit(action) {
+        return action === 'refresh'
+            ? this.limits.refreshIpLimit
+            : this.limits.ipLimit;
+    }
+    ipKey(action, ip) {
+        return `${auth_default_enum_1.AuthDefault.THROTTLE_KEY_PREFIX}:ip:${action}:${ip}`;
+    }
+    accountKey(action, account) {
+        return `${auth_default_enum_1.AuthDefault.THROTTLE_KEY_PREFIX}:account:${action}:${hash_util_1.Hash.sha256(account.trim().toLowerCase())}`;
+    }
+    async guarded(call) {
+        try {
+            return await call();
+        }
+        catch (error) {
+            this.logger.error(`Login throttle unavailable: ${error.message}`);
+            if (this.limits.failOpen)
+                return undefined;
+            throw new common_1.HttpException('Sign-in is temporarily unavailable.', common_1.HttpStatus.SERVICE_UNAVAILABLE);
+        }
+    }
+};
+exports.LoginThrottleService = LoginThrottleService;
+exports.LoginThrottleService = LoginThrottleService = LoginThrottleService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [cache_service_1.CacheService,
+        auth_config_1.AuthConfig])
+], LoginThrottleService);
+//# sourceMappingURL=login.throttle.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"login.throttle.service.js","sourceRoot":"","sources":["../../../src/auth/services/login.throttle.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAMwB;AACxB,uEAAmE;AACnE,gEAAwD;AAMxD,0DAAsD;AACtD,kEAAyD;AACzD,kEAAyD;AAYlD,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAI/B,YACmB,YAA0B,EAC3C,MAAkB;QADD,iBAAY,GAAZ,YAAY,CAAc;QAJ5B,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;QAO9D,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC;IAChC,CAAC;IAGD,KAAK,CAAC,OAAO,CACX,MAAsB,EACtB,OAAwB,EACxB,OAAyB;QAEzB,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,OAAO;gBAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACvE,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,OAAO,IAAI,KAAK,YAAY,8BAAqB;gBAC3D,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,aAAa,CACjB,MAAsB,EACtB,OAAwB;QAExB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAEjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC9C,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC5C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,EAC9B,IAAI,CAAC,MAAM,CAAC,eAAe,CAC5B,CAAC;gBACF,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBAAE,OAAO,IAAI,CAAC;YAC/C,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,QAAQ,GAAG,MAAM,CACrB,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAC7B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CACzC,CAAC,IAAI,CAAC,CACR,CAAC;gBACF,IAAI,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY;oBAAE,OAAO,IAAI,CAAC;YACxD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS;YACX,MAAM,IAAI,sBAAa,CACrB,+BAAW,CAAC,iBAAiB,EAC7B,mBAAU,CAAC,iBAAiB,CAC7B,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAsB,EAAE,OAAe;QACzD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QACjC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CACtB,IAAI,CAAC,YAAY,CAAC,SAAS,CACzB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CACjC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAsB,EAAE,OAAe;QACzD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QACjC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CACtB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACxD,CAAC;IACJ,CAAC;IAEO,OAAO,CAAC,MAAsB;QACpC,OAAO,MAAM,KAAK,SAAS;YACzB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc;YAC5B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,MAAsB,EAAE,EAAU;QAC9C,OAAO,GAAG,+BAAW,CAAC,mBAAmB,OAAO,MAAM,IAAI,EAAE,EAAE,CAAC;IACjE,CAAC;IAGO,UAAU,CAAC,MAAsB,EAAE,OAAe;QACxD,OAAO,GAAG,+BAAW,CAAC,mBAAmB,YAAY,MAAM,IAAI,gBAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;IAC7G,CAAC;IAGO,KAAK,CAAC,OAAO,CAAI,IAAsB;QAC7C,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+BAAgC,KAAe,CAAC,OAAO,EAAE,CAC1D,CAAC;YACF,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,OAAO,SAAS,CAAC;YAC3C,MAAM,IAAI,sBAAa,CACrB,qCAAqC,EACrC,mBAAU,CAAC,mBAAmB,CAC/B,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA7GY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAMsB,4BAAY;QACnC,wBAAU;GANT,oBAAoB,CA6GhC"}

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

@@ -3,6 +3,7 @@ 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>;
     private get roleRepository();
 }

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;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAQxE,qBACa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAS7C,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAY1E,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,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"}

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

@@ -8,20 +8,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var RoleService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("typeorm");
 const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
+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");
-let RoleService = class RoleService {
+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 {
     constructor(dataSource) {
         this.dataSource = dataSource;
     }
+    static isReservedIdentifier(identifier) {
+        return !!identifier && RESERVED_IDENTIFIERS.has(identifier);
+    }
     async deleteRole(roleUuid, actorId) {
-        if (!(await this.roleRepository.existsBy({ id: roleUuid })))
+        const role = await this.roleRepository.findOne({
+            where: { id: roleUuid },
+            select: { id: true, identifier: true },
+        });
+        if (!role)
             throw new not_found_exception_1.NotFoundException('No role exists for this id');
+        if (RoleService_1.isReservedIdentifier(role.identifier))
+            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(system_role_entity_1.SystemRoleEntity, { id: roleUuid });
@@ -33,7 +46,7 @@ let RoleService = class RoleService {
     }
 };
 exports.RoleService = RoleService;
-exports.RoleService = RoleService = __decorate([
+exports.RoleService = RoleService = RoleService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [typeorm_1.DataSource])
 ], RoleService);

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;AAEhF,uEAAkE;AAClE,mEAA8D;AAOvD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IASvD,KAAK,CAAC,UAAU,CAAC,QAAgB,EAAE,OAAe;QAChD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzD,MAAM,IAAI,uCAAiB,CAAC,4BAA4B,CAAC,CAAC;QAE5D,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;AAzBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,WAAW,CAyBvB"}
+{"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"}

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

@@ -1,4 +1,4 @@
-import { DataSource } from 'typeorm';
+import { DataSource, EntityManager } from 'typeorm';
 import { DeleteResult } from '../../common/types/common.response.types';
 import { ScopeEntity } from '../entities/scope.entity';
 export declare class ScopeService {
@@ -7,6 +7,8 @@ export declare class ScopeService {
     tenantScopes(tenantUuid: string): Promise<string[]>;
     tenantScopeIds(tenantUuid: string): Promise<Set<string>>;
     effectiveScopes(granted: ScopeEntity[]): Promise<ScopeEntity[]>;
+    setTenantScopes(tenantUuid: string, scopeIds: string[], actorId?: string, manager?: EntityManager): Promise<void>;
+    pruneTenantKeyScopes(tenantUuid: string, revokedBy?: string, manager?: EntityManager): Promise<number>;
     childScopes(parentIds: string[]): Promise<ScopeEntity[]>;
     isChildScope(scopeUuid: string): Promise<boolean>;
     deleteScope(scopeUuid: string, actorId: string): Promise<DeleteResult>;

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,EAAE,UAAU,EAA+B,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAUvD,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;IAaxD,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAgB/D,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;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"}

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

@@ -16,6 +16,7 @@ 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 scope_cascade_1 = require("../utilities/scope.cascade");
 let ScopeService = class ScopeService {
     constructor(dataSource) {
         this.dataSource = dataSource;
@@ -29,14 +30,16 @@ let ScopeService = class ScopeService {
         return new Set(scopes.map((scope) => scope.id));
     }
     async effectiveScopes(granted) {
-        if (!granted.length)
-            return [];
-        const parentIds = granted
-            .filter((scope) => !scope.parent_id)
-            .map((scope) => scope.id);
-        const children = await this.childScopes(parentIds);
-        const byId = new Map([...granted, ...children].map((scope) => [scope.id, scope]));
-        return [...byId.values()];
+        return scope_cascade_1.ScopeCascade.expand(this.dataSource.manager, granted);
+    }
+    async setTenantScopes(tenantUuid, scopeIds, actorId, manager) {
+        const run = (trx) => scope_cascade_1.ScopeCascade.setTenantScopes(trx, tenantUuid, scopeIds, actorId);
+        if (manager)
+            return run(manager);
+        return this.dataSource.transaction(run);
+    }
+    async pruneTenantKeyScopes(tenantUuid, revokedBy, manager) {
+        return scope_cascade_1.ScopeCascade.pruneTenantKeys(manager ?? this.dataSource.manager, tenantUuid, revokedBy);
     }
     async childScopes(parentIds) {
         if (!parentIds.length)

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":"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"}

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

@@ -7,7 +7,7 @@ import { TenantUserInvitedMailJob } from '../../notification/jobs/tenant.user.in
 import { AuthService } from './auth.service';
 export declare class TenantInvitationService {
     private readonly authService;
-    private readonly dataSource;
+    readonly dataSource: DataSource;
     private readonly invitedMailJob;
     private readonly logger;
     constructor(authService: AuthService, dataSource: DataSource, invitedMailJob: TenantUserInvitedMailJob);
@@ -16,10 +16,12 @@ export declare class TenantInvitationService {
     decline(invitationId: string): Promise<TenantInvitationEntity>;
     revoke(invitationId: string, tenantId: string, actorId: string): Promise<TenantInvitationEntity>;
     resend(invitationId: string, tenantId: string, actorId: string): Promise<TenantInvitationEntity>;
-    mailOneTimePassword(user: UserEntity, invitation: TenantInvitationEntity, oneTimePassword: string): Promise<void>;
+    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[]>;
     private answerable;
+    static mayAnswer(user: Pick<UserEntity, 'user_type' | 'email_verified_at'>): boolean;
     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;AAK5E,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,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IALjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAGhD,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,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;IAwC1D,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;IAgD5B,mBAAmB,CACvB,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,sBAAsB,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAqChB,MAAM,CAAC,SAAS,IAAI,IAAI;IAOlB,cAAc,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YASrC,UAAU;YAwBV,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,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"}

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

@@ -17,6 +17,7 @@ const access_exception_1 = require("../../global/exceptions/access.exception");
 const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
 const operation_exception_1 = require("../../global/exceptions/operation.exception");
 const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
+const tenant_context_service_1 = require("../../tenant/services/tenant.context.service");
 const system_role_entity_1 = require("../entities/system.role.entity");
 const tenant_invitation_entity_1 = require("../entities/tenant.invitation.entity");
 const user_entity_1 = require("../entities/user.entity");
@@ -35,7 +36,7 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
         this.logger = new common_1.Logger(TenantInvitationService_1.name);
     }
     async pendingFor(user) {
-        if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
+        if (!TenantInvitationService_1.mayAnswer(user))
             return [];
         const invitations = await this.invitationRepository
             .createQueryBuilder('i')
@@ -77,11 +78,11 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
         });
         if (!tenant)
             throw new operation_exception_1.OperationException('This organization is no longer active.');
-        await this.dataSource.transaction(async (trx) => {
+        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 trx.update(user_entity_1.UserEntity, { id: user.id, organization_id: (0, typeorm_1.IsNull)() }, { organization_id: tenant.id });
-        });
+        }));
         return tenant;
     }
     async decline(invitationId) {
@@ -120,19 +121,31 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
         }, { expires_at: TenantInvitationService_1.expiresAt(), updated_by: actorId });
         if (affected !== 1)
             throw new operation_exception_1.OperationException('Only a pending invitation can be resent.');
-        const invitation = await this.invitationRepository.findOneOrFail({
-            where: { id: invitationId },
-            relations: { tenant: true, creator: true },
-        });
-        const invitee = await this.dataSource.getRepository(user_entity_1.UserEntity).findOne({
-            where: { email: user_entity_1.UserEntity.emailMatching(invitation.email) },
-        });
+        const invitation = await this.invitationRepository
+            .createQueryBuilder('i')
+            .addSelect('i.created_user_id')
+            .leftJoinAndSelect('i.tenant', 't')
+            .leftJoinAndSelect('i.creator', 'c')
+            .where('i.id = :id', { id: invitationId })
+            .getOneOrFail();
+        const createdUserId = invitation.created_user_id;
+        delete invitation.created_user_id;
+        if (!createdUserId)
+            return invitation;
+        const invitee = await this.dataSource
+            .getRepository(user_entity_1.UserEntity)
+            .findOneBy({ id: createdUserId });
         if (invitee?.password_change_required) {
             const oneTimePassword = auth_utilities_1.AuthUtility.generateOneTimePassword();
-            await this.dataSource
+            const passwordExpiresAt = auth_utilities_1.AuthUtility.oneTimePasswordExpiry();
+            const { affected } = await this.dataSource
                 .getRepository(user_entity_1.UserEntity)
-                .update({ id: invitee.id }, { password: await auth_utilities_1.AuthUtility.hashPassword(oneTimePassword) });
-            await this.mailOneTimePassword(invitee, invitation, oneTimePassword);
+                .update({ id: invitee.id, password_change_required: true }, {
+                password: await auth_utilities_1.AuthUtility.hashPassword(oneTimePassword),
+                one_time_password_expires_at: passwordExpiresAt,
+            });
+            if (affected === 1)
+                await this.mailOneTimePassword({ ...invitee, one_time_password_expires_at: passwordExpiresAt }, invitation, oneTimePassword);
         }
         return invitation;
     }
@@ -152,22 +165,27 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
                 .getRepository(system_role_entity_1.SystemRoleEntity)
                 .findBy({ id: (0, typeorm_1.In)(invitation.role_ids) }),
         ]);
-        const data = {
+        const mail = {
             user_name: user.full_name,
             user_email: user.email,
             tenant_name: tenant?.name ?? '',
             invited_by: inviter?.full_name ?? '',
             roles: roles.map((role) => role.name).join(', '),
             one_time_password: oneTimePassword,
-            expires_on: invitation.expires_at.toISOString(),
+            expires_on: TenantInvitationService_1.mailExpiry(invitation.expires_at, user.one_time_password_expires_at).toISOString(),
         };
         try {
-            await this.invitedMailJob.dispatch(data);
+            await this.invitedMailJob.dispatchInvitation(mail);
         }
         catch (error) {
-            this.logger.warn(`Failed to queue the invitation email for ${user.email}: ${error.message}`);
+            this.logger.warn(`Failed to queue the invitation email for invitation ${invitation.id}: ${error.message}`);
         }
     }
+    static mailExpiry(invitationExpiresAt, passwordExpiresAt) {
+        return passwordExpiresAt && passwordExpiresAt < invitationExpiresAt
+            ? passwordExpiresAt
+            : invitationExpiresAt;
+    }
     static expiresAt() {
         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));
@@ -182,6 +200,8 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
     async answerable(invitationId, user) {
         if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
             throw new access_exception_1.AccessException('This account cannot join an organization.');
+        if (!user.email_verified_at)
+            throw new access_exception_1.AccessException('Verify your email address before joining an organization.');
         const invitation = await this.invitationRepository.findOne({
             where: { id: invitationId, email: user.email.toLowerCase() },
         });
@@ -193,6 +213,9 @@ let TenantInvitationService = TenantInvitationService_1 = class TenantInvitation
             throw new operation_exception_1.OperationException('This invitation has expired.');
         return invitation;
     }
+    static mayAnswer(user) {
+        return user.user_type !== user_type_enum_1.UserType.SYSTEM_USER && !!user.email_verified_at;
+    }
     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":"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"}
+{"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

@@ -17,11 +17,11 @@ export declare class TenantMembershipService {
     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[]>;
-    removeMember(userId: string, tenantId: string, actorId: string, guardAdmin?: boolean): Promise<DeleteResult>;
+    removeMember(userId: string, tenantId: string, actorId?: string, guardAdmin?: boolean): Promise<DeleteResult>;
     private assertLiveRoles;
     setMemberActive(userId: string, tenantId: string, active: boolean, actorId?: string, guardAdmin?: boolean): Promise<TenantUserEntity>;
     private requireMembership;
-    private assertAdminRemains;
+    static assertOwnRefreshToken(rawRefreshToken: string, userId: string): void;
     private assertTenantUser;
     private get tenantRepository();
     private get userRepository();

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":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,SAAS,CAAC;AAIrD,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;AAIrD,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;IA6BzB,KAAK,CACT,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,eAAe,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAsBnB,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;IAexB,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,UAAU,UAAO,GAChB,OAAO,CAAC,YAAY,CAAC;YAWV,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;YAiBd,iBAAiB;YAiBjB,kBAAkB;IAiChC,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;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"}