@neohm/nestend 4.1.1 → 5.0.0

package/dist/admin/libraries/scheduled.task.delete.processor.js

@@ -5,21 +5,32 @@ const common_data_processor_1 = require("../../common/libraries/common.data.proc
 const system_scheduled_task_entity_1 = require("../../common/entities/system.scheduled.task.entity");
 const scheduled_event_entity_1 = require("../../common/entities/scheduled.event.entity");
 const schedule_enum_1 = require("../../common/enums/schedule.enum");
+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 admin_audit_1 = require("../utilities/admin.audit");
 class ScheduledTaskDeleteProcessor extends common_data_processor_1.CommonDataProcessor {
     constructor(actor) {
         super();
         this.actor = actor;
     }
     async process(id) {
-        if (!(await system_scheduled_task_entity_1.SystemScheduledTaskEntity.existsBy({ id })))
-            this.setColumnError('id', 'No scheduled task exists for this id');
-        this.raiseExceptionOnValidationFailure();
+        const task = await system_scheduled_task_entity_1.SystemScheduledTaskEntity.findOne({ where: { id } });
+        if (!task)
+            throw new not_found_exception_1.NotFoundException('No scheduled task exists for this id');
         await system_scheduled_task_entity_1.SystemScheduledTaskEntity.getRepository().manager.transaction(async (trx) => {
             await trx.softDelete(scheduled_event_entity_1.ScheduledEventEntity, {
                 job_id: id,
                 status: schedule_enum_1.ScheduledEventStatus.PENDING,
             });
             await trx.softDelete(system_scheduled_task_entity_1.SystemScheduledTaskEntity, { id });
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor: this.actor,
+                sourceType: entity_constants_1.baseEntityConstants.systemScheduledTask,
+                sourceId: id,
+                action: audit_action_enum_1.AuditAction.SOFT_DELETE,
+                oldValue: admin_audit_1.AdminAudit.pick(task, ['identifier', 'name']),
+            });
         });
         return { id, deleted: true, deleted_by: this.actor.id };
     }

package/dist/admin/libraries/scheduled.task.delete.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled.task.delete.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/scheduled.task.delete.processor.ts"],"names":[],"mappings":";;;AAAA,wFAAmF;AAEnF,qGAA+F;AAC/F,yFAAoF;AACpF,oEAAwE;AAYxE,MAAa,4BAA6B,SAAQ,2CAAmB;IACnE,YAA6B,KAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,UAAK,GAAL,KAAK,CAAiB;IAEnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,IAAI,CAAC,CAAC,MAAM,wDAAyB,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACrD,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,sCAAsC,CAAC,CAAC;QACpE,IAAI,CAAC,iCAAiC,EAAE,CAAC;QAEzC,MAAM,wDAAyB,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CACjE,KAAK,EAAE,GAAG,EAAE,EAAE;YACZ,MAAM,GAAG,CAAC,UAAU,CAAC,6CAAoB,EAAE;gBACzC,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,oCAAoB,CAAC,OAAO;aACrC,CAAC,CAAC;YACH,MAAM,GAAG,CAAC,UAAU,CAAC,wDAAyB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1D,CAAC,CACF,CAAC;QAEF,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1D,CAAC;CACF;AAtBD,oEAsBC"}
+{"version":3,"file":"scheduled.task.delete.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/scheduled.task.delete.processor.ts"],"names":[],"mappings":";;;AAAA,wFAAmF;AAEnF,qGAA+F;AAC/F,yFAAoF;AACpF,oEAAwE;AAExE,4EAAmE;AACnE,uEAAuE;AACvE,qFAAgF;AAChF,0DAAsD;AAWtD,MAAa,4BAA6B,SAAQ,2CAAmB;IACnE,YAA6B,KAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,UAAK,GAAL,KAAK,CAAiB;IAEnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,MAAM,IAAI,GAAG,MAAM,wDAAyB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,uCAAiB,CAAC,sCAAsC,CAAC,CAAC;QAE/E,MAAM,wDAAyB,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CACjE,KAAK,EAAE,GAAG,EAAE,EAAE;YACZ,MAAM,GAAG,CAAC,UAAU,CAAC,6CAAoB,EAAE;gBACzC,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,oCAAoB,CAAC,OAAO;aACrC,CAAC,CAAC;YACH,MAAM,GAAG,CAAC,UAAU,CAAC,wDAAyB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACxD,MAAM,wBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,UAAU,EAAE,sCAAmB,CAAC,mBAAmB;gBACnD,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,+BAAW,CAAC,WAAW;gBAC/B,QAAQ,EAAE,wBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;aACxD,CAAC,CAAC;QACL,CAAC,CACF,CAAC;QAEF,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IAC1D,CAAC;CACF;AA5BD,oEA4BC"}

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

@@ -1,12 +1,16 @@
-import { CommonDataProcessor } from '../../common/libraries/common.data.processor';
-import { AdminUserEntity } from '../../auth/entities/admin.user.entity';
+import { Repository } from 'typeorm';
+import { CatalogueDataProcessor } from './catalogue.data.processor';
+import { AdminAuthenticatedAccess } from '../../auth/types/auth.types';
 import { ScopeEntity } from '../../auth/entities/scope.entity';
 import { AddScopeDto } from '../dtos/add.scope.dto';
-export declare class ScopeDataProcessor extends CommonDataProcessor {
-    private readonly actor;
+export declare class ScopeDataProcessor extends CatalogueDataProcessor<ScopeEntity> {
+    private readonly access;
+    protected readonly label = "scope";
     protected payload: AddScopeDto;
-    constructor(actor: AdminUserEntity);
+    constructor(access: AdminAuthenticatedAccess);
+    protected repository(): Repository<ScopeEntity>;
     process(payload: AddScopeDto): Promise<ScopeEntity>;
+    private nextParentId;
     private validate;
     private validateParent;
     private set;

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

@@ -1 +1 @@
-{"version":3,"file":"scope.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/scope.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAUpD,qBAAa,kBAAmB,SAAQ,mBAAmB;IAG7C,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;gBAEF,KAAK,EAAE,eAAe;IAI7C,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YAM3C,QAAQ;YAsBR,cAAc;YA6Bd,GAAG;CAsBlB"}
+{"version":3,"file":"scope.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/scope.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAG/D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAmBpD,qBAAa,kBAAmB,SAAQ,sBAAsB,CAAC,WAAW,CAAC;IAI7D,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,SAAS,CAAC,QAAQ,CAAC,KAAK,WAAW;IACnC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;gBAEF,MAAM,EAAE,wBAAwB;IAI7D,SAAS,CAAC,UAAU,IAAI,UAAU,CAAC,WAAW,CAAC;IAIzC,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAOzD,OAAO,CAAC,YAAY;YAMN,QAAQ;YAyBR,cAAc;YA+Bd,GAAG;CA0BlB"}

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

@@ -1,63 +1,98 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScopeDataProcessor = void 0;
-const common_data_processor_1 = require("../../common/libraries/common.data.processor");
+const catalogue_data_processor_1 = require("./catalogue.data.processor");
 const scope_entity_1 = require("../../auth/entities/scope.entity");
-class ScopeDataProcessor extends common_data_processor_1.CommonDataProcessor {
-    constructor(actor) {
+const audit_action_enum_1 = require("../../common/enums/audit.action.enum");
+const entity_constants_1 = require("../../constants/entity.constants");
+const admin_access_service_1 = require("../services/admin.access.service");
+const admin_audit_1 = require("../utilities/admin.audit");
+const admin_policy_1 = require("../utilities/admin.policy");
+const scope_grants_1 = require("../utilities/scope.grants");
+const AUDITED = [
+    'identifier',
+    'name',
+    'description',
+    'parent_id',
+];
+class ScopeDataProcessor extends catalogue_data_processor_1.CatalogueDataProcessor {
+    constructor(access) {
         super();
-        this.actor = actor;
+        this.access = access;
+        this.label = 'scope';
+    }
+    repository() {
+        return scope_entity_1.ScopeEntity.getRepository();
     }
     async process(payload) {
         this.payload = payload;
         await this.validate();
         return this.set();
     }
+    nextParentId() {
+        if (this.payload.parent_id === undefined)
+            return this.existing?.parent_id ?? null;
+        return this.payload.parent_id ?? null;
+    }
     async validate() {
         const body = this.payload;
-        if (body.id && !(await scope_entity_1.ScopeEntity.existsBy({ id: body.id })))
-            this.setColumnError('id', 'No scope exists for this id');
-        const owner = await scope_entity_1.ScopeEntity.findOne({
-            where: { identifier: body.identifier },
-        });
-        if (owner && owner.id !== body.id)
-            this.setColumnError('identifier', 'A scope with this identifier already exists');
+        await this.loadExisting(body.id);
+        this.assertImmutable('identifier', body.identifier);
+        if (this.isNew)
+            await this.assertUnique('identifier', body.identifier, body.id);
         await this.validateParent();
         this.raiseExceptionOnValidationFailure();
+        const parentId = this.nextParentId();
+        const required = admin_policy_1.AdminPolicy.scopeSaveRole({
+            isNew: this.isNew,
+            parentChanged: (this.existing?.parent_id ?? null) !== parentId,
+            parentHasGrants: this.isNew && !!parentId
+                ? (await scope_grants_1.ScopeGrants.count(this.repository().manager, [parentId])) > 0
+                : false,
+        });
+        admin_access_service_1.AdminAccessService.assertHolds(this.access, required, 'Filing a scope under a parent that is already granted, or changing its parent,');
     }
     async validateParent() {
-        const body = this.payload;
-        if (!body.parent_id)
+        const parentId = this.nextParentId();
+        if (!parentId)
             return;
-        if (body.parent_id === body.id) {
+        if (parentId === this.existing?.id) {
             this.setColumnError('parent_id', 'A scope cannot be its own parent');
             return;
         }
-        const parent = await scope_entity_1.ScopeEntity.findOne({ where: { id: body.parent_id } });
+        const parent = await scope_entity_1.ScopeEntity.findOne({ where: { id: parentId } });
         if (!parent) {
             this.setColumnError('parent_id', 'No scope exists for this parent id');
             return;
         }
         if (parent.parent_id)
             this.setColumnError('parent_id', 'That scope is itself a child — a child scope cannot hold children');
-        if (body.id && (await scope_entity_1.ScopeEntity.existsBy({ parent_id: body.id })))
+        if (this.existing &&
+            (await scope_entity_1.ScopeEntity.existsBy({ parent_id: this.existing.id })))
             this.setColumnError('parent_id', 'This scope has children of its own and cannot become a child');
     }
     async set() {
         const body = this.payload;
-        let scope = scope_entity_1.ScopeEntity.create({ created_by: this.actor.id });
-        if (body.id) {
-            const exists = await scope_entity_1.ScopeEntity.findOne({ where: { id: body.id } });
-            if (exists) {
-                scope = exists;
-                scope.updated_by = this.actor.id;
-            }
-        }
+        const actor = this.access.user;
+        const before = admin_audit_1.AdminAudit.pick(this.existing, AUDITED);
+        const scope = this.existing ?? scope_entity_1.ScopeEntity.create({ created_by: actor.id });
+        if (this.existing)
+            scope.updated_by = actor.id;
         scope.identifier = body.identifier;
         scope.name = body.name;
-        scope.description = body.description;
-        scope.parent_id = body.parent_id ?? null;
-        await scope.save();
+        scope.description = body.description ?? scope.description ?? '';
+        scope.parent_id = this.nextParentId();
+        await this.transaction(async (trx) => {
+            await trx.save(scope);
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor,
+                sourceType: entity_constants_1.baseEntityConstants.scope,
+                sourceId: scope.id,
+                action: before ? audit_action_enum_1.AuditAction.UPDATE : audit_action_enum_1.AuditAction.CREATE,
+                oldValue: before,
+                newValue: admin_audit_1.AdminAudit.pick(scope, AUDITED),
+            });
+        });
         return scope;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"scope.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/scope.data.processor.ts"],"names":[],"mappings":";;;AAAA,wFAAmF;AAEnF,mEAA+D;AAW/D,MAAa,kBAAmB,SAAQ,2CAAmB;IAGzD,YAA6B,KAAsB;QACjD,KAAK,EAAE,CAAC;QADmB,UAAK,GAAL,KAAK,CAAiB;IAEnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAoB;QAChC,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,0BAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,6BAA6B,CAAC,CAAC;QAI3D,MAAM,KAAK,GAAG,MAAM,0BAAW,CAAC,OAAO,CAAC;YACtC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;SACvC,CAAC,CAAC;QACH,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,cAAc,CACjB,YAAY,EACZ,6CAA6C,CAC9C,CAAC;QAEJ,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,OAAO;QAE5B,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YAC/B,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;YACrE,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,0BAAW,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,oCAAoC,CAAC,CAAC;YACvE,OAAO;QACT,CAAC;QAED,IAAI,MAAM,CAAC,SAAS;YAClB,IAAI,CAAC,cAAc,CACjB,WAAW,EACX,mEAAmE,CACpE,CAAC;QAGJ,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,MAAM,0BAAW,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,cAAc,CACjB,WAAW,EACX,8DAA8D,CAC/D,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,GAAG;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAC1B,IAAI,KAAK,GAAG,0BAAW,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9D,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,MAAM,0BAAW,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACrE,IAAI,MAAM,EAAE,CAAC;gBACX,KAAK,GAAG,MAAM,CAAC;gBACf,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAGrC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;QAEzC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAtFD,gDAsFC"}
+{"version":3,"file":"scope.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/scope.data.processor.ts"],"names":[],"mappings":"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"}

package/dist/admin/libraries/system.role.data.processor.d.ts

@@ -1,8 +1,14 @@
-import { CommonDataProcessor } from '../../common/libraries/common.data.processor';
+import { Repository } from 'typeorm';
+import { CatalogueDataProcessor } from './catalogue.data.processor';
+import { AdminAuthenticatedAccess } from '../../auth/types/auth.types';
 import { SystemRoleEntity } from '../../auth/entities/system.role.entity';
 import { AddSystemRoleDto } from '../dtos/add.system.role.dto';
-export declare class SystemRoleDataProcessor extends CommonDataProcessor {
+export declare class SystemRoleDataProcessor extends CatalogueDataProcessor<SystemRoleEntity> {
+    private readonly access;
+    protected readonly label = "role";
     protected payload: AddSystemRoleDto;
+    constructor(access: AdminAuthenticatedAccess);
+    protected repository(): Repository<SystemRoleEntity>;
     process(payload: AddSystemRoleDto): Promise<SystemRoleEntity>;
     private validate;
     private set;

package/dist/admin/libraries/system.role.data.processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system.role.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/system.role.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAU/D,qBAAa,uBAAwB,SAAQ,mBAAmB;IAC9D,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAE9B,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAMrD,QAAQ;YAoBR,GAAG;CAoBlB"}
+{"version":3,"file":"system.role.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/system.role.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAI1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAmB/D,qBAAa,uBAAwB,SAAQ,sBAAsB,CAAC,gBAAgB,CAAC;IAIvE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAHnC,SAAS,CAAC,QAAQ,CAAC,KAAK,UAAU;IAClC,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC;gBAEP,MAAM,EAAE,wBAAwB;IAI7D,SAAS,CAAC,UAAU,IAAI,UAAU,CAAC,gBAAgB,CAAC;IAI9C,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAMrD,QAAQ;YA4BR,GAAG;CAyBlB"}

package/dist/admin/libraries/system.role.data.processor.js

@@ -1,9 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemRoleDataProcessor = void 0;
-const common_data_processor_1 = require("../../common/libraries/common.data.processor");
+const catalogue_data_processor_1 = require("./catalogue.data.processor");
 const system_role_entity_1 = require("../../auth/entities/system.role.entity");
-class SystemRoleDataProcessor extends common_data_processor_1.CommonDataProcessor {
+const global_admin_roles_enum_1 = require("../../auth/enums/global.admin.roles.enum");
+const audit_action_enum_1 = require("../../common/enums/audit.action.enum");
+const entity_constants_1 = require("../../constants/entity.constants");
+const admin_access_service_1 = require("../services/admin.access.service");
+const admin_audit_1 = require("../utilities/admin.audit");
+const tenant_role_policy_1 = require("../utilities/tenant.role.policy");
+const AUDITED = [
+    'identifier',
+    'name',
+    'description',
+    'is_active',
+];
+class SystemRoleDataProcessor extends catalogue_data_processor_1.CatalogueDataProcessor {
+    constructor(access) {
+        super();
+        this.access = access;
+        this.label = 'role';
+    }
+    repository() {
+        return system_role_entity_1.SystemRoleEntity.getRepository();
+    }
     async process(payload) {
         this.payload = payload;
         await this.validate();
@@ -11,29 +31,39 @@ class SystemRoleDataProcessor extends common_data_processor_1.CommonDataProcesso
     }
     async validate() {
         const body = this.payload;
-        if (body.id && !(await system_role_entity_1.SystemRoleEntity.existsBy({ id: body.id })))
-            this.setColumnError('id', 'No role exists for this id');
-        const owner = await system_role_entity_1.SystemRoleEntity.findOne({
-            where: { identifier: body.identifier },
-        });
-        if (owner && owner.id !== body.id)
-            this.setColumnError('identifier', 'A role with this identifier already exists');
+        await this.loadExisting(body.id);
+        if (tenant_role_policy_1.TenantRolePolicy.isReserved(body.identifier) ||
+            tenant_role_policy_1.TenantRolePolicy.isReserved(this.existing?.identifier))
+            this.setColumnError('identifier', 'This role identifier is reserved and cannot be managed through the API');
+        this.assertImmutable('identifier', body.identifier);
+        if (this.isNew)
+            await this.assertUnique('identifier', body.identifier, body.id);
         this.raiseExceptionOnValidationFailure();
+        if (this.existing &&
+            body.is_active !== undefined &&
+            body.is_active !== this.existing.is_active)
+            admin_access_service_1.AdminAccessService.assertHolds(this.access, global_admin_roles_enum_1.GlobalAdminRoles.GLOBAL_SUPER_ADMIN, 'Activating or deactivating a tenant role');
     }
     async set() {
         const body = this.payload;
-        let role = system_role_entity_1.SystemRoleEntity.create();
-        if (body.id) {
-            const exists = await system_role_entity_1.SystemRoleEntity.findOne({ where: { id: body.id } });
-            if (exists)
-                role = exists;
-        }
+        const before = admin_audit_1.AdminAudit.pick(this.existing, AUDITED);
+        const role = this.existing ?? system_role_entity_1.SystemRoleEntity.create();
         role.identifier = body.identifier;
         role.name = body.name;
-        role.description = body.description ?? '';
+        role.description = body.description ?? role.description ?? '';
         role.is_active = body.is_active ?? role.is_active ?? true;
         role.attributes = role.attributes ?? {};
-        await role.save();
+        await this.transaction(async (trx) => {
+            await trx.save(role);
+            await admin_audit_1.AdminAudit.record(trx, {
+                actor: this.access.user,
+                sourceType: entity_constants_1.baseEntityConstants.systemRole,
+                sourceId: role.id,
+                action: before ? audit_action_enum_1.AuditAction.UPDATE : audit_action_enum_1.AuditAction.CREATE,
+                oldValue: before,
+                newValue: admin_audit_1.AdminAudit.pick(role, AUDITED),
+            });
+        });
         return role;
     }
 }

package/dist/admin/libraries/system.role.data.processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.role.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/system.role.data.processor.ts"],"names":[],"mappings":";;;AAAA,wFAAmF;AACnF,+EAA0E;AAW1E,MAAa,uBAAwB,SAAQ,2CAAmB;IAG9D,KAAK,CAAC,OAAO,CAAC,OAAyB;QACrC,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,qCAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,4BAA4B,CAAC,CAAC;QAI1D,MAAM,KAAK,GAAG,MAAM,qCAAgB,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;SACvC,CAAC,CAAC;QACH,IAAI,KAAK,IAAI,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;YAC/B,IAAI,CAAC,cAAc,CACjB,YAAY,EACZ,4CAA4C,CAC7C,CAAC;QAEJ,IAAI,CAAC,iCAAiC,EAAE,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,GAAG;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAC1B,IAAI,IAAI,GAAG,qCAAgB,CAAC,MAAM,EAAE,CAAC;QAErC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,MAAM,qCAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,MAAM;gBAAE,IAAI,GAAG,MAAM,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC;QAG1D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;QAExC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAjDD,0DAiDC"}
+{"version":3,"file":"system.role.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/system.role.data.processor.ts"],"names":[],"mappings":"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"}

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

@@ -1,12 +1,17 @@
 import { UserDataProcessor } from './user.data.processor';
 import { UserEntity } from '../../auth/entities/user.entity';
+import { AdminUserEntity } from '../../auth/entities/admin.user.entity';
 import { AddSystemUserDto } from '../dtos/add.system.user.dto';
 export declare class SystemUserDataProcessor extends UserDataProcessor {
+    private readonly actor;
     protected payload: AddSystemUserDto;
+    private existing;
+    constructor(actor: AdminUserEntity);
     process(payload: AddSystemUserDto): Promise<UserEntity>;
     private validate;
     private save;
     private create;
     private update;
+    private audit;
 }
 //# sourceMappingURL=system.user.data.processor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"system.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/system.user.data.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAQ/D,qBAAa,uBAAwB,SAAQ,iBAAiB;IAC5D,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAE9B,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;YAM/C,QAAQ;YAkBR,IAAI;YAKJ,MAAM;YAoBN,MAAM;CA2BrB"}
+{"version":3,"file":"system.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/system.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAMxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAa/D,qBAAa,uBAAwB,SAAQ,iBAAiB;IAIhD,OAAO,CAAC,QAAQ,CAAC,KAAK;IAHlC,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,QAAQ,CAA2B;gBAEd,KAAK,EAAE,eAAe;IAI7C,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;YAM/C,QAAQ;YAuBR,IAAI;YAKJ,MAAM;YAuBN,MAAM;IA+BpB,OAAO,CAAC,KAAK;CAcd"}

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

@@ -6,8 +6,16 @@ const user_entity_1 = require("../../auth/entities/user.entity");
 const user_type_enum_1 = require("../../auth/enums/user.type.enum");
 const auth_utilities_1 = require("../../auth/utilities/auth.utilities");
 const access_revocation_1 = require("../../auth/utilities/access.revocation");
-const access_exception_1 = require("../../global/exceptions/access.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 tenant_role_policy_1 = require("../utilities/tenant.role.policy");
 class SystemUserDataProcessor extends user_data_processor_1.UserDataProcessor {
+    constructor(actor) {
+        super();
+        this.actor = actor;
+        this.existing = null;
+    }
     async process(payload) {
         this.payload = payload;
         await this.validate();
@@ -15,19 +23,21 @@ class SystemUserDataProcessor extends user_data_processor_1.UserDataProcessor {
     }
     async validate() {
         const editId = this.payload.id;
-        if (editId &&
-            !(await user_entity_1.UserEntity.existsBy({
-                id: editId,
-                user_type: user_type_enum_1.UserType.SYSTEM_USER,
-            })))
-            this.setColumnError('id', 'No system user exists for this id');
+        if (editId) {
+            this.existing = await user_entity_1.UserEntity.findOne({
+                where: { id: editId, user_type: user_type_enum_1.UserType.SYSTEM_USER },
+            });
+            if (!this.existing)
+                this.setColumnError('id', 'No system user exists for this id');
+        }
         await this.validateEmail(this.payload.email, 'email', editId);
+        await this.validateContact(this.payload.contact, this.payload.contact_code, 'contact', editId);
         this.validatePassword(this.payload.password, !!editId);
         this.raiseExceptionOnValidationFailure();
     }
     async save() {
-        if (this.payload?.id)
-            return this.update();
+        if (this.existing)
+            return this.update(this.existing);
         return this.create();
     }
     async create() {
@@ -43,27 +53,47 @@ class SystemUserDataProcessor extends user_data_processor_1.UserDataProcessor {
             contact: body.contact,
             active: body.active ?? true,
         });
-        await user.save();
+        await user_entity_1.UserEntity.getRepository().manager.transaction(async (trx) => {
+            await trx.save(user);
+            await this.audit(trx, user, null);
+        });
         return this.stripSecrets(user);
     }
-    async update() {
+    async update(user) {
         const body = this.payload;
-        const user = await user_entity_1.UserEntity.findOne({ where: { id: body.id } });
-        if (!user)
-            throw new access_exception_1.AccessException('Invalid user id provided');
+        const before = admin_audit_1.AdminAudit.pick(user, user_data_processor_1.UserDataProcessor.AUDITED);
         const hadAccess = user.has_global_access && user.active;
+        const wasActive = user.active;
+        const emailChanged = tenant_role_policy_1.TenantRolePolicy.emailChanged(user.email, body.email);
         user.full_name = body.full_name;
         user.email = body.email;
-        user.country = body.country;
-        user.contact_code = body.contact_code;
-        user.contact = body.contact;
-        user.active = body.active ?? true;
-        user.has_global_access = body.has_global_access ?? false;
-        await user.save();
-        if (hadAccess && !(user.has_global_access && user.active))
-            await user_entity_1.UserEntity.getRepository().manager.transaction((trx) => access_revocation_1.AccessRevocation.revokeAll(trx, user.id, false));
+        user.country = body.country ?? user.country;
+        user.contact_code = body.contact_code ?? user.contact_code;
+        user.contact = body.contact ?? user.contact;
+        user.active = body.active ?? user.active;
+        user.has_global_access = body.has_global_access ?? user.has_global_access;
+        if (emailChanged)
+            user.email_verified_at = null;
+        await user_entity_1.UserEntity.getRepository().manager.transaction(async (trx) => {
+            await trx.save(user);
+            if (emailChanged ||
+                (wasActive && !user.active) ||
+                (hadAccess && !(user.has_global_access && user.active)))
+                await access_revocation_1.AccessRevocation.revokeAll(trx, user.id, false);
+            await this.audit(trx, user, before);
+        });
         return this.stripSecrets(user);
     }
+    audit(trx, user, before) {
+        return admin_audit_1.AdminAudit.record(trx, {
+            actor: this.actor,
+            sourceType: entity_constants_1.baseEntityConstants.user,
+            sourceId: user.id,
+            action: before ? audit_action_enum_1.AuditAction.UPDATE : audit_action_enum_1.AuditAction.CREATE,
+            oldValue: before,
+            newValue: admin_audit_1.AdminAudit.pick(user, user_data_processor_1.UserDataProcessor.AUDITED),
+        });
+    }
 }
 exports.SystemUserDataProcessor = SystemUserDataProcessor;
 //# sourceMappingURL=system.user.data.processor.js.map

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

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

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

@@ -8,12 +8,12 @@ export declare class TenantDataProcessor extends CommonDataProcessor {
     private readonly tenantOnboardedMailJob;
     protected payload: AddTenantDto;
     private readonly logger;
+    private existing;
     constructor(actor: AdminUserEntity, tenantOnboardedMailJob: TenantOnboardedMailJob);
     process(payload: AddTenantDto): Promise<TenantEntity>;
     private validate;
     private validateScopes;
     private set;
-    private setScopes;
     private notifyTenant;
 }
 //# 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":"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;AAS3F,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;YAoDH,SAAS;YA6BT,YAAY;CAiB3B"}
+{"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;AAMxE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAyC3F,qBAAa,mBAAoB,SAAQ,mBAAmB;IAMxD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IANzC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAA6B;gBAG1B,KAAK,EAAE,eAAe,EACtB,sBAAsB,EAAE,sBAAsB;IAK3D,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;YAM7C,QAAQ;YA2BR,cAAc;YAYd,GAAG;YAgEH,YAAY;CAgB3B"}