@neohm/nestend 3.1.5 → 3.3.0

package/dist/admin/libraries/tenant.data.processor.d.ts

@@ -2,19 +2,18 @@ import { CommonDataProcessor } from '../../common/libraries/common.data.processo
 import { AdminUserEntity } from '../../auth/entities/admin.user.entity';
 import { TenantEntity } from '../../tenant/entities/tenant.entity';
 import { AddTenantDto } from '../dtos/add.tenant.dto';
-import { EmailNotificationService } from '../../notification/services/email.notification.service';
-import { SystemPropertyService } from '../../common/services/system.property.service';
+import { TenantOnboardedMailJob } from '../../notification/jobs/tenant.onboarded.mail.job';
 export declare class TenantDataProcessor extends CommonDataProcessor {
     private readonly actor;
-    private readonly emailNotificationService;
-    private readonly systemPropertyService;
+    private readonly tenantOnboardedMailJob;
     protected payload: AddTenantDto;
     private readonly logger;
-    constructor(actor: AdminUserEntity, emailNotificationService: EmailNotificationService, systemPropertyService: SystemPropertyService);
+    constructor(actor: AdminUserEntity, tenantOnboardedMailJob: TenantOnboardedMailJob);
     process(payload: AddTenantDto): Promise<TenantEntity>;
     private validate;
+    private validateScopes;
     private set;
+    private setScopes;
     private notifyTenant;
-    private supportContact;
 }
 //# sourceMappingURL=tenant.data.processor.d.ts.map

package/dist/admin/libraries/tenant.data.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAKtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wDAAwD,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAOtF,qBAAa,mBAAoB,SAAQ,mBAAmB;IAKxD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IANxC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAG5C,KAAK,EAAE,eAAe,EACtB,wBAAwB,EAAE,wBAAwB,EAClD,qBAAqB,EAAE,qBAAqB;IAKzD,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;YAM7C,QAAQ;YAiBR,GAAG;YA6CH,YAAY;YAyBZ,cAAc;CAiB7B"}
+{"version":3,"file":"tenant.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.data.processor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAQ3F,qBAAa,mBAAoB,SAAQ,mBAAmB;IAKxD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IALzC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAG5C,KAAK,EAAE,eAAe,EACtB,sBAAsB,EAAE,sBAAsB;IAK3D,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;YAM7C,QAAQ;YAmBR,cAAc;YAYd,GAAG;YAkDH,SAAS;YA6BT,YAAY;CAiB3B"}

package/dist/admin/libraries/tenant.data.processor.js

@@ -2,17 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TenantDataProcessor = void 0;
 const common_1 = require("@nestjs/common");
+const typeorm_1 = require("typeorm");
 const common_data_processor_1 = require("../../common/libraries/common.data.processor");
+const scope_entity_1 = require("../../auth/entities/scope.entity");
+const tenant_scope_entity_1 = require("../../auth/entities/tenant.scope.entity");
 const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
-const email_notification_default_enum_1 = require("../../notification/enums/email.notification.default.enum");
-const email_template_identifier_enum_1 = require("../../notification/enums/email.template.identifier.enum");
-const process_email_notification_1 = require("../../notification/libraries/process.email.notification");
 class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
-    constructor(actor, emailNotificationService, systemPropertyService) {
+    constructor(actor, tenantOnboardedMailJob) {
         super();
         this.actor = actor;
-        this.emailNotificationService = emailNotificationService;
-        this.systemPropertyService = systemPropertyService;
+        this.tenantOnboardedMailJob = tenantOnboardedMailJob;
         this.logger = new common_1.Logger(TenantDataProcessor.name);
     }
     async process(payload) {
@@ -29,8 +28,19 @@ class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
         });
         if (slugOwner && slugOwner.id !== body.id)
             this.setColumnError('slug', 'Slug is already in use');
+        await this.validateScopes();
         this.throwExceptionOnError();
     }
+    async validateScopes() {
+        const scopeIds = [...new Set(this.payload.scope_ids ?? [])];
+        if (!scopeIds.length)
+            return;
+        const scopes = await scope_entity_1.ScopeEntity.find({ where: { id: (0, typeorm_1.In)(scopeIds) } });
+        const found = new Set(scopes.map((scope) => scope.id));
+        for (const scopeId of scopeIds)
+            if (!found.has(scopeId))
+                this.setColumnError('scope_ids', `Scope '${scopeId}' not found`);
+    }
     async set() {
         const body = this.payload;
         let isNew = true;
@@ -63,39 +73,42 @@ class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
             ? new Date(body.contract_expires_at)
             : undefined;
         await tenant.save();
+        await this.setScopes(tenant);
         if (isNew)
             await this.notifyTenant(tenant);
         return tenant;
     }
+    async setScopes(tenant) {
+        const scopeIds = new Set(this.payload.scope_ids ?? []);
+        const existing = await tenant_scope_entity_1.TenantScopeEntity.find({
+            where: { tenant_id: tenant.id },
+        });
+        const existingScopeIds = new Set(existing.map((tenantScope) => tenantScope.scope_id));
+        for (const tenantScope of existing)
+            if (!scopeIds.has(tenantScope.scope_id))
+                await tenantScope.softRemove();
+        for (const scopeId of scopeIds)
+            if (!existingScopeIds.has(scopeId))
+                await tenant_scope_entity_1.TenantScopeEntity.create({
+                    tenant_id: tenant.id,
+                    scope_id: scopeId,
+                    created_by: this.actor.id,
+                }).save();
+    }
     async notifyTenant(tenant) {
-        const notificationData = {
-            identifier: email_template_identifier_enum_1.EmailTemplateIdentifier.TENANT_ONBOARDED,
-            emailRecipients: [{ recipient: tenant.poc_email }],
-            data: {
-                tenant_name: tenant.name,
-                tenant_poc: tenant.poc_name,
-                tenant_email: tenant.poc_email,
-                onboarded_on: tenant.created_at.toISOString(),
-                ...(await this.supportContact()),
-            },
+        const data = {
+            tenant_name: tenant.name,
+            tenant_poc: tenant.poc_name,
+            tenant_email: tenant.poc_email,
+            onboarded_on: tenant.created_at.toISOString(),
         };
         try {
-            await new process_email_notification_1.ProcessEmailNotification(this.emailNotificationService).process(notificationData);
+            await this.tenantOnboardedMailJob.dispatch(data);
         }
         catch (error) {
-            this.logger.warn(`Failed to send the "${notificationData.identifier}" email to ${tenant.poc_email}: ${error.message}`);
+            this.logger.warn(`Failed to queue the tenant onboarding email for ${tenant.poc_email}: ${error.message}`);
         }
     }
-    async supportContact() {
-        const [supportEmail, supportLink] = await Promise.all([
-            this.systemPropertyService.get(email_notification_default_enum_1.EmailNotificationDefault.SUPPORT_EMAIL_PROPERTY),
-            this.systemPropertyService.get(email_notification_default_enum_1.EmailNotificationDefault.SUPPORT_LINK_PROPERTY),
-        ]);
-        return {
-            support_email: supportEmail || email_notification_default_enum_1.EmailNotificationDefault.SUPPORT_EMAIL_FALLBACK,
-            support_link: supportLink || email_notification_default_enum_1.EmailNotificationDefault.SUPPORT_LINK_FALLBACK,
-        };
-    }
 }
 exports.TenantDataProcessor = TenantDataProcessor;
 //# sourceMappingURL=tenant.data.processor.js.map

package/dist/admin/libraries/tenant.data.processor.js.map

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

package/dist/admin/libraries/tenant.delete.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.delete.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.delete.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAIxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAWpD,qBAAa,qBAAsB,SAAQ,mBAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,eAAe;IAI7C,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAwBjD"}
+{"version":3,"file":"tenant.delete.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.delete.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAOxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAapD,qBAAa,qBAAsB,SAAQ,mBAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,eAAe;IAI7C,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAuCjD"}

package/dist/admin/libraries/tenant.delete.processor.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TenantDeleteProcessor = void 0;
 const typeorm_1 = require("typeorm");
 const common_data_processor_1 = require("../../common/libraries/common.data.processor");
+const api_key_entity_1 = require("../../auth/entities/api.key.entity");
+const api_scope_entity_1 = require("../../auth/entities/api.scope.entity");
+const tenant_scope_entity_1 = require("../../auth/entities/tenant.scope.entity");
 const user_entity_1 = require("../../auth/entities/user.entity");
 const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
 const access_revocation_1 = require("../../auth/utilities/access.revocation");
@@ -19,12 +22,23 @@ class TenantDeleteProcessor extends common_data_processor_1.CommonDataProcessor
             where: { tenant_id: id, deleted_at: (0, typeorm_1.IsNull)() },
             select: { id: true },
         });
+        const apiKeys = await api_key_entity_1.ApiKeyEntity.find({
+            where: { tenant_id: id, deleted_at: (0, typeorm_1.IsNull)() },
+            select: { id: true },
+        });
         await tenant_entity_1.TenantEntity.getRepository().manager.transaction(async (trx) => {
             for (const user of users) {
                 await access_revocation_1.AccessRevocation.revokeAll(trx, user.id, false);
             }
             if (users.length)
                 await trx.softDelete(user_entity_1.UserEntity, users.map((user) => user.id));
+            if (apiKeys.length) {
+                const apiKeyIds = apiKeys.map((apiKey) => apiKey.id);
+                await trx.update(api_key_entity_1.ApiKeyEntity, { id: (0, typeorm_1.In)(apiKeyIds) }, { is_active: false, revoked_at: new Date() });
+                await trx.softDelete(api_scope_entity_1.ApiScopeEntity, { api_key_id: (0, typeorm_1.In)(apiKeyIds) });
+                await trx.softDelete(api_key_entity_1.ApiKeyEntity, apiKeyIds);
+            }
+            await trx.softDelete(tenant_scope_entity_1.TenantScopeEntity, { tenant_id: id });
             await trx.softDelete(tenant_entity_1.TenantEntity, { id });
         });
         return { id, deleted: true, deleted_by: this.actor.id };

package/dist/admin/libraries/tenant.delete.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.delete.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.delete.processor.ts"],"names":[],"mappings":";;;AAAA,qCAAiC;AACjC,wFAAmF;AAEnF,iEAA6D;AAC7D,uEAAmE;AACnE,8EAA0E;AAY1E,MAAa,qBAAsB,SAAQ,2CAAmB;IAC5D,YAA6B,KAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,UAAK,GAAL,KAAK,CAAiB;IAEnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,IAAI,CAAC,CAAC,MAAM,4BAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,8BAA8B,CAAC,CAAC;QAC5D,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,IAAI,CAAC;YAClC,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC9C,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,4BAAY,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,oCAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,KAAK,CAAC,MAAM;gBACd,MAAM,GAAG,CAAC,UAAU,CAClB,wBAAU,EACV,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAC7B,CAAC;YACJ,MAAM,GAAG,CAAC,UAAU,CAAC,4BAAY,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1D,CAAC;CACF;AA7BD,sDA6BC"}
+{"version":3,"file":"tenant.delete.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.delete.processor.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AACrC,wFAAmF;AAEnF,uEAAkE;AAClE,2EAAsE;AACtE,iFAA4E;AAC5E,iEAA6D;AAC7D,uEAAmE;AACnE,8EAA0E;AAc1E,MAAa,qBAAsB,SAAQ,2CAAmB;IAC5D,YAA6B,KAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,UAAK,GAAL,KAAK,CAAiB;IAEnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,IAAI,CAAC,CAAC,MAAM,4BAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,8BAA8B,CAAC,CAAC;QAC5D,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,MAAM,KAAK,GAAG,MAAM,wBAAU,CAAC,IAAI,CAAC;YAClC,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC9C,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,6BAAY,CAAC,IAAI,CAAC;YACtC,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC9C,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,4BAAY,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,oCAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,KAAK,CAAC,MAAM;gBACd,MAAM,GAAG,CAAC,UAAU,CAClB,wBAAU,EACV,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAC7B,CAAC;YACJ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACrD,MAAM,GAAG,CAAC,MAAM,CACd,6BAAY,EACZ,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,EACrB,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,EAAE,CAC7C,CAAC;gBACF,MAAM,GAAG,CAAC,UAAU,CAAC,iCAAc,EAAE,EAAE,UAAU,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBACpE,MAAM,GAAG,CAAC,UAAU,CAAC,6BAAY,EAAE,SAAS,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,GAAG,CAAC,UAAU,CAAC,uCAAiB,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAC,UAAU,CAAC,4BAAY,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1D,CAAC;CACF;AA5CD,sDA4CC"}

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

@@ -1,5 +1,6 @@
 import { AdminAuthService } from '../../auth/services/admin.auth.service';
 import { AdminAuthenticatedAccess } from '../../auth/types/auth.types';
+import { GlobalAdminRoles } from '../../auth/enums/global.admin.roles.enum';
 export declare class AdminAccessService {
     private readonly adminAuthService;
     constructor(adminAuthService: AdminAuthService);
@@ -7,6 +8,7 @@ export declare class AdminAccessService {
     validateAdmin(): Promise<AdminAuthenticatedAccess>;
     validateContentManager(): Promise<AdminAuthenticatedAccess>;
     validateContentReader(): Promise<AdminAuthenticatedAccess>;
+    holdsAtLeast(access: AdminAuthenticatedAccess, required: GlobalAdminRoles): boolean;
     private requireRole;
     private highestRank;
     private rankOf;

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

@@ -1 +1 @@
-{"version":3,"file":"admin.access.service.d.ts","sourceRoot":"","sources":["../../../src/admin/services/admin.access.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAkBvE,qBACa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAG/D,kBAAkB,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAKvD,aAAa,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAKlD,sBAAsB,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAK3D,qBAAqB,IAAI,OAAO,CAAC,wBAAwB,CAAC;YAI5C,WAAW;IAazB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,MAAM;CAKf"}
+{"version":3,"file":"admin.access.service.d.ts","sourceRoot":"","sources":["../../../src/admin/services/admin.access.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAiB5E,qBACa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,gBAAgB;IAG/D,kBAAkB,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAKvD,aAAa,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAKlD,sBAAsB,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAK3D,qBAAqB,IAAI,OAAO,CAAC,wBAAwB,CAAC;IAS1D,YAAY,CACV,MAAM,EAAE,wBAAwB,EAChC,QAAQ,EAAE,gBAAgB,GACzB,OAAO;YAII,WAAW;IAazB,OAAO,CAAC,WAAW;IAcnB,OAAO,CAAC,MAAM;CAKf"}

package/dist/admin/services/admin.access.service.js

@@ -30,6 +30,9 @@ let AdminAccessService = class AdminAccessService {
     validateContentReader() {
         return this.requireRole(global_admin_roles_enum_1.GlobalAdminRoles.GLOBAL_CONTENT_READER);
     }
+    holdsAtLeast(access, required) {
+        return this.highestRank(access) >= this.rankOf(required);
+    }
     async requireRole(required) {
         const access = await this.adminAuthService.validateRole();
         if (this.highestRank(access) < this.rankOf(required)) {

package/dist/admin/services/admin.access.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.access.service.js","sourceRoot":"","sources":["../../../src/admin/services/admin.access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAA0E;AAE1E,sFAA4E;AAC5E,+EAA2E;AAiBpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAGnE,kBAAkB;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,kBAAkB,CAAC,CAAC;IAC/D,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,YAAY,CAAC,CAAC;IACzD,CAAC;IAGD,sBAAsB;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,sBAAsB,CAAC,CAAC;IACnE,CAAC;IAGD,qBAAqB;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,qBAAqB,CAAC,CAAC;IAClE,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,QAA0B;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QAC1D,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,kCAAe,CACvB,sCAAsC,QAAQ,SAAS,CACxD,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAGO,WAAW,CAAC,MAAgC;QAClD,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,IAAI,IAAI,GAAG,OAAO;gBAAE,OAAO,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAOO,MAAM,CAAC,cAAsB;QACnC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,0CAAgB,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,cAAkC,CAAC,CAAC;QACpE,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC;IACrD,CAAC;CACF,CAAA;AAvDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEoC,qCAAgB;GADpD,kBAAkB,CAuD9B"}
+{"version":3,"file":"admin.access.service.js","sourceRoot":"","sources":["../../../src/admin/services/admin.access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+EAA0E;AAE1E,sFAA4E;AAC5E,+EAA2E;AAiBpE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAGnE,kBAAkB;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,kBAAkB,CAAC,CAAC;IAC/D,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,YAAY,CAAC,CAAC;IACzD,CAAC;IAGD,sBAAsB;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,sBAAsB,CAAC,CAAC;IACnE,CAAC;IAGD,qBAAqB;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC,0CAAgB,CAAC,qBAAqB,CAAC,CAAC;IAClE,CAAC;IAOD,YAAY,CACV,MAAgC,EAChC,QAA0B;QAE1B,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,QAA0B;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QAC1D,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,kCAAe,CACvB,sCAAsC,QAAQ,SAAS,CACxD,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAGO,WAAW,CAAC,MAAgC;QAClD,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1C,IAAI,IAAI,GAAG,OAAO;gBAAE,OAAO,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAOO,MAAM,CAAC,cAAsB;QACnC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,0CAAgB,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,cAAkC,CAAC,CAAC;QACpE,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC;IACrD,CAAC;CACF,CAAA;AAnEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEoC,qCAAgB;GADpD,kBAAkB,CAmE9B"}

package/dist/admin/types/admin.types.d.ts

@@ -1,4 +1,8 @@
+import type { ApiKeyEntity } from '../../auth/entities/api.key.entity';
+import type { ScopeEntity } from '../../auth/entities/scope.entity';
 import type { UserEntity } from '../../auth/entities/user.entity';
+import type { TenantEntity } from '../../tenant/entities/tenant.entity';
+export type { DeleteResult, DisableResult, } from '../../common/types/common.response.types';
 export interface AdminModuleOptions {
     dataSourceName?: string;
 }
@@ -6,9 +10,11 @@ export interface BulkUserResult {
     created: number;
     users: UserEntity[];
 }
-export interface DeleteResult {
-    id: string;
-    deleted: true;
-    deleted_by: string;
+export interface IssuedApiKey {
+    raw_key: string;
+    api_key: ApiKeyEntity;
 }
+export type TenantDetail = TenantEntity & {
+    scopes: ScopeEntity[];
+};
 //# sourceMappingURL=admin.types.d.ts.map

package/dist/admin/types/admin.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.types.d.ts","sourceRoot":"","sources":["../../../src/admin/types/admin.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAGD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB;AAMD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"admin.types.d.ts","sourceRoot":"","sources":["../../../src/admin/types/admin.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGxE,YAAY,EACV,YAAY,EACZ,aAAa,GACd,MAAM,0CAA0C,CAAC;AAElD,MAAM,WAAW,kBAAkB;IACjC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAGD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB;AAMD,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;CACvB;AAGD,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC"}

package/dist/auth/auth.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAId,MAAM,gBAAgB,CAAC;AAgBxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AA+E5D,qBAMa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,OAAO,GAAE,iBAAsB,GAAG,aAAa;CAShE"}
+{"version":3,"file":"auth.module.d.ts","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAId,MAAM,gBAAgB,CAAC;AAiBxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAsG5D,qBAMa,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,OAAO,GAAE,iBAAsB,GAAG,aAAa;CAShE"}

package/dist/auth/auth.module.js

@@ -14,6 +14,7 @@ const passport_1 = require("@nestjs/passport");
 const typeorm_1 = require("@nestjs/typeorm");
 const common_module_1 = require("../common/common.module");
 const cache_service_1 = require("../common/services/cache.service");
+const encryption_service_1 = require("../common/services/encryption.service");
 const api_key_guard_1 = require("./guards/api.key.guard");
 const jwt_auth_guard_1 = require("./guards/jwt.auth.guard");
 const jwt_refresh_guard_1 = require("./guards/jwt.refresh.guard");
@@ -23,7 +24,7 @@ const jwt_middleware_1 = require("./middlewares/jwt.middleware");
 const admin_jwt_middleware_1 = require("./middlewares/admin.jwt.middleware");
 const api_key_middleware_1 = require("./middlewares/api.key.middleware");
 const es6_classes_1 = require("./es6.classes");
-const [ApiKeyService, AuthService, AdminAuthService, GoogleAuthService] = es6_classes_1.es6Classes.services;
+const [ApiKeyService, ScopeService, AuthService, AdminAuthService, GoogleAuthService, RoleService,] = es6_classes_1.es6Classes.services;
 function createAuthImports() {
     return [
         common_module_1.CommonModule,
@@ -43,11 +44,12 @@ function createAuthProviders(options = {}) {
     return [
         {
             provide: AuthService,
-            useFactory: (jwtService, cacheService, dataSource) => new AuthService(jwtService, cacheService, dataSource),
+            useFactory: (jwtService, cacheService, dataSource, scopeService) => new AuthService(jwtService, cacheService, dataSource, scopeService),
             inject: [
                 jwt_1.JwtService,
                 cache_service_1.CacheService,
                 (0, typeorm_1.getDataSourceToken)(options.dataSourceName),
+                ScopeService,
             ],
         },
         {
@@ -57,7 +59,17 @@ function createAuthProviders(options = {}) {
         },
         {
             provide: ApiKeyService,
-            useFactory: (dataSource) => new ApiKeyService(dataSource),
+            useFactory: (dataSource, encryptionService) => new ApiKeyService(dataSource, encryptionService),
+            inject: [(0, typeorm_1.getDataSourceToken)(options.dataSourceName), encryption_service_1.EncryptionService],
+        },
+        {
+            provide: ScopeService,
+            useFactory: (dataSource) => new ScopeService(dataSource),
+            inject: [(0, typeorm_1.getDataSourceToken)(options.dataSourceName)],
+        },
+        {
+            provide: RoleService,
+            useFactory: (dataSource) => new RoleService(dataSource),
             inject: [(0, typeorm_1.getDataSourceToken)(options.dataSourceName)],
         },
         GoogleAuthService,
@@ -75,6 +87,8 @@ const authExports = [
     AuthService,
     AdminAuthService,
     ApiKeyService,
+    ScopeService,
+    RoleService,
     GoogleAuthService,
     jwt_auth_guard_1.JwtAuthGuard,
     jwt_refresh_guard_1.JwtRefreshGuard,

package/dist/auth/auth.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAKwB;AACxB,qCAAoE;AACpE,+CAAkD;AAClD,6CAAqD;AAErD,2DAAuD;AACvD,oEAAgE;AAChE,0DAAqD;AACrD,4DAAuD;AACvD,kEAA6D;AAC7D,0EAAqE;AACrE,0DAAsD;AACtD,iEAA6D;AAC7D,6EAAwE;AACxE,yEAAoE;AACpE,+CAA2C;AAI3C,MAAM,CAAC,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,GACrE,wBAAU,CAAC,QAAQ,CAAC;AAEtB,SAAS,iBAAiB;IACxB,OAAO;QACL,4BAAY;QACZ,yBAAc,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;QAEnD,eAAS,CAAC,aAAa,CAAC;YACtB,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;gBACjB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;gBACvC,WAAW,EAAE;oBACX,SAAS,EAAE,OAAO,CAAC,GAAG;yBACnB,mBAAkD;iBACtD;aACF,CAAC;SACH,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAAC,UAA6B,EAAE;IAC1D,OAAO;QACL;YACE,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,CACV,UAAsB,EACtB,YAA0B,EAC1B,UAAsB,EACtB,EAAE,CAAC,IAAI,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC;YAC1D,MAAM,EAAE;gBACN,gBAAU;gBACV,4BAAY;gBACZ,IAAA,4BAAkB,EAAC,OAAO,CAAC,cAAc,CAAC;aAC3C;SACF;QACD;YACE,OAAO,EAAE,gBAAgB;YACzB,UAAU,EAAE,CAAC,UAAsB,EAAE,UAAsB,EAAE,EAAE,CAC7D,IAAI,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC;YAC9C,MAAM,EAAE,CAAC,gBAAU,EAAE,IAAA,4BAAkB,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SACjE;QACD;YACE,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,UAAU,CAAC;YACrE,MAAM,EAAE,CAAC,IAAA,4BAAkB,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SACrD;QACD,iBAAiB;QACjB,0BAAW;QACX,yCAAkB;QAClB,6BAAY;QACZ,mCAAe;QACf,2BAAW;QACX,8BAAa;QACb,yCAAkB;QAClB,qCAAgB;KACjB,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG;IAClB,WAAW;IACX,gBAAgB;IAChB,aAAa;IACb,iBAAiB;IACjB,6BAAY;IACZ,mCAAe;IACf,2BAAW;IACX,8BAAa;IACb,yCAAkB;IAClB,qCAAgB;IAChB,eAAS;IACT,yBAAc;CACf,CAAC;AAYK,IAAM,UAAU,kBAAhB,MAAM,UAAU;IACrB,MAAM,CAAC,QAAQ,CAAC,UAA6B,EAAE;QAC7C,OAAO;YACL,MAAM,EAAE,YAAU;YAClB,OAAO,EAAE,iBAAiB,EAAE;YAC5B,WAAW,EAAE,CAAC,GAAG,wBAAU,CAAC,WAAW,CAAC;YACxC,SAAS,EAAE,mBAAmB,CAAC,OAAO,CAAC;YACvC,OAAO,EAAE,WAAW;SACrB,CAAC;IACJ,CAAC;CACF,CAAA;AAVY,gCAAU;qBAAV,UAAU;IANtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,iBAAiB,EAAE;QAC5B,WAAW,EAAE,CAAC,GAAG,wBAAU,CAAC,WAAW,CAAC;QACxC,SAAS,EAAE,mBAAmB,EAAE;QAChC,OAAO,EAAE,WAAW;KACrB,CAAC;GACW,UAAU,CAUtB"}
+{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":"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"}

package/dist/auth/entities/api.key.entity.d.ts

@@ -1,12 +1,15 @@
 import { CommonAdminEntity } from '../../common/entities/common.admin.entity';
+import { TenantEntity } from '../../tenant/entities/tenant.entity';
 export declare class ApiKeyEntity extends CommonAdminEntity {
     is_active: boolean;
     name: string;
     key_prefix: string;
     key_hash: string;
-    scopes: string[];
+    key_encrypted: string;
+    tenant_id: string;
     expires_at: Date;
     revoked_at: Date;
     last_used_at: Date;
+    tenant: TenantEntity;
 }
 //# sourceMappingURL=api.key.entity.d.ts.map

package/dist/auth/entities/api.key.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.entity.d.ts","sourceRoot":"","sources":["../../../src/auth/entities/api.key.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAE9E,qBACa,YAAa,SAAQ,iBAAiB;IAEjD,SAAS,EAAE,OAAO,CAAC;IAGnB,IAAI,EAAE,MAAM,CAAC;IAIb,UAAU,EAAE,MAAM,CAAC;IAInB,QAAQ,EAAE,MAAM,CAAC;IAIjB,MAAM,EAAE,MAAM,EAAE,CAAC;IAGjB,UAAU,EAAE,IAAI,CAAC;IAGjB,UAAU,EAAE,IAAI,CAAC;IAGjB,YAAY,EAAE,IAAI,CAAC;CACpB"}
+{"version":3,"file":"api.key.entity.d.ts","sourceRoot":"","sources":["../../../src/auth/entities/api.key.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,qBACa,YAAa,SAAQ,iBAAiB;IAEjD,SAAS,EAAE,OAAO,CAAC;IAGnB,IAAI,EAAE,MAAM,CAAC;IAIb,UAAU,EAAE,MAAM,CAAC;IAInB,QAAQ,EAAE,MAAM,CAAC;IAQjB,aAAa,EAAE,MAAM,CAAC;IAGtB,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,IAAI,CAAC;IAGjB,UAAU,EAAE,IAAI,CAAC;IAGjB,YAAY,EAAE,IAAI,CAAC;IAInB,MAAM,EAAE,YAAY,CAAC;CACtB"}

package/dist/auth/entities/api.key.entity.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiKeyEntity = void 0;
 const typeorm_1 = require("typeorm");
 const common_admin_entity_1 = require("../../common/entities/common.admin.entity");
+const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
 let ApiKeyEntity = class ApiKeyEntity extends common_admin_entity_1.CommonAdminEntity {
 };
 exports.ApiKeyEntity = ApiKeyEntity;
@@ -32,9 +33,13 @@ __decorate([
     __metadata("design:type", String)
 ], ApiKeyEntity.prototype, "key_hash", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'jsonb' }),
-    __metadata("design:type", Array)
-], ApiKeyEntity.prototype, "scopes", void 0);
+    (0, typeorm_1.Column)({ type: 'text', select: false }),
+    __metadata("design:type", String)
+], ApiKeyEntity.prototype, "key_encrypted", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'uuid', nullable: true }),
+    __metadata("design:type", String)
+], ApiKeyEntity.prototype, "tenant_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'timestamptz' }),
     __metadata("design:type", Date)
@@ -47,6 +52,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'timestamptz' }),
     __metadata("design:type", Date)
 ], ApiKeyEntity.prototype, "last_used_at", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => tenant_entity_1.TenantEntity),
+    (0, typeorm_1.JoinColumn)({ name: 'tenant_id' }),
+    __metadata("design:type", tenant_entity_1.TenantEntity)
+], ApiKeyEntity.prototype, "tenant", void 0);
 exports.ApiKeyEntity = ApiKeyEntity = __decorate([
     (0, typeorm_1.Entity)({ name: 'sys_api_keys' })
 ], ApiKeyEntity);

package/dist/auth/entities/api.key.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.entity.js","sourceRoot":"","sources":["../../../src/auth/entities/api.key.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,mFAA8E;AAGvE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,uCAAiB;CA2BlD,CAAA;AA3BY,oCAAY;AAEvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;+CACxB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;0CACf;AAIb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;gDACT;AAInB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;8CACX;AAIjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;;4CACT;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BACpB,IAAI;gDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BACpB,IAAI;gDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BAClB,IAAI;kDAAC;uBA1BR,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;GACpB,YAAY,CA2BxB"}
+{"version":3,"file":"api.key.entity.js","sourceRoot":"","sources":["../../../src/auth/entities/api.key.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,mFAA8E;AAC9E,uEAAmE;AAI5D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,uCAAiB;CAsClD,CAAA;AAtCY,oCAAY;AAEvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;+CACxB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;0CACf;AAIb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;gDACT;AAInB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;8CACX;AAQjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;mDAClB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACvB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BACpB,IAAI;gDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BACpB,IAAI;gDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BAClB,IAAI;kDAAC;AAInB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;IAC7B,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BAC1B,4BAAY;4CAAC;uBArCV,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;GACpB,YAAY,CAsCxB"}

package/dist/auth/entities/tenant.scope.entity.d.ts

@@ -0,0 +1,10 @@
+import { CommonAdminEntity } from '../../common/entities/common.admin.entity';
+import { TenantEntity } from '../../tenant/entities/tenant.entity';
+import { ScopeEntity } from './scope.entity';
+export declare class TenantScopeEntity extends CommonAdminEntity {
+    tenant_id: string;
+    scope_id: string;
+    tenant: TenantEntity;
+    scope: ScopeEntity;
+}
+//# sourceMappingURL=tenant.scope.entity.d.ts.map

package/dist/auth/entities/tenant.scope.entity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tenant.scope.entity.d.ts","sourceRoot":"","sources":["../../../src/auth/entities/tenant.scope.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,qBACa,iBAAkB,SAAQ,iBAAiB;IAEtD,SAAS,EAAE,MAAM,CAAC;IAGlB,QAAQ,EAAE,MAAM,CAAC;IAIjB,MAAM,EAAE,YAAY,CAAC;IAIrB,KAAK,EAAE,WAAW,CAAC;CACpB"}

package/dist/auth/entities/tenant.scope.entity.js

@@ -0,0 +1,41 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TenantScopeEntity = void 0;
+const typeorm_1 = require("typeorm");
+const common_admin_entity_1 = require("../../common/entities/common.admin.entity");
+const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
+const scope_entity_1 = require("./scope.entity");
+let TenantScopeEntity = class TenantScopeEntity extends common_admin_entity_1.CommonAdminEntity {
+};
+exports.TenantScopeEntity = TenantScopeEntity;
+__decorate([
+    (0, typeorm_1.Column)({ type: 'uuid' }),
+    __metadata("design:type", String)
+], TenantScopeEntity.prototype, "tenant_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'uuid' }),
+    __metadata("design:type", String)
+], TenantScopeEntity.prototype, "scope_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => tenant_entity_1.TenantEntity),
+    (0, typeorm_1.JoinColumn)({ name: 'tenant_id' }),
+    __metadata("design:type", tenant_entity_1.TenantEntity)
+], TenantScopeEntity.prototype, "tenant", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => scope_entity_1.ScopeEntity),
+    (0, typeorm_1.JoinColumn)({ name: 'scope_id' }),
+    __metadata("design:type", scope_entity_1.ScopeEntity)
+], TenantScopeEntity.prototype, "scope", void 0);
+exports.TenantScopeEntity = TenantScopeEntity = __decorate([
+    (0, typeorm_1.Entity)({ name: 'sys_tenant_scopes' })
+], TenantScopeEntity);
+//# sourceMappingURL=tenant.scope.entity.js.map

package/dist/auth/entities/tenant.scope.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tenant.scope.entity.js","sourceRoot":"","sources":["../../../src/auth/entities/tenant.scope.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,mFAA8E;AAC9E,uEAAmE;AACnE,iDAA6C;AAItC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,uCAAiB;CAcvD,CAAA;AAdY,8CAAiB;AAE5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;oDACP;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;mDACR;AAIjB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;IAC7B,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BAC1B,4BAAY;iDAAC;AAIrB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,0BAAW,CAAC;IAC5B,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;8BAC1B,0BAAW;gDAAC;4BAbR,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;GACzB,iBAAiB,CAc7B"}

package/dist/auth/enums/api.key.default.enum.d.ts

@@ -2,6 +2,7 @@ export declare enum ApiKeyDefault {
     PREFIX = "ak",
     HEADER_NAME = "x-api-key",
     RANDOM_BYTES = 24,
-    PREFIX_VISIBLE_LENGTH = 11
+    PREFIX_VISIBLE_LENGTH = 11,
+    WILDCARD_SCOPE = "*"
 }
 //# sourceMappingURL=api.key.default.enum.d.ts.map

package/dist/auth/enums/api.key.default.enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.default.enum.d.ts","sourceRoot":"","sources":["../../../src/auth/enums/api.key.default.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,MAAM,OAAO;IACb,WAAW,cAAc;IACzB,YAAY,KAAK;IAEjB,qBAAqB,KAAK;CAC3B"}
+{"version":3,"file":"api.key.default.enum.d.ts","sourceRoot":"","sources":["../../../src/auth/enums/api.key.default.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,MAAM,OAAO;IACb,WAAW,cAAc;IACzB,YAAY,KAAK;IAEjB,qBAAqB,KAAK;IAE1B,cAAc,MAAM;CACrB"}

package/dist/auth/enums/api.key.default.enum.js

@@ -7,5 +7,6 @@ var ApiKeyDefault;
     ApiKeyDefault["HEADER_NAME"] = "x-api-key";
     ApiKeyDefault[ApiKeyDefault["RANDOM_BYTES"] = 24] = "RANDOM_BYTES";
     ApiKeyDefault[ApiKeyDefault["PREFIX_VISIBLE_LENGTH"] = 11] = "PREFIX_VISIBLE_LENGTH";
+    ApiKeyDefault["WILDCARD_SCOPE"] = "*";
 })(ApiKeyDefault || (exports.ApiKeyDefault = ApiKeyDefault = {}));
 //# sourceMappingURL=api.key.default.enum.js.map

package/dist/auth/enums/api.key.default.enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.key.default.enum.js","sourceRoot":"","sources":["../../../src/auth/enums/api.key.default.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,0CAAyB,CAAA;IACzB,kEAAiB,CAAA;IAEjB,oFAA0B,CAAA;AAC5B,CAAC,EANW,aAAa,6BAAb,aAAa,QAMxB"}
+{"version":3,"file":"api.key.default.enum.js","sourceRoot":"","sources":["../../../src/auth/enums/api.key.default.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAQX;AARD,WAAY,aAAa;IACvB,8BAAa,CAAA;IACb,0CAAyB,CAAA;IACzB,kEAAiB,CAAA;IAEjB,oFAA0B,CAAA;IAE1B,qCAAoB,CAAA;AACtB,CAAC,EARW,aAAa,6BAAb,aAAa,QAQxB"}

package/dist/auth/es6.classes.d.ts

@@ -1,6 +1,8 @@
 import { AuthController } from './controllers/auth.controller';
 import { AdminAuthController } from './controllers/admin.auth.controller';
 import { ApiKeyService } from './services/api.key.service';
+import { ScopeService } from './services/scope.service';
+import { RoleService } from './services/role.service';
 import { AuthService } from './services/auth.service';
 import { AdminAuthService } from './services/admin.auth.service';
 import { GoogleAuthService } from './services/google.auth.service';
@@ -11,7 +13,7 @@ import { LoginDto } from './dtos/login.dto';
 import { RefreshTokenDto } from './dtos/refresh.token.dto';
 export declare const es6Classes: {
     controllers: (typeof AuthController | typeof AdminAuthController)[];
-    services: readonly [typeof ApiKeyService, typeof AuthService, typeof AdminAuthService, typeof GoogleAuthService];
+    services: readonly [typeof ApiKeyService, typeof ScopeService, typeof AuthService, typeof AdminAuthService, typeof GoogleAuthService, typeof RoleService];
     libraries: any[];
     dtos: (typeof LoginDto | typeof GoogleLoginDto | typeof RefreshTokenDto | typeof ChangePasswordDto | typeof AdminLoginDto)[];
     jobs: any[];

package/dist/auth/es6.classes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"es6.classes.d.ts","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,eAAO,MAAM,UAAU;;;;;;;CAmBtB,CAAC"}
+{"version":3,"file":"es6.classes.d.ts","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,eAAO,MAAM,UAAU;;;;;;;CAqBtB,CAAC"}

package/dist/auth/es6.classes.js

@@ -4,6 +4,8 @@ exports.es6Classes = void 0;
 const auth_controller_1 = require("./controllers/auth.controller");
 const admin_auth_controller_1 = require("./controllers/admin.auth.controller");
 const api_key_service_1 = require("./services/api.key.service");
+const scope_service_1 = require("./services/scope.service");
+const role_service_1 = require("./services/role.service");
 const auth_service_1 = require("./services/auth.service");
 const admin_auth_service_1 = require("./services/admin.auth.service");
 const google_auth_service_1 = require("./services/google.auth.service");
@@ -17,9 +19,11 @@ exports.es6Classes = {
     controllers: [auth_controller_1.AuthController, admin_auth_controller_1.AdminAuthController],
     services: [
         api_key_service_1.ApiKeyService,
+        scope_service_1.ScopeService,
         auth_service_1.AuthService,
         admin_auth_service_1.AdminAuthService,
         google_auth_service_1.GoogleAuthService,
+        role_service_1.RoleService,
     ],
     libraries: [],
     dtos: [

package/dist/auth/es6.classes.js.map

@@ -1 +1 @@
-{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAC/D,+EAA0E;AAC1E,gEAA2D;AAC3D,0DAAsD;AACtD,sEAAiE;AACjE,wEAAmE;AACnE,4DAAuD;AACvD,oEAA+D;AAC/D,8DAAyD;AACzD,gDAA4C;AAC5C,gEAA2D;AAC3D,sDAAkD;AAErC,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE,CAAC,gCAAc,EAAE,2CAAmB,CAAC;IAClD,QAAQ,EAAE;QACR,+BAAa;QACb,0BAAW;QACX,qCAAgB;QAChB,uCAAiB;KACT;IACV,SAAS,EAAE,EAAE;IACb,IAAI,EAAE;QACJ,+BAAa;QACb,uCAAiB;QACjB,iCAAc;QACd,oBAAQ;QACR,mCAAe;QACf,0BAAW;KACZ;IACD,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,EAAE;CAChB,CAAC"}
+{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/auth/es6.classes.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAC/D,+EAA0E;AAC1E,gEAA2D;AAC3D,4DAAwD;AACxD,0DAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,wEAAmE;AACnE,4DAAuD;AACvD,oEAA+D;AAC/D,8DAAyD;AACzD,gDAA4C;AAC5C,gEAA2D;AAC3D,sDAAkD;AAErC,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE,CAAC,gCAAc,EAAE,2CAAmB,CAAC;IAClD,QAAQ,EAAE;QACR,+BAAa;QACb,4BAAY;QACZ,0BAAW;QACX,qCAAgB;QAChB,uCAAiB;QACjB,0BAAW;KACH;IACV,SAAS,EAAE,EAAE;IACb,IAAI,EAAE;QACJ,+BAAa;QACb,uCAAiB;QACjB,iCAAc;QACd,oBAAQ;QACR,mCAAe;QACf,0BAAW;KACZ;IACD,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,EAAE;CAChB,CAAC"}

package/dist/auth/guards/api.key.guard.js

@@ -41,7 +41,7 @@ let ApiKeyGuard = class ApiKeyGuard {
             context.getClass(),
         ]) ?? [];
         for (const scope of requiredScopes) {
-            if (!this.apiKeyService.hasScope(apiKey, scope)) {
+            if (!(await this.apiKeyService.hasScope(apiKey, scope))) {
                 throw new access_exception_1.AccessException(`API key is missing the "${scope}" scope.`);
             }
         }