@neohm/nestend 4.1.1 → 5.0.1

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

@@ -6,13 +6,47 @@ 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 scope_cascade_1 = require("../../auth/utilities/scope.cascade");
+const audit_action_enum_1 = require("../../common/enums/audit.action.enum");
+const entity_constants_1 = require("../../constants/entity.constants");
 const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
+const tenant_revocation_1 = require("../../tenant/utilities/tenant.revocation");
+const admin_audit_1 = require("../utilities/admin.audit");
+const AUDITED = [
+    'name',
+    'slug',
+    'domain',
+    'logo_url',
+    'poc_name',
+    'poc_email',
+    'poc_contact',
+    'address_line1',
+    'address_line2',
+    'city',
+    'state',
+    'postal_code',
+    'country',
+    'is_active',
+];
+const OPTIONAL_FIELDS = [
+    'logo_url',
+    'poc_name',
+    'poc_email',
+    'poc_contact',
+    'address_line1',
+    'address_line2',
+    'city',
+    'state',
+    'postal_code',
+    'country',
+];
 class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
     constructor(actor, tenantOnboardedMailJob) {
         super();
         this.actor = actor;
         this.tenantOnboardedMailJob = tenantOnboardedMailJob;
         this.logger = new common_1.Logger(TenantDataProcessor.name);
+        this.existing = null;
     }
     async process(payload) {
         this.payload = payload;
@@ -21,13 +55,20 @@ class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
     }
     async validate() {
         const body = this.payload;
-        if (body.id && !(await tenant_entity_1.TenantEntity.existsBy({ id: body.id })))
-            this.setColumnError('id', 'No tenant exists for this id');
-        const slugOwner = await tenant_entity_1.TenantEntity.findOne({
-            where: { slug: body.slug },
-        });
-        if (slugOwner && slugOwner.id !== body.id)
+        const others = body.id ? { id: (0, typeorm_1.Not)(body.id) } : {};
+        if (body.id) {
+            this.existing = await tenant_entity_1.TenantEntity.findOne({ where: { id: body.id } });
+            if (!this.existing)
+                this.setColumnError('id', 'No tenant exists for this id');
+        }
+        if (await tenant_entity_1.TenantEntity.existsBy({ ...others, slug: body.slug }))
             this.setColumnError('slug', 'Slug is already in use');
+        if (body.domain &&
+            (await tenant_entity_1.TenantEntity.existsBy({
+                ...others,
+                domain: body.domain.toLowerCase(),
+            })))
+            this.setColumnError('domain', 'Domain is already in use');
         await this.validateScopes();
         this.raiseExceptionOnValidationFailure();
     }
@@ -43,61 +84,57 @@ class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
     }
     async set() {
         const body = this.payload;
-        let isNew = true;
-        let tenant = tenant_entity_1.TenantEntity.create({
-            onboarded_at: new Date(),
-            created_by: this.actor.id,
-        });
-        if (body.id) {
-            const exists = await tenant_entity_1.TenantEntity.findOne({ where: { id: body.id } });
-            if (exists) {
-                tenant = exists;
-                isNew = false;
-            }
-        }
+        const isNew = !this.existing;
+        const before = admin_audit_1.AdminAudit.pick(this.existing, AUDITED);
+        const wasActive = this.existing?.is_active ?? false;
+        const tenant = this.existing ??
+            tenant_entity_1.TenantEntity.create({
+                onboarded_at: new Date(),
+                created_by: this.actor.id,
+                attributes: {},
+            });
         tenant.name = body.name;
         tenant.slug = body.slug;
-        tenant.domain = body.domain;
-        tenant.logo_url = body.logo_url;
-        tenant.poc_name = body.poc_name;
-        tenant.poc_email = body.poc_email;
-        tenant.poc_contact = body.poc_contact;
-        tenant.address_line1 = body.address_line1;
-        tenant.address_line2 = body.address_line2;
-        tenant.city = body.city;
-        tenant.state = body.state;
-        tenant.postal_code = body.postal_code;
-        tenant.country = body.country;
-        tenant.is_active = body.is_active ?? true;
-        tenant.attributes = body.attributes ?? {};
-        tenant.contract_expires_at = body.contract_expires_at
-            ? new Date(body.contract_expires_at)
-            : undefined;
+        for (const field of OPTIONAL_FIELDS)
+            if (body[field] !== undefined)
+                tenant[field] = body[field];
+        if (body.domain !== undefined)
+            tenant.domain = body.domain.toLowerCase();
+        tenant.is_active = body.is_active ?? tenant.is_active ?? true;
+        if (body.attributes !== undefined)
+            tenant.attributes = body.attributes;
+        if (body.contract_expires_at !== undefined)
+            tenant.contract_expires_at = new Date(body.contract_expires_at);
         if (!isNew)
             tenant.updated_by = this.actor.id;
-        await tenant.save();
-        await this.setScopes(tenant);
+        await tenant_entity_1.TenantEntity.getRepository().manager.transaction(async (trx) => {
+            await trx.save(tenant);
+            let scopeChange = {};
+            if (body.scope_ids !== undefined) {
+                const previous = (await trx.find(tenant_scope_entity_1.TenantScopeEntity, {
+                    where: { tenant_id: tenant.id },
+                    select: { scope_id: true },
+                })).map((grant) => grant.scope_id);
+                await scope_cascade_1.ScopeCascade.setTenantScopes(trx, tenant.id, [...new Set(body.scope_ids)], this.actor.id);
+                scopeChange = { previous_scope_ids: previous, scope_ids: body.scope_ids };
+            }
+            const suspended = wasActive && !tenant.is_active;
+            if (suspended)
+                await tenant_revocation_1.TenantRevocation.revoke(trx, tenant.id);
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor: this.actor,
+                sourceType: entity_constants_1.baseEntityConstants.tenant,
+                sourceId: tenant.id,
+                action: isNew ? audit_action_enum_1.AuditAction.CREATE : audit_action_enum_1.AuditAction.UPDATE,
+                oldValue: before,
+                newValue: admin_audit_1.AdminAudit.pick(tenant, AUDITED),
+                context: { ...scopeChange, ...(suspended ? { suspended: true } : {}) },
+            });
+        });
         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.softDelete();
-        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 data = {
             tenant_name: tenant.name,
@@ -109,7 +146,7 @@ class TenantDataProcessor extends common_data_processor_1.CommonDataProcessor {
             await this.tenantOnboardedMailJob.dispatch(data);
         }
         catch (error) {
-            this.logger.warn(`Failed to queue the tenant onboarding email for ${tenant.poc_email}: ${error.message}`);
+            this.logger.warn(`Failed to queue the tenant onboarding email for tenant ${tenant.id}: ${error.message}`);
         }
     }
 }

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":";;;AAAA,2CAAwC;AACxC,qCAA6B;AAC7B,wFAAmF;AAEnF,mEAA+D;AAC/D,iFAA4E;AAC5E,uEAAmE;AAWnE,MAAa,mBAAoB,SAAQ,2CAAmB;IAI1D,YACmB,KAAsB,EACtB,sBAA8C;QAE/D,KAAK,EAAE,CAAC;QAHS,UAAK,GAAL,KAAK,CAAiB;QACtB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAJhD,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAO/D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAqB;QACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAE1B,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,MAAM,4BAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,8BAA8B,CAAC,CAAC;QAI5D,MAAM,SAAS,GAAG,MAAM,4BAAY,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;SAC3B,CAAC,CAAC;QACH,IAAI,SAAS,IAAI,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;YACvC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO;QAE7B,MAAM,MAAM,GAAG,MAAM,0BAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvD,KAAK,MAAM,OAAO,IAAI,QAAQ;YAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC;gBACrB,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,UAAU,OAAO,aAAa,CAAC,CAAC;IACvE,CAAC;IAEO,KAAK,CAAC,GAAG;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAC1B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,MAAM,GAAG,4BAAY,CAAC,MAAM,CAAC;YAC/B,YAAY,EAAE,IAAI,IAAI,EAAE;YACxB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;SAC1B,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACtE,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,MAAM,CAAC;gBAChB,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;QACH,CAAC;QAED,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACtC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAC1C,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAC1C,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACtC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;QAC1C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;QAC1C,MAAM,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB;YACnD,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;YACpC,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,KAAK;YAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAE9C,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,KAAK;YAAE,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAE3C,OAAO,MAAM,CAAC;IAChB,CAAC;IAWO,KAAK,CAAC,SAAS,CAAC,MAAoB;QAC1C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAEvD,MAAM,QAAQ,GAAG,MAAM,uCAAiB,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE;SAChC,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC9B,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CACpD,CAAC;QAEF,KAAK,MAAM,WAAW,IAAI,QAAQ;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC;gBAAE,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;QAE1E,KAAK,MAAM,OAAO,IAAI,QAAQ;YAC5B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC;gBAChC,MAAM,uCAAiB,CAAC,MAAM,CAAC;oBAC7B,SAAS,EAAE,MAAM,CAAC,EAAE;oBACpB,QAAQ,EAAE,OAAO;oBACjB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;iBAC1B,CAAC,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IASO,KAAK,CAAC,YAAY,CAAC,MAAoB;QAE7C,MAAM,IAAI,GAA2B;YACnC,WAAW,EAAE,MAAM,CAAC,IAAI;YACxB,UAAU,EAAE,MAAM,CAAC,QAAQ;YAC3B,YAAY,EAAE,MAAM,CAAC,SAAS;YAC9B,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;SAC9C,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,mDAAmD,MAAM,CAAC,SAAS,KAAM,KAAe,CAAC,OAAO,EAAE,CACnG,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAlJD,kDAkJC"}
+{"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

@@ -5,5 +5,6 @@ export declare class TenantDeleteProcessor extends CommonDataProcessor {
     private readonly actor;
     constructor(actor: AdminUserEntity);
     process(id: string): Promise<DeleteResult>;
+    private repointStayers;
 }
 //# sourceMappingURL=tenant.delete.processor.d.ts.map

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;AAUxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAepD,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;CAoDjD"}
+{"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;AAcxE,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;YAiElC,cAAc;CAiB7B"}

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

@@ -10,52 +10,80 @@ const user_entity_1 = require("../../auth/entities/user.entity");
 const tenant_user_entity_1 = require("../../auth/entities/tenant.user.entity");
 const user_role_entity_1 = require("../../auth/entities/user.role.entity");
 const tenant_invitation_entity_1 = require("../../auth/entities/tenant.invitation.entity");
-const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
 const access_revocation_1 = require("../../auth/utilities/access.revocation");
+const audit_action_enum_1 = require("../../common/enums/audit.action.enum");
+const entity_constants_1 = require("../../constants/entity.constants");
+const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
+const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
+const tenant_revocation_1 = require("../../tenant/utilities/tenant.revocation");
+const admin_audit_1 = require("../utilities/admin.audit");
 class TenantDeleteProcessor extends common_data_processor_1.CommonDataProcessor {
     constructor(actor) {
         super();
         this.actor = actor;
     }
     async process(id) {
-        if (!(await tenant_entity_1.TenantEntity.existsBy({ id })))
-            this.setColumnError('id', 'No tenant exists for this id');
-        this.raiseExceptionOnValidationFailure();
-        const memberIds = (await tenant_user_entity_1.TenantUserEntity.find({
-            where: { tenant_id: id },
-            select: { user_id: true },
-        })).map((membership) => membership.user_id);
-        const staying = new Set(memberIds.length
-            ? (await tenant_user_entity_1.TenantUserEntity.find({
-                where: { user_id: (0, typeorm_1.In)(memberIds), tenant_id: (0, typeorm_1.Not)(id) },
-                select: { user_id: true },
-            })).map((membership) => membership.user_id)
-            : []);
-        const leaving = memberIds.filter((userId) => !staying.has(userId));
-        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) => {
+            const tenant = await trx.findOne(tenant_entity_1.TenantEntity, {
+                where: { id },
+                lock: { mode: 'pessimistic_write' },
+            });
+            if (!tenant)
+                throw new not_found_exception_1.NotFoundException('No tenant exists for this id');
+            const memberIds = (await trx.find(tenant_user_entity_1.TenantUserEntity, {
+                where: { tenant_id: id },
+                select: { user_id: true },
+            })).map((membership) => membership.user_id);
+            const otherMemberships = memberIds.length
+                ? await trx.find(tenant_user_entity_1.TenantUserEntity, {
+                    where: { user_id: (0, typeorm_1.In)(memberIds), tenant_id: (0, typeorm_1.Not)(id) },
+                    select: { user_id: true, tenant_id: true },
+                })
+                : [];
+            const staying = new Set(otherMemberships.map((m) => m.user_id));
+            const leaving = memberIds.filter((userId) => !staying.has(userId));
             for (const userId of leaving)
                 await access_revocation_1.AccessRevocation.revokeAll(trx, userId, false);
-            await access_revocation_1.AccessRevocation.revokeOrganization(trx, id);
+            await tenant_revocation_1.TenantRevocation.revoke(trx, id);
             if (leaving.length)
                 await trx.softDelete(user_entity_1.UserEntity, leaving);
+            await this.repointStayers(trx, id, otherMemberships);
             await trx.softDelete(user_role_entity_1.UserRoleEntity, { tenant_id: id });
             await trx.softDelete(tenant_user_entity_1.TenantUserEntity, { tenant_id: id });
             await trx.softDelete(tenant_invitation_entity_1.TenantInvitationEntity, { tenant_id: 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() });
+            const apiKeyIds = (await trx.find(api_key_entity_1.ApiKeyEntity, {
+                where: { tenant_id: id, deleted_at: (0, typeorm_1.IsNull)() },
+                select: { id: true },
+            })).map((apiKey) => apiKey.id);
+            if (apiKeyIds.length) {
                 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(api_key_entity_1.ApiKeyEntity, { id: (0, typeorm_1.In)(apiKeyIds) });
             }
             await trx.softDelete(tenant_scope_entity_1.TenantScopeEntity, { tenant_id: id });
+            await trx.update(tenant_entity_1.TenantEntity, { id }, { updated_by: this.actor.id });
             await trx.softDelete(tenant_entity_1.TenantEntity, { id });
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor: this.actor,
+                sourceType: entity_constants_1.baseEntityConstants.tenant,
+                sourceId: id,
+                action: audit_action_enum_1.AuditAction.SOFT_DELETE,
+                oldValue: admin_audit_1.AdminAudit.pick(tenant, ['name', 'slug', 'is_active']),
+                context: {
+                    deleted_user_ids: leaving,
+                    revoked_api_key_ids: apiKeyIds,
+                },
+            });
         });
         return { id, deleted: true, deleted_by: this.actor.id };
     }
+    async repointStayers(trx, tenantId, otherMemberships) {
+        const nextTenant = new Map();
+        for (const membership of otherMemberships)
+            if (!nextTenant.has(membership.user_id))
+                nextTenant.set(membership.user_id, membership.tenant_id);
+        for (const [userId, nextTenantId] of nextTenant)
+            await trx.update(user_entity_1.UserEntity, { id: userId, organization_id: tenantId }, { organization_id: nextTenantId });
+    }
 }
 exports.TenantDeleteProcessor = TenantDeleteProcessor;
 //# sourceMappingURL=tenant.delete.processor.js.map

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":"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"}
+{"version":3,"file":"tenant.delete.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/tenant.delete.processor.ts"],"names":[],"mappings":";;;AAAA,qCAAyD;AACzD,wFAAmF;AAEnF,uEAAkE;AAClE,2EAAsE;AACtE,iFAA4E;AAC5E,iEAA6D;AAC7D,+EAA0E;AAC1E,2EAAsE;AACtE,2FAAsF;AACtF,8EAA0E;AAC1E,4EAAmE;AACnE,uEAAuE;AACvE,qFAAgF;AAChF,uEAAmE;AACnE,gFAA4E;AAE5E,0DAAsD;AAUtD,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,MAAM,4BAAY,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACnE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,4BAAY,EAAE;gBAC7C,KAAK,EAAE,EAAE,EAAE,EAAE;gBACb,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE;aACpC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,uCAAiB,CAAC,8BAA8B,CAAC,CAAC;YAEzE,MAAM,SAAS,GAAG,CAChB,MAAM,GAAG,CAAC,IAAI,CAAC,qCAAgB,EAAE;gBAC/B,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;gBACxB,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC1B,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,gBAAgB,GAAG,SAAS,CAAC,MAAM;gBACvC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,qCAAgB,EAAE;oBAC/B,KAAK,EAAE,EAAE,OAAO,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAA,aAAG,EAAC,EAAE,CAAC,EAAE;oBACrD,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;iBAC3C,CAAC;gBACJ,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAChE,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YAEnE,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC1B,MAAM,oCAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAEvD,MAAM,oCAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACvC,IAAI,OAAO,CAAC,MAAM;gBAAE,MAAM,GAAG,CAAC,UAAU,CAAC,wBAAU,EAAE,OAAO,CAAC,CAAC;YAC9D,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAErD,MAAM,GAAG,CAAC,UAAU,CAAC,iCAAc,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,MAAM,GAAG,CAAC,UAAU,CAAC,qCAAgB,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1D,MAAM,GAAG,CAAC,UAAU,CAAC,iDAAsB,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAEhE,MAAM,SAAS,GAAG,CAChB,MAAM,GAAG,CAAC,IAAI,CAAC,6BAAY,EAAE;gBAC3B,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE;gBAC9C,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;aACrB,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC7B,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACrB,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,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC5D,CAAC;YACD,MAAM,GAAG,CAAC,UAAU,CAAC,uCAAiB,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAC,MAAM,CAAC,4BAAY,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACtE,MAAM,GAAG,CAAC,UAAU,CAAC,4BAAY,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAE3C,MAAM,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,UAAU,EAAE,sCAAmB,CAAC,MAAM;gBACtC,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,+BAAW,CAAC,WAAW;gBAC/B,QAAQ,EAAE,wBAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAChE,OAAO,EAAE;oBACP,gBAAgB,EAAE,OAAO;oBACzB,mBAAmB,EAAE,SAAS;iBAC/B;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1D,CAAC;IAGO,KAAK,CAAC,cAAc,CAC1B,GAAkB,EAClB,QAAgB,EAChB,gBAAmE;QAEnE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC7C,KAAK,MAAM,UAAU,IAAI,gBAAgB;YACvC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;gBACrC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QAE7D,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,UAAU;YAC7C,MAAM,GAAG,CAAC,MAAM,CACd,wBAAU,EACV,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,EACzC,EAAE,eAAe,EAAE,YAAY,EAAE,CAClC,CAAC;IACN,CAAC;CACF;AAvFD,sDAuFC"}

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

@@ -1,6 +1,7 @@
 import { CommonDataProcessor } from '../../common/libraries/common.data.processor';
 import { UserEntity } from '../../auth/entities/user.entity';
 export declare abstract class UserDataProcessor extends CommonDataProcessor {
+    static readonly AUDITED: (keyof UserEntity)[];
     protected validateEmail(email: string, field?: string, excludeUserId?: string): Promise<void>;
     protected validateContact(contact: string | undefined, contactCode: string | undefined, field?: string, excludeUserId?: string): Promise<void>;
     protected validatePassword(password: string | undefined, isEdit: boolean, field?: string): void;

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

@@ -1 +1 @@
-{"version":3,"file":"user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAO7D,8BAAsB,iBAAkB,SAAQ,mBAAmB;cASjD,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,KAAK,SAAU,EACf,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;cAUA,eAAe,CAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,KAAK,SAAY,EACjB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;IAiBhB,SAAS,CAAC,gBAAgB,CACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,OAAO,EACf,KAAK,SAAa,GACjB,IAAI;IAMP,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC;CAIzD"}
+{"version":3,"file":"user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAO7D,8BAAsB,iBAAkB,SAAQ,mBAAmB;IAEjE,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,UAAU,CAAC,EAAE,CAS3C;cAUc,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,KAAK,SAAU,EACf,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;cAUA,eAAe,CAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,KAAK,SAAY,EACjB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;IAiBhB,SAAS,CAAC,gBAAgB,CACxB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,OAAO,EACf,KAAK,SAAa,GACjB,IAAI;IAMP,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC;CAIzD"}

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

@@ -37,4 +37,14 @@ class UserDataProcessor extends common_data_processor_1.CommonDataProcessor {
     }
 }
 exports.UserDataProcessor = UserDataProcessor;
+UserDataProcessor.AUDITED = [
+    'full_name',
+    'email',
+    'email_verified_at',
+    'country',
+    'contact_code',
+    'contact',
+    'active',
+    'has_global_access',
+];
 //# sourceMappingURL=user.data.processor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/user.data.processor.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,wFAAmF;AACnF,iEAA6D;AAO7D,MAAsB,iBAAkB,SAAQ,2CAAmB;IASvD,KAAK,CAAC,aAAa,CAC3B,KAAa,EACb,KAAK,GAAG,OAAO,EACf,aAAsB;QAEtB,MAAM,KAAK,GAAG,wBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,aAAa;gBAClB,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,aAAa,CAAC,EAAE;gBAC1C,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;SACrB,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;IAC1E,CAAC;IAES,KAAK,CAAC,eAAe,CAC7B,OAA2B,EAC3B,WAA+B,EAC/B,KAAK,GAAG,SAAS,EACjB,aAAsB;QAEtB,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,KAAK,GAAiC,EAAE,OAAO,EAAE,CAAC;QACxD,IAAI,WAAW;YAAE,KAAK,CAAC,YAAY,GAAG,WAAW,CAAC;QAClD,IAAI,aAAa;YAAE,KAAK,CAAC,EAAE,GAAG,IAAA,aAAG,EAAC,aAAa,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACrD,IAAI,QAAQ;YACV,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,sCAAsC,CAAC,CAAC;IACvE,CAAC;IAOS,gBAAgB,CACxB,QAA4B,EAC5B,MAAe,EACf,KAAK,GAAG,UAAU;QAElB,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;YACtB,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;IACvD,CAAC;IAGS,YAAY,CAAuB,IAAO;QAClD,OAAQ,IAA8B,CAAC,QAAQ,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA3DD,8CA2DC"}
+{"version":3,"file":"user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/user.data.processor.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,wFAAmF;AACnF,iEAA6D;AAO7D,MAAsB,iBAAkB,SAAQ,2CAAmB;IAqBvD,KAAK,CAAC,aAAa,CAC3B,KAAa,EACb,KAAK,GAAG,OAAO,EACf,aAAsB;QAEtB,MAAM,KAAK,GAAG,wBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC;YACxC,KAAK,EAAE,aAAa;gBAClB,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,IAAA,aAAG,EAAC,aAAa,CAAC,EAAE;gBAC1C,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;SACrB,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;IAC1E,CAAC;IAES,KAAK,CAAC,eAAe,CAC7B,OAA2B,EAC3B,WAA+B,EAC/B,KAAK,GAAG,SAAS,EACjB,aAAsB;QAEtB,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,KAAK,GAAiC,EAAE,OAAO,EAAE,CAAC;QACxD,IAAI,WAAW;YAAE,KAAK,CAAC,YAAY,GAAG,WAAW,CAAC;QAClD,IAAI,aAAa;YAAE,KAAK,CAAC,EAAE,GAAG,IAAA,aAAG,EAAC,aAAa,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACrD,IAAI,QAAQ;YACV,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,sCAAsC,CAAC,CAAC;IACvE,CAAC;IAOS,gBAAgB,CACxB,QAA4B,EAC5B,MAAe,EACf,KAAK,GAAG,UAAU;QAElB,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ;YACtB,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;IACvD,CAAC;IAGS,YAAY,CAAuB,IAAO;QAClD,OAAQ,IAA8B,CAAC,QAAQ,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;;AAtEH,8CAuEC;AArEiB,yBAAO,GAAyB;IAC9C,WAAW;IACX,OAAO;IACP,mBAAmB;IACnB,SAAS;IACT,cAAc;IACd,SAAS;IACT,QAAQ;IACR,mBAAmB;CACpB,CAAC"}

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

@@ -9,8 +9,10 @@ export declare class AdminAccessService {
     validateContentManager(): Promise<AdminAuthenticatedAccess>;
     validateContentReader(): Promise<AdminAuthenticatedAccess>;
     holdsAtLeast(access: AdminAuthenticatedAccess, required: GlobalAdminRoles): boolean;
+    static holds(access: AdminAuthenticatedAccess, required: GlobalAdminRoles): boolean;
+    static assertHolds(access: AdminAuthenticatedAccess, required: GlobalAdminRoles, action: string): void;
     private requireRole;
-    private highestRank;
-    private rankOf;
+    private static highestRank;
+    private static rankOf;
 }
 //# sourceMappingURL=admin.access.service.d.ts.map

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;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"}
+{"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;IAK1D,YAAY,CACV,MAAM,EAAE,wBAAwB,EAChC,QAAQ,EAAE,gBAAgB,GACzB,OAAO;IAKV,MAAM,CAAC,KAAK,CACV,MAAM,EAAE,wBAAwB,EAChC,QAAQ,EAAE,gBAAgB,GACzB,OAAO;IAKV,MAAM,CAAC,WAAW,CAChB,MAAM,EAAE,wBAAwB,EAChC,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,GACb,IAAI;YAOO,WAAW;IAazB,OAAO,CAAC,MAAM,CAAC,WAAW;IAc1B,OAAO,CAAC,MAAM,CAAC,MAAM;CAKtB"}

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

@@ -8,13 +8,14 @@ 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 AdminAccessService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminAccessService = void 0;
 const common_1 = require("@nestjs/common");
 const admin_auth_service_1 = require("../../auth/services/admin.auth.service");
 const global_admin_roles_enum_1 = require("../../auth/enums/global.admin.roles.enum");
 const access_exception_1 = require("../../global/exceptions/access.exception");
-let AdminAccessService = class AdminAccessService {
+let AdminAccessService = AdminAccessService_1 = class AdminAccessService {
     constructor(adminAuthService) {
         this.adminAuthService = adminAuthService;
     }
@@ -31,32 +32,39 @@ let AdminAccessService = class AdminAccessService {
         return this.requireRole(global_admin_roles_enum_1.GlobalAdminRoles.GLOBAL_CONTENT_READER);
     }
     holdsAtLeast(access, required) {
-        return this.highestRank(access) >= this.rankOf(required);
+        return AdminAccessService_1.holds(access, required);
+    }
+    static holds(access, required) {
+        return AdminAccessService_1.highestRank(access) >= AdminAccessService_1.rankOf(required);
+    }
+    static assertHolds(access, required, action) {
+        if (!AdminAccessService_1.holds(access, required))
+            throw new access_exception_1.AccessException(`${action} requires at least the "${required}" role.`);
     }
     async requireRole(required) {
         const access = await this.adminAuthService.validateRole();
-        if (this.highestRank(access) < this.rankOf(required)) {
+        if (!AdminAccessService_1.holds(access, required)) {
             throw new access_exception_1.AccessException(`This action requires at least the "${required}" role.`);
         }
         return access;
     }
-    highestRank(access) {
+    static highestRank(access) {
         let highest = 0;
         for (const role of access.roles) {
-            const rank = this.rankOf(role.identifier);
+            const rank = AdminAccessService_1.rankOf(role.identifier);
             if (rank > highest)
                 highest = rank;
         }
         return highest;
     }
-    rankOf(roleIdentifier) {
+    static rankOf(roleIdentifier) {
         const seniority = Object.values(global_admin_roles_enum_1.GlobalAdminRoles);
         const index = seniority.indexOf(roleIdentifier);
         return index === -1 ? 0 : seniority.length - index;
     }
 };
 exports.AdminAccessService = AdminAccessService;
-exports.AdminAccessService = AdminAccessService = __decorate([
+exports.AdminAccessService = AdminAccessService = AdminAccessService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [admin_auth_service_1.AdminAuthService])
 ], AdminAccessService);

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;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"}
+{"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,0BAAxB,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;IAGD,YAAY,CACV,MAAgC,EAChC,QAA0B;QAE1B,OAAO,oBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAGD,MAAM,CAAC,KAAK,CACV,MAAgC,EAChC,QAA0B;QAE1B,OAAO,oBAAkB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,oBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACvF,CAAC;IAGD,MAAM,CAAC,WAAW,CAChB,MAAgC,EAChC,QAA0B,EAC1B,MAAc;QAEd,IAAI,CAAC,oBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC;YAC7C,MAAM,IAAI,kCAAe,CACvB,GAAG,MAAM,2BAA2B,QAAQ,SAAS,CACtD,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,QAA0B;QAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QAC1D,IAAI,CAAC,oBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,kCAAe,CACvB,sCAAsC,QAAQ,SAAS,CACxD,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAGO,MAAM,CAAC,WAAW,CAAC,MAAgC;QACzD,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,oBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxD,IAAI,IAAI,GAAG,OAAO;gBAAE,OAAO,GAAG,IAAI,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAOO,MAAM,CAAC,MAAM,CAAC,cAAsB;QAC1C,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;AAnFY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEoC,qCAAgB;GADpD,kBAAkB,CAmF9B"}

package/dist/admin/services/system.user.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system.user.service.d.ts","sourceRoot":"","sources":["../../../src/admin/services/system.user.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAMxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD,qBACa,iBAAiB;IAMtB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;CAaxE"}
+{"version":3,"file":"system.user.service.d.ts","sourceRoot":"","sources":["../../../src/admin/services/system.user.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAQxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAKpD,qBACa,iBAAiB;IAMtB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;CAoBxE"}

package/dist/admin/services/system.user.service.js

@@ -13,6 +13,10 @@ const user_type_enum_1 = require("../../auth/enums/user.type.enum");
 const access_revocation_1 = require("../../auth/utilities/access.revocation");
 const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
 const operation_exception_1 = require("../../global/exceptions/operation.exception");
+const audit_action_enum_1 = require("../../common/enums/audit.action.enum");
+const entity_constants_1 = require("../../constants/entity.constants");
+const admin_audit_1 = require("../utilities/admin.audit");
+const user_data_processor_1 = require("../libraries/user.data.processor");
 let SystemUserService = class SystemUserService {
     async delete(id, actor) {
         const user = await user_entity_1.UserEntity.findOne({ where: { id } });
@@ -23,6 +27,13 @@ let SystemUserService = class SystemUserService {
         await user_entity_1.UserEntity.getRepository().manager.transaction(async (trx) => {
             await access_revocation_1.AccessRevocation.revokeAll(trx, id, false);
             await trx.softDelete(user_entity_1.UserEntity, { id });
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor,
+                sourceType: entity_constants_1.baseEntityConstants.user,
+                sourceId: id,
+                action: audit_action_enum_1.AuditAction.SOFT_DELETE,
+                oldValue: admin_audit_1.AdminAudit.pick(user, user_data_processor_1.UserDataProcessor.AUDITED),
+            });
         });
         return { id, deleted: true, deleted_by: actor.id };
     }

package/dist/admin/services/system.user.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.user.service.js","sourceRoot":"","sources":["../../../src/admin/services/system.user.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,iEAA6D;AAC7D,oEAA2D;AAC3D,8EAA0E;AAC1E,qFAAgF;AAChF,qFAAiF;AAK1E,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAM5B,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAsB;QAC7C,MAAM,IAAI,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,uCAAiB,CAAC,4BAA4B,CAAC,CAAC;QACrE,IAAI,IAAI,CAAC,SAAS,KAAK,yBAAQ,CAAC,WAAW;YACzC,MAAM,IAAI,wCAAkB,CAAC,gCAAgC,CAAC,CAAC;QAEjE,MAAM,wBAAU,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACjE,MAAM,oCAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,GAAG,CAAC,UAAU,CAAC,wBAAU,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IACrD,CAAC;CACF,CAAA;AAnBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAmB7B"}
+{"version":3,"file":"system.user.service.js","sourceRoot":"","sources":["../../../src/admin/services/system.user.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,iEAA6D;AAC7D,oEAA2D;AAC3D,8EAA0E;AAC1E,qFAAgF;AAChF,qFAAiF;AACjF,4EAAmE;AACnE,uEAAuE;AAEvE,0DAAsD;AACtD,0EAAqE;AAI9D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAM5B,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAsB;QAC7C,MAAM,IAAI,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,uCAAiB,CAAC,4BAA4B,CAAC,CAAC;QACrE,IAAI,IAAI,CAAC,SAAS,KAAK,yBAAQ,CAAC,WAAW;YACzC,MAAM,IAAI,wCAAkB,CAAC,gCAAgC,CAAC,CAAC;QAEjE,MAAM,wBAAU,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACjE,MAAM,oCAAgB,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YACjD,MAAM,GAAG,CAAC,UAAU,CAAC,wBAAU,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACzC,MAAM,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;gBAC3B,KAAK;gBACL,UAAU,EAAE,sCAAmB,CAAC,IAAI;gBACpC,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,+BAAW,CAAC,WAAW;gBAC/B,QAAQ,EAAE,wBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,uCAAiB,CAAC,OAAO,CAAC;aAC3D,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IACrD,CAAC;CACF,CAAA;AA1BY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CA0B7B"}

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

@@ -3,5 +3,6 @@ import { DeleteResult } from '../types/admin.types';
 export declare class TemplateService {
     deleteEmailTemplate(id: string, actor: AdminUserEntity): Promise<DeleteResult>;
     deletePdfTemplate(id: string, actor: AdminUserEntity): Promise<DeleteResult>;
+    private softDeleteById;
 }
 //# sourceMappingURL=template.service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"template.service.d.ts","sourceRoot":"","sources":["../../../src/admin/services/template.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAIxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAepD,qBACa,eAAe;IAEpB,mBAAmB,CACvB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,YAAY,CAAC;IAUlB,iBAAiB,CACrB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,YAAY,CAAC;CAQzB"}
+{"version":3,"file":"template.service.d.ts","sourceRoot":"","sources":["../../../src/admin/services/template.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAMxE,OAAO,EAAE,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAOjE,qBACa,eAAe;IAC1B,mBAAmB,CACjB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,YAAY,CAAC;IAUxB,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;YAU9D,cAAc;CAwB7B"}

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

@@ -8,22 +8,35 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateService = void 0;
 const common_1 = require("@nestjs/common");
+const audit_action_enum_1 = require("../../common/enums/audit.action.enum");
+const entity_constants_1 = require("../../constants/entity.constants");
 const pdf_template_entity_1 = require("../../document/entities/pdf.template.entity");
 const email_template_entity_1 = require("../../notification/entities/email.template.entity");
 const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
+const admin_audit_1 = require("../utilities/admin.audit");
 let TemplateService = class TemplateService {
-    async deleteEmailTemplate(id, actor) {
-        const emailTemplate = await email_template_entity_1.EmailTemplateEntity.findOne({ where: { id } });
-        if (!emailTemplate)
-            throw new not_found_exception_1.NotFoundException('No email template exists for this id');
-        await emailTemplate.softDelete();
-        return { id, deleted: true, deleted_by: actor.id };
+    deleteEmailTemplate(id, actor) {
+        return this.softDeleteById(email_template_entity_1.EmailTemplateEntity, entity_constants_1.baseEntityConstants.emailTemplate, 'email template', id, actor);
+    }
+    deletePdfTemplate(id, actor) {
+        return this.softDeleteById(pdf_template_entity_1.PdfTemplateEntity, entity_constants_1.baseEntityConstants.pdfTemplate, 'PDF template', id, actor);
     }
-    async deletePdfTemplate(id, actor) {
-        const pdfTemplate = await pdf_template_entity_1.PdfTemplateEntity.findOne({ where: { id } });
-        if (!pdfTemplate)
-            throw new not_found_exception_1.NotFoundException('No PDF template exists for this id');
-        await pdfTemplate.softDelete();
+    async softDeleteById(target, sourceType, label, id, actor) {
+        const entity = target;
+        await target.getRepository().manager.transaction(async (trx) => {
+            const template = await trx.findOne(entity, { where: { id } });
+            if (!template)
+                throw new not_found_exception_1.NotFoundException(`No ${label} exists for this id`);
+            await trx.update(entity, { id }, { updated_by: actor.id });
+            await trx.softDelete(entity, { id });
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor,
+                sourceType,
+                sourceId: id,
+                action: audit_action_enum_1.AuditAction.SOFT_DELETE,
+                oldValue: admin_audit_1.AdminAudit.pick(template, ['identifier', 'path']),
+            });
+        });
         return { id, deleted: true, deleted_by: actor.id };
     }
 };