@neohm/nestend 4.1.1 → 5.0.1

package/dist/auth/processors/google.user.data.processor.js

@@ -6,20 +6,68 @@ const common_data_processor_1 = require("../../common/libraries/common.data.proc
 const user_entity_1 = require("../entities/user.entity");
 const google_auth_default_enum_1 = require("../enums/google.auth.default.enum");
 const user_type_enum_1 = require("../enums/user.type.enum");
+const access_revocation_1 = require("../utilities/access.revocation");
+const auth_utilities_1 = require("../utilities/auth.utilities");
 class GoogleUserDataProcessor extends common_data_processor_1.CommonDataProcessor {
     async process(payload) {
-        this.payload = payload;
-        const existing = await user_entity_1.UserEntity.findOne({
-            where: { email: user_entity_1.UserEntity.emailMatching(payload.email) },
-        });
-        if (existing)
-            return this.reuse(existing);
-        return this.create();
+        this.payload = { ...payload, email: auth_utilities_1.AuthUtility.normalizeEmail(payload.email) };
+        const user = (await user_entity_1.UserEntity.createQueryBuilder('user')
+            .where(`user.attributes ->> '${google_auth_default_enum_1.GoogleUserAttribute.SUB}' = :sub`, {
+            sub: payload.sub,
+        })
+            .getOne()) ??
+            (await user_entity_1.UserEntity.findOne({
+                where: { email: user_entity_1.UserEntity.emailMatching(this.payload.email) },
+            }));
+        if (!user)
+            return this.create();
+        switch (GoogleUserDataProcessor.decide(user, payload.sub)) {
+            case 'sign-in':
+                return user;
+            case 'link':
+                return this.link(user, false);
+            case 'takeover':
+                return this.link(user, true);
+            case 'refuse-inactive':
+                throw new common_1.UnauthorizedException('This account is inactive');
+            case 'refuse-mismatch':
+                throw new common_1.UnauthorizedException('This email is linked to a different Google account');
+            default:
+                throw new common_1.UnauthorizedException('This account cannot sign in with Google');
+        }
     }
-    reuse(user) {
+    static decide(user, sub) {
         if (!user.active)
-            throw new common_1.UnauthorizedException('This account is inactive');
-        return user;
+            return 'refuse-inactive';
+        const bound = user.attributes?.[google_auth_default_enum_1.GoogleUserAttribute.SUB];
+        if (bound)
+            return bound === sub ? 'sign-in' : 'refuse-mismatch';
+        if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
+            return 'refuse-system';
+        return user.email_verified_at ? 'link' : 'takeover';
+    }
+    async link(user, takeover) {
+        const attributes = {
+            ...(user.attributes ?? {}),
+            [google_auth_default_enum_1.GoogleUserAttribute.SUB]: this.payload.sub,
+            [google_auth_default_enum_1.GoogleUserAttribute.PICTURE]: this.payload.picture,
+        };
+        await user_entity_1.UserEntity.getRepository().manager.transaction(async (trx) => {
+            await trx.update(user_entity_1.UserEntity, { id: user.id }, {
+                attributes: attributes,
+                ...(takeover
+                    ? {
+                        password: null,
+                        password_change_required: false,
+                        one_time_password_expires_at: null,
+                        email_verified_at: new Date(),
+                    }
+                    : {}),
+            });
+            if (takeover)
+                await access_revocation_1.AccessRevocation.revokeAll(trx, user.id, false);
+        });
+        return user_entity_1.UserEntity.findOneByOrFail({ id: user.id });
     }
     async create() {
         const body = this.payload;

package/dist/auth/processors/google.user.data.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"google.user.data.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/google.user.data.processor.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,wFAAmF;AACnF,yDAAqD;AACrD,gFAAwE;AACxE,4DAAmD;AASnD,MAAa,uBAAwB,SAAQ,2CAAmB;IAG9D,KAAK,CAAC,OAAO,CAAC,OAAwB;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,EAAE,KAAK,EAAE,wBAAU,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;SAC1D,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,IAAgB;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM;YACd,MAAM,IAAI,8BAAqB,CAAC,0BAA0B,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,IAAI,GAAG,wBAAU,CAAC,MAAM,CAAC;YAC7B,SAAS,EAAE,yBAAQ,CAAC,WAAW;YAC/B,SAAS,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK;YAClC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI;YACZ,iBAAiB,EAAE,IAAI,IAAI,EAAE;YAC7B,UAAU,EAAE;gBACV,CAAC,8CAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG;gBACnC,CAAC,8CAAmB,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO;aAC5C;SACF,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;CACF;AApCD,0DAoCC"}
+{"version":3,"file":"google.user.data.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/google.user.data.processor.ts"],"names":[],"mappings":"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"}

package/dist/auth/processors/register.user.data.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/register.user.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,qBAAa,yBAA0B,SAAQ,mBAAmB;IAChE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IAEzB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;YAM1C,QAAQ;YASR,MAAM;CAmBrB"}
+{"version":3,"file":"register.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/register.user.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,qBAAa,yBAA0B,SAAQ,mBAAmB;IAChE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IAEzB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;YAS1C,QAAQ;YAcR,MAAM;CAmBrB"}

package/dist/auth/processors/register.user.data.processor.js

@@ -7,7 +7,10 @@ const user_type_enum_1 = require("../enums/user.type.enum");
 const auth_utilities_1 = require("../utilities/auth.utilities");
 class RegisterUserDataProcessor extends common_data_processor_1.CommonDataProcessor {
     async process(payload) {
-        this.payload = payload;
+        this.payload = {
+            ...payload,
+            email: auth_utilities_1.AuthUtility.normalizeEmail(payload.email),
+        };
         await this.validate();
         return this.create();
     }
@@ -17,6 +20,9 @@ class RegisterUserDataProcessor extends common_data_processor_1.CommonDataProces
         });
         if (existing)
             this.setColumnError('email', 'Email is already registered');
+        const passwordError = auth_utilities_1.AuthUtility.passwordPolicyError(this.payload.password);
+        if (passwordError)
+            this.setColumnError('password', passwordError);
         this.raiseExceptionOnValidationFailure();
     }
     async create() {

package/dist/auth/processors/register.user.data.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.user.data.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/register.user.data.processor.ts"],"names":[],"mappings":";;;AAAA,wFAAmF;AACnF,yDAAqD;AACrD,4DAAmD;AAEnD,gEAA0D;AAG1D,MAAa,yBAA0B,SAAQ,2CAAmB;IAGhE,KAAK,CAAC,OAAO,CAAC,OAAoB;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,EAAE,KAAK,EAAE,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;SAC/D,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,6BAA6B,CAAC,CAAC;QAE1E,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,IAAI,GAAG,wBAAU,CAAC,MAAM,CAAC;YAC7B,SAAS,EAAE,yBAAQ,CAAC,WAAW;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,MAAM,4BAAW,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;YACvD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,OAAQ,IAA8B,CAAC,QAAQ,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AArCD,8DAqCC"}
+{"version":3,"file":"register.user.data.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/register.user.data.processor.ts"],"names":[],"mappings":";;;AAAA,wFAAmF;AACnF,yDAAqD;AACrD,4DAAmD;AAEnD,gEAA0D;AAG1D,MAAa,yBAA0B,SAAQ,2CAAmB;IAGhE,KAAK,CAAC,OAAO,CAAC,OAAoB;QAChC,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;YACV,KAAK,EAAE,4BAAW,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC;SACjD,CAAC;QACF,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,EAAE,KAAK,EAAE,wBAAU,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;SAC/D,CAAC,CAAC;QAGH,IAAI,QAAQ;YAAE,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,6BAA6B,CAAC,CAAC;QAE1E,MAAM,aAAa,GAAG,4BAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7E,IAAI,aAAa;YAAE,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAElE,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,IAAI,GAAG,wBAAU,CAAC,MAAM,CAAC;YAC7B,SAAS,EAAE,yBAAQ,CAAC,WAAW;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,MAAM,4BAAW,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;YACvD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAElB,OAAQ,IAA8B,CAAC,QAAQ,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA7CD,8DA6CC"}

package/dist/auth/processors/tenant.invitation.data.processor.d.ts

@@ -11,10 +11,12 @@ export declare class TenantInvitationDataProcessor extends CommonDataProcessor {
     constructor(inviter: UserEntity, tenantInvitationService: TenantInvitationService);
     process(payload: InviteTenantUserDto): Promise<TenantInvitationEntity>;
     private get tenantId();
+    private get dataSource();
     private validate;
     private validateInvitee;
     private validatePending;
     private validateRoles;
     private create;
+    private pendingError;
 }
 //# sourceMappingURL=tenant.invitation.data.processor.d.ts.map

package/dist/auth/processors/tenant.invitation.data.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.invitation.data.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/tenant.invitation.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAEnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAQhF,qBAAa,6BAA8B,SAAQ,mBAAmB;IAKlE,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAL1C,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACvC,OAAO,CAAC,OAAO,CAA2B;gBAGvB,OAAO,EAAE,UAAU,EACnB,uBAAuB,EAAE,uBAAuB;IAK7D,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAU5E,OAAO,KAAK,QAAQ,GAEnB;YAEa,QAAQ;YAaR,eAAe;YAiBf,eAAe;YAcf,aAAa;YAgBb,MAAM;CAkDrB"}
+{"version":3,"file":"tenant.invitation.data.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/tenant.invitation.data.processor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAEnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAShF,qBAAa,6BAA8B,SAAQ,mBAAmB;IAKlE,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAL1C,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;IACvC,OAAO,CAAC,OAAO,CAA2B;gBAGvB,OAAO,EAAE,UAAU,EACnB,uBAAuB,EAAE,uBAAuB;IAK7D,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAU5E,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,UAAU,GAErB;YAEa,QAAQ;YAaR,eAAe;YAgBf,eAAe;YAYf,aAAa;YAgBb,MAAM;IAqFpB,OAAO,CAAC,YAAY;CAGrB"}

package/dist/auth/processors/tenant.invitation.data.processor.js

@@ -31,6 +31,9 @@ class TenantInvitationDataProcessor extends common_data_processor_1.CommonDataPr
     get tenantId() {
         return this.inviter.organization_id;
     }
+    get dataSource() {
+        return this.tenantInvitationService.dataSource;
+    }
     async validate() {
         if (!this.tenantId)
             throw new access_exception_1.AccessException('This session is not working in an organization.');
@@ -40,32 +43,32 @@ class TenantInvitationDataProcessor extends common_data_processor_1.CommonDataPr
         this.raiseExceptionOnValidationFailure();
     }
     async validateInvitee() {
-        this.invitee = await user_entity_1.UserEntity.findOne({
+        this.invitee = await this.dataSource.getRepository(user_entity_1.UserEntity).findOne({
             where: { email: user_entity_1.UserEntity.emailMatching(this.payload.email) },
         });
-        if (!this.invitee)
+        if (!this.invitee || this.invitee.user_type === user_type_enum_1.UserType.SYSTEM_USER)
             return;
-        if (this.invitee.user_type === user_type_enum_1.UserType.SYSTEM_USER)
-            this.setColumnError('email', 'This account cannot join an organization');
-        else if (await tenant_user_entity_1.TenantUserEntity.existsBy({
+        if (await this.dataSource.getRepository(tenant_user_entity_1.TenantUserEntity).existsBy({
             user_id: this.invitee.id,
             tenant_id: this.tenantId,
         }))
             this.setColumnError('email', 'Already a member of this organization');
     }
     async validatePending() {
-        const pending = await tenant_invitation_entity_1.TenantInvitationEntity.existsBy({
+        const pending = await this.dataSource
+            .getRepository(tenant_invitation_entity_1.TenantInvitationEntity)
+            .existsBy({
             tenant_id: this.tenantId,
             email: this.payload.email,
             status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
             expires_at: (0, typeorm_1.MoreThan)(new Date()),
         });
         if (pending)
-            this.setColumnError('email', 'This email already has a pending invitation');
+            this.pendingError();
     }
     async validateRoles() {
         const roleIds = [...new Set(this.payload.role_ids)];
-        const roles = await system_role_entity_1.SystemRoleEntity.findBy({
+        const roles = await this.dataSource.getRepository(system_role_entity_1.SystemRoleEntity).findBy({
             id: (0, typeorm_1.In)(roleIds),
             is_active: true,
         });
@@ -81,32 +84,59 @@ class TenantInvitationDataProcessor extends common_data_processor_1.CommonDataPr
         const passwordHash = oneTimePassword
             ? await auth_utilities_1.AuthUtility.hashPassword(oneTimePassword)
             : null;
-        const { invitation, created } = await tenant_invitation_entity_1.TenantInvitationEntity.getRepository().manager.transaction(async (trx) => {
-            const account = passwordHash
-                ? await trx.save(trx.create(user_entity_1.UserEntity, {
-                    user_type: user_type_enum_1.UserType.TENANT_USER,
+        let result;
+        try {
+            result = await this.dataSource.transaction(async (trx) => {
+                await trx.update(tenant_invitation_entity_1.TenantInvitationEntity, {
+                    tenant_id: this.tenantId,
                     email: this.payload.email,
-                    full_name: this.payload.full_name || this.payload.email.split('@')[0],
-                    password: passwordHash,
-                    password_change_required: true,
-                    active: true,
-                    attributes: {},
-                }))
-                : null;
-            const saved = await trx.save(trx.create(tenant_invitation_entity_1.TenantInvitationEntity, {
-                tenant_id: this.tenantId,
-                email: this.payload.email,
-                role_ids: [...new Set(this.payload.role_ids)],
-                status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
-                expires_at: tenant_invitation_service_1.TenantInvitationService.expiresAt(),
-                created_by: this.inviter.id,
-            }));
-            return { invitation: saved, created: account };
-        });
+                    status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
+                    expires_at: (0, typeorm_1.LessThanOrEqual)(new Date()),
+                }, {
+                    status: tenant_invitation_status_enum_1.TenantInvitationStatus.REVOKED,
+                    updated_by: this.inviter.id,
+                });
+                const account = passwordHash
+                    ? await trx.save(trx.create(user_entity_1.UserEntity, {
+                        user_type: user_type_enum_1.UserType.TENANT_USER,
+                        email: this.payload.email,
+                        full_name: this.payload.full_name || this.payload.email.split('@')[0],
+                        password: passwordHash,
+                        password_change_required: true,
+                        one_time_password_expires_at: auth_utilities_1.AuthUtility.oneTimePasswordExpiry(),
+                        active: true,
+                        attributes: {},
+                    }))
+                    : null;
+                const saved = await trx.save(trx.create(tenant_invitation_entity_1.TenantInvitationEntity, {
+                    tenant_id: this.tenantId,
+                    email: this.payload.email,
+                    role_ids: [...new Set(this.payload.role_ids)],
+                    status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
+                    expires_at: tenant_invitation_service_1.TenantInvitationService.expiresAt(),
+                    created_by: this.inviter.id,
+                    created_user_id: account?.id ?? null,
+                }));
+                return { invitation: saved, created: account };
+            });
+        }
+        catch (error) {
+            if (error instanceof typeorm_1.QueryFailedError &&
+                error.driverError?.code === '23505') {
+                this.pendingError();
+                this.raiseExceptionOnValidationFailure();
+            }
+            throw error;
+        }
+        const { invitation, created } = result;
+        delete invitation.created_user_id;
         if (created && oneTimePassword)
             await this.tenantInvitationService.mailOneTimePassword(created, invitation, oneTimePassword);
         return invitation;
     }
+    pendingError() {
+        this.setColumnError('email', 'This email already has a pending invitation');
+    }
 }
 exports.TenantInvitationDataProcessor = TenantInvitationDataProcessor;
 //# sourceMappingURL=tenant.invitation.data.processor.js.map

package/dist/auth/processors/tenant.invitation.data.processor.js.map

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

package/dist/auth/processors/tenant.invitation.list.processor.d.ts

@@ -7,7 +7,8 @@ export declare class TenantInvitationListProcessor extends CommonListProcessor {
     protected payload: TenantInvitationListDto;
     protected config: CommonListFilterConfig;
     constructor(listFilterService: ListFilterService);
-    process(payload: TenantInvitationListDto): Promise<import("../../common/types/list.types").CommonListResult>;
+    private tenantId;
+    process(payload: TenantInvitationListDto, tenantId: string): Promise<import("../../common/types/list.types").CommonListResult>;
     protected applyCustomPredicates(): void;
 }
 //# sourceMappingURL=tenant.invitation.list.processor.d.ts.map

package/dist/auth/processors/tenant.invitation.list.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.invitation.list.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/tenant.invitation.list.processor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAO7E,qBAAa,6BAA8B,SAAQ,mBAAmB;IAkDxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAjDnE,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAC;IAE3C,SAAS,CAAC,MAAM,EAAE,sBAAsB,CA6CtC;gBAE6B,iBAAiB,EAAE,iBAAiB;IAI7D,OAAO,CAAC,OAAO,EAAE,uBAAuB;IAK9C,SAAS,CAAC,qBAAqB;CAGhC"}
+{"version":3,"file":"tenant.invitation.list.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/tenant.invitation.list.processor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAO7E,qBAAa,6BAA8B,SAAQ,mBAAmB;IAkDxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAjDnE,SAAS,CAAC,OAAO,EAAE,uBAAuB,CAAC;IAE3C,SAAS,CAAC,MAAM,EAAE,sBAAsB,CA6CtC;gBAE6B,iBAAiB,EAAE,iBAAiB;IAInE,OAAO,CAAC,QAAQ,CAAS;IAGnB,OAAO,CAAC,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM;IAQhE,SAAS,CAAC,qBAAqB;CAGhC"}

package/dist/auth/processors/tenant.invitation.list.processor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TenantInvitationListProcessor = void 0;
+const access_exception_1 = require("../../global/exceptions/access.exception");
 const sort_direction_enum_1 = require("../../common/enums/sort.direction.enum");
 const filter_value_type_enum_1 = require("../../common/enums/filter.value.type.enum");
 const common_list_processor_1 = require("../../common/libraries/common.list.processor");
@@ -55,12 +56,15 @@ class TenantInvitationListProcessor extends common_list_processor_1.CommonListPr
             defaultSort: { field: 'created_at', direction: sort_direction_enum_1.SortDirection.DESC },
         };
     }
-    async process(payload) {
+    async process(payload, tenantId) {
+        if (!tenantId)
+            throw new access_exception_1.AccessException('No organization in this session.');
         this.payload = payload;
+        this.tenantId = tenantId;
         return this.handle();
     }
     applyCustomPredicates() {
-        this.predicates.add('i.tenant_id = :value', this.payload.tenant_id ?? null);
+        this.predicates.add('i.tenant_id = :value', this.tenantId);
     }
 }
 exports.TenantInvitationListProcessor = TenantInvitationListProcessor;

package/dist/auth/processors/tenant.invitation.list.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.invitation.list.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/tenant.invitation.list.processor.ts"],"names":[],"mappings":";;;AAAA,gFAAuE;AACvE,sFAAgF;AAChF,wFAAmF;AAUnF,MAAa,6BAA8B,SAAQ,2CAAmB;IAkDpE,YAA+B,iBAAoC;QACjE,KAAK,EAAE,CAAC;QADqB,sBAAiB,GAAjB,iBAAiB,CAAmB;QA/CzD,WAAM,GAA2B;YACzC,KAAK,EAAE;;;;;;;;;;;;;;mBAcQ;YACf,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,4CAAmB,CAAC,IAAI,EAAE;gBACjE,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBACzD,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE;gBACzC;oBACE,GAAG,EAAE,YAAY;oBACjB,UAAU,EAAE,OAAO;oBACnB,IAAI,EAAE,4CAAmB,CAAC,IAAI;iBAC/B;gBACD,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,EAAE;gBACvE,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE;gBACvD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;gBACD;oBACE,GAAG,EAAE,gBAAgB;oBACrB,UAAU,EAAE,cAAc;oBAC1B,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;gBACD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;aACF;YACD,UAAU,EAAE,CAAC,sBAAsB,CAAC;YACpC,WAAW,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,mCAAa,CAAC,IAAI,EAAE;SACpE,CAAC;IAIF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAgC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAES,qBAAqB;QAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;IAC9E,CAAC;CACF;AA9DD,sEA8DC"}
+{"version":3,"file":"tenant.invitation.list.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/tenant.invitation.list.processor.ts"],"names":[],"mappings":";;;AAAA,+EAA2E;AAC3E,gFAAuE;AACvE,sFAAgF;AAChF,wFAAmF;AAUnF,MAAa,6BAA8B,SAAQ,2CAAmB;IAkDpE,YAA+B,iBAAoC;QACjE,KAAK,EAAE,CAAC;QADqB,sBAAiB,GAAjB,iBAAiB,CAAmB;QA/CzD,WAAM,GAA2B;YACzC,KAAK,EAAE;;;;;;;;;;;;;;mBAcQ;YACf,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,4CAAmB,CAAC,IAAI,EAAE;gBACjE,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBACzD,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE;gBACzC;oBACE,GAAG,EAAE,YAAY;oBACjB,UAAU,EAAE,OAAO;oBACnB,IAAI,EAAE,4CAAmB,CAAC,IAAI;iBAC/B;gBACD,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,EAAE;gBACvE,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE;gBACvD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;gBACD;oBACE,GAAG,EAAE,gBAAgB;oBACrB,UAAU,EAAE,cAAc;oBAC1B,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;gBACD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;aACF;YACD,UAAU,EAAE,CAAC,sBAAsB,CAAC;YACpC,WAAW,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,mCAAa,CAAC,IAAI,EAAE;SACpE,CAAC;IAIF,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,OAAgC,EAAE,QAAgB;QAC9D,IAAI,CAAC,QAAQ;YACX,MAAM,IAAI,kCAAe,CAAC,kCAAkC,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAES,qBAAqB;QAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;CACF;AApED,sEAoEC"}

package/dist/auth/processors/tenant.member.list.processor.d.ts

@@ -7,7 +7,8 @@ export declare class TenantMemberListProcessor extends CommonListProcessor {
     protected payload: TenantMemberListDto;
     protected config: CommonListFilterConfig;
     constructor(listFilterService: ListFilterService);
-    process(payload: TenantMemberListDto): Promise<import("../../common/types/list.types").CommonListResult>;
+    private tenantId;
+    process(payload: TenantMemberListDto, tenantId: string): Promise<import("../../common/types/list.types").CommonListResult>;
     protected applyCustomPredicates(): void;
 }
 //# sourceMappingURL=tenant.member.list.processor.d.ts.map

package/dist/auth/processors/tenant.member.list.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.member.list.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/tenant.member.list.processor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAMrE,qBAAa,yBAA0B,SAAQ,mBAAmB;IAiDpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAhDnE,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;IAEvC,SAAS,CAAC,MAAM,EAAE,sBAAsB,CA4CtC;gBAE6B,iBAAiB,EAAE,iBAAiB;IAI7D,OAAO,CAAC,OAAO,EAAE,mBAAmB;IAK1C,SAAS,CAAC,qBAAqB;CAMhC"}
+{"version":3,"file":"tenant.member.list.processor.d.ts","sourceRoot":"","sources":["../../../src/auth/processors/tenant.member.list.processor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAMrE,qBAAa,yBAA0B,SAAQ,mBAAmB;IAiDpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAhDnE,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;IAEvC,SAAS,CAAC,MAAM,EAAE,sBAAsB,CA4CtC;gBAE6B,iBAAiB,EAAE,iBAAiB;IAInE,OAAO,CAAC,QAAQ,CAAS;IAGnB,OAAO,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM;IAQ5D,SAAS,CAAC,qBAAqB;CAGhC"}

package/dist/auth/processors/tenant.member.list.processor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TenantMemberListProcessor = void 0;
+const access_exception_1 = require("../../global/exceptions/access.exception");
 const sort_direction_enum_1 = require("../../common/enums/sort.direction.enum");
 const filter_value_type_enum_1 = require("../../common/enums/filter.value.type.enum");
 const common_list_processor_1 = require("../../common/libraries/common.list.processor");
@@ -54,12 +55,15 @@ class TenantMemberListProcessor extends common_list_processor_1.CommonListProces
             defaultSort: { field: 'full_name', direction: sort_direction_enum_1.SortDirection.ASC },
         };
     }
-    async process(payload) {
+    async process(payload, tenantId) {
+        if (!tenantId)
+            throw new access_exception_1.AccessException('No organization in this session.');
         this.payload = payload;
+        this.tenantId = tenantId;
         return this.handle();
     }
     applyCustomPredicates() {
-        this.predicates.add('tu.tenant_id = :value', this.payload.tenant_id ?? null);
+        this.predicates.add('tu.tenant_id = :value', this.tenantId);
     }
 }
 exports.TenantMemberListProcessor = TenantMemberListProcessor;

package/dist/auth/processors/tenant.member.list.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.member.list.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/tenant.member.list.processor.ts"],"names":[],"mappings":";;;AAAA,gFAAuE;AACvE,sFAAgF;AAChF,wFAAmF;AASnF,MAAa,yBAA0B,SAAQ,2CAAmB;IAiDhE,YAA+B,iBAAoC;QACjE,KAAK,EAAE,CAAC;QADqB,sBAAiB,GAAjB,iBAAiB,CAAmB;QA9CzD,WAAM,GAA2B;YACzC,KAAK,EAAE;;;;;;;;;;;;;;;mBAeQ;YACf,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,4CAAmB,CAAC,IAAI,EAAE;gBACtE,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;gBACjE,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBACzD;oBACE,GAAG,EAAE,UAAU;oBACf,UAAU,EAAE,QAAQ;oBACpB,IAAI,EAAE,4CAAmB,CAAC,OAAO;iBAClC;gBACD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,mBAAmB;oBAC/B,IAAI,EAAE,4CAAmB,CAAC,OAAO;iBAClC;gBACD;oBACE,GAAG,EAAE,YAAY;oBACjB,UAAU,EAAE,OAAO;oBACnB,IAAI,EAAE,4CAAmB,CAAC,IAAI;iBAC/B;gBACD;oBACE,GAAG,EAAE,eAAe;oBACpB,UAAU,EAAE,WAAW;oBACvB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;aACF;YACD,UAAU,EAAE,CAAC,uBAAuB,CAAC;YACrC,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,mCAAa,CAAC,GAAG,EAAE;SAClE,CAAC;IAIF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAA4B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAES,qBAAqB;QAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,uBAAuB,EACvB,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAC/B,CAAC;IACJ,CAAC;CACF;AAhED,8DAgEC"}
+{"version":3,"file":"tenant.member.list.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/tenant.member.list.processor.ts"],"names":[],"mappings":";;;AAAA,+EAA2E;AAC3E,gFAAuE;AACvE,sFAAgF;AAChF,wFAAmF;AASnF,MAAa,yBAA0B,SAAQ,2CAAmB;IAiDhE,YAA+B,iBAAoC;QACjE,KAAK,EAAE,CAAC;QADqB,sBAAiB,GAAjB,iBAAiB,CAAmB;QA9CzD,WAAM,GAA2B;YACzC,KAAK,EAAE;;;;;;;;;;;;;;;mBAeQ;YACf,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,4CAAmB,CAAC,IAAI,EAAE;gBACtE,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;gBACjE,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBACzD;oBACE,GAAG,EAAE,UAAU;oBACf,UAAU,EAAE,QAAQ;oBACpB,IAAI,EAAE,4CAAmB,CAAC,OAAO;iBAClC;gBACD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,mBAAmB;oBAC/B,IAAI,EAAE,4CAAmB,CAAC,OAAO;iBAClC;gBACD;oBACE,GAAG,EAAE,YAAY;oBACjB,UAAU,EAAE,OAAO;oBACnB,IAAI,EAAE,4CAAmB,CAAC,IAAI;iBAC/B;gBACD;oBACE,GAAG,EAAE,eAAe;oBACpB,UAAU,EAAE,WAAW;oBACvB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;aACF;YACD,UAAU,EAAE,CAAC,uBAAuB,CAAC;YACrC,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,mCAAa,CAAC,GAAG,EAAE;SAClE,CAAC;IAIF,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,OAA4B,EAAE,QAAgB;QAC1D,IAAI,CAAC,QAAQ;YACX,MAAM,IAAI,kCAAe,CAAC,kCAAkC,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAES,qBAAqB;QAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;CACF;AAnED,8DAmEC"}

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

@@ -1,19 +1,16 @@
-import { JwtService } from '@nestjs/jwt';
 import { DataSource } from 'typeorm';
 import { AdminUserEntity } from '../entities/admin.user.entity';
 import { AdminAuthenticatedAccess, AuthTokenPair, IssueTokensUser, TokenIssueContext } from '../types/auth.types';
+import { TokenService } from './token.service';
 export declare class AdminAuthService {
-    private readonly jwtService;
+    private readonly tokenService;
     private readonly dataSource;
-    constructor(jwtService: JwtService, dataSource: DataSource);
+    constructor(tokenService: TokenService, dataSource: DataSource);
     validateRole(roleIdentifier?: string): Promise<AdminAuthenticatedAccess>;
     validateCredentials(emailOrUsername: string, password: string): Promise<AdminUserEntity>;
     issueTokens(user: IssueTokensUser, context?: TokenIssueContext): Promise<AuthTokenPair>;
     refresh(rawRefreshToken: string, context?: TokenIssueContext): Promise<AuthTokenPair>;
-    revokeOne(rawRefreshToken: string): Promise<void>;
-    logout(rawRefreshToken: string): Promise<void>;
-    private hashToken;
-    private get refreshTokenRepo();
-    private get sessionRepo();
+    revokeOne(rawRefreshToken: string, adminUserId: string): Promise<boolean>;
+    logout(rawRefreshToken: string): Promise<boolean>;
 }
 //# sourceMappingURL=admin.auth.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"admin.auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IASnC,YAAY,CAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IA6B9B,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;IAuBrB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAyDnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAiCnB,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,OAAO,CAAC,SAAS;IAIjB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,WAAW,GAEtB;CACF"}
+{"version":3,"file":"admin.auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAG/C,qBACa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU;IAOnC,YAAY,CAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IAmC9B,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;IAiCrB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IASnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAoBnB,SAAS,CACb,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IASb,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgBxD"}