@neohm/nestend 4.1.0 → 5.0.0

package/dist/admin/controllers/admin.pdf.template.controller.js

@@ -18,7 +18,8 @@ const swagger_1 = require("@nestjs/swagger");
 const list_filter_service_1 = require("../../common/services/list.filter.service");
 const admin_access_service_1 = require("../services/admin.access.service");
 const template_service_1 = require("../services/template.service");
-const common_params_dto_1 = require("../../common/dtos/common.params.dto");
+const strict_validation_pipe_1 = require("../../common/pipes/strict.validation.pipe");
+const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
 const pdf_template_data_processor_1 = require("../libraries/pdf.template.data.processor");
 const pdf_template_list_processor_1 = require("../libraries/pdf.template.list.processor");
 const add_pdf_template_dto_1 = require("../dtos/add.pdf.template.dto");
@@ -31,21 +32,21 @@ let AdminPdfTemplateController = class AdminPdfTemplateController {
         this.listFilterService = listFilterService;
     }
     async save(dto) {
-        const { user } = await this.adminAccessService.validateContentManager();
-        return new pdf_template_data_processor_1.PdfTemplateDataProcessor(user).process(dto);
+        const access = await this.adminAccessService.validateContentManager();
+        return new pdf_template_data_processor_1.PdfTemplateDataProcessor(access).process(dto);
     }
     async list(dto) {
         await this.adminAccessService.validateContentReader();
         return new pdf_template_list_processor_1.PdfTemplateListProcessor(this.listFilterService).process(dto);
     }
-    async detail({ id }) {
+    async detail(id) {
         await this.adminAccessService.validateContentReader();
         const pdfTemplate = await pdf_template_entity_1.PdfTemplateEntity.findOne({ where: { id } });
         if (!pdfTemplate)
-            throw new common_1.NotFoundException('No PDF template exists for this id');
+            throw new not_found_exception_1.NotFoundException('No PDF template exists for this id');
         return pdfTemplate;
     }
-    async remove({ id }) {
+    async remove(id) {
         const { user } = await this.adminAccessService.validateAdmin();
         return this.templateService.deletePdfTemplate(id, user);
     }
@@ -55,7 +56,7 @@ __decorate([
     (0, common_1.Post)(),
     (0, swagger_1.ApiOperation)({
         summary: 'Define a PDF template, or update an existing one.',
-        description: 'Send an `id` to edit that template; omit it to define a new one. `identifier` is what generating code names and is unique across the catalogue. Requires at least the global content manager role.',
+        description: 'Send an `id` to edit that template; omit it to define a new one. `identifier` is what generating code names and is unique across the catalogue and fixed once created; omitted optional fields keep their stored value. Requires at least the global content manager role, and the global admin role to change the `path` of an existing template.',
     }),
     __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
@@ -79,9 +80,9 @@ __decorate([
         summary: 'One PDF template, in full.',
         description: 'Everything the listing leaves out — the `attributes` bag and the authoring trail. Requires at least the global content reader role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminPdfTemplateController.prototype, "detail", null);
 __decorate([
@@ -90,14 +91,15 @@ __decorate([
         summary: 'Delete a PDF template.',
         description: 'Soft delete: the row keeps its data with `deleted_at` set and drops out of every listing. Nothing cascades — the remote template and every document already generated from it are untouched — but a flow that still names the identifier stops rendering. Requires at least the global admin role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminPdfTemplateController.prototype, "remove", null);
 exports.AdminPdfTemplateController = AdminPdfTemplateController = __decorate([
     (0, swagger_1.ApiTags)('Admin - PDF Templates'),
     (0, swagger_1.ApiBearerAuth)(),
+    (0, common_1.UsePipes)(strict_validation_pipe_1.StrictValidationPipe),
     (0, common_1.Controller)('api/admin/pdf-templates'),
     __metadata("design:paramtypes", [admin_access_service_1.AdminAccessService,
         template_service_1.TemplateService,

package/dist/admin/controllers/admin.pdf.template.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.pdf.template.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.pdf.template.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"admin.pdf.template.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.pdf.template.controller.ts"],"names":[],"mappings":"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"}

package/dist/admin/controllers/admin.role.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.role.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.role.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,qBAGa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBADjB,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IAQjD,IAAI,CAAS,GAAG,EAAE,WAAW;IAW7B,cAAc,CAAS,GAAG,EAAE,WAAW;CAI9C"}
+{"version":3,"file":"admin.role.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.role.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQpD,qBAIa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBADjB,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IAQjD,IAAI,CAAS,GAAG,EAAE,WAAW;IAW7B,cAAc,CAAS,GAAG,EAAE,WAAW;CAI9C"}

package/dist/admin/controllers/admin.role.controller.js

@@ -20,6 +20,7 @@ const admin_access_service_1 = require("../services/admin.access.service");
 const admin_role_list_processor_1 = require("../libraries/admin.role.list.processor");
 const role_list_processor_1 = require("../libraries/role.list.processor");
 const role_list_dto_1 = require("../dtos/role.list.dto");
+const strict_validation_pipe_1 = require("../../common/pipes/strict.validation.pipe");
 let AdminRoleController = class AdminRoleController {
     constructor(adminAccessService, listFilterService) {
         this.adminAccessService = adminAccessService;
@@ -60,6 +61,7 @@ __decorate([
 exports.AdminRoleController = AdminRoleController = __decorate([
     (0, swagger_1.ApiTags)('Admin - Roles'),
     (0, swagger_1.ApiBearerAuth)(),
+    (0, common_1.UsePipes)(strict_validation_pipe_1.StrictValidationPipe),
     (0, common_1.Controller)('api/admin/roles'),
     __metadata("design:paramtypes", [admin_access_service_1.AdminAccessService,
         list_filter_service_1.ListFilterService])

package/dist/admin/controllers/admin.role.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.role.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AACxD,6CAAuE;AACvE,mFAA8E;AAC9E,2EAAsE;AACtE,sFAAgF;AAChF,0EAAqE;AACrE,yDAAoD;AAU7C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,kBAAsC,EACtC,iBAAoC;QADpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAOE,AAAN,KAAK,CAAC,IAAI,CAAS,GAAgB;QACjC,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,uCAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpE,CAAC;IAQK,AAAN,KAAK,CAAC,cAAc,CAAS,GAAgB;QAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,kDAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;CACF,CAAA;AA1BY,kDAAmB;AAWxB;IALL,IAAA,aAAI,EAAC,aAAa,CAAC;IACnB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,oDAAoD;QAC7D,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACU,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,2BAAW;;+CAGlC;AAQK;IANL,IAAA,aAAI,EAAC,MAAM,CAAC;IACZ,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,0DAA0D;QACnE,WAAW,EACT,8HAA8H;KACjI,CAAC;IACoB,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,2BAAW;;yDAG5C;8BAzBU,mBAAmB;IAH/B,IAAA,iBAAO,EAAC,eAAe,CAAC;IACxB,IAAA,uBAAa,GAAE;IACf,IAAA,mBAAU,EAAC,iBAAiB,CAAC;qCAGW,yCAAkB;QACnB,uCAAiB;GAH5C,mBAAmB,CA0B/B"}
+{"version":3,"file":"admin.role.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAkE;AAClE,6CAAuE;AACvE,mFAA8E;AAC9E,2EAAsE;AACtE,sFAAgF;AAChF,0EAAqE;AACrE,yDAAoD;AACpD,sFAAiF;AAW1E,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,kBAAsC,EACtC,iBAAoC;QADpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAOE,AAAN,KAAK,CAAC,IAAI,CAAS,GAAgB;QACjC,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,uCAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpE,CAAC;IAQK,AAAN,KAAK,CAAC,cAAc,CAAS,GAAgB;QAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,kDAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;CACF,CAAA;AA1BY,kDAAmB;AAWxB;IALL,IAAA,aAAI,EAAC,aAAa,CAAC;IACnB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,oDAAoD;QAC7D,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACU,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,2BAAW;;+CAGlC;AAQK;IANL,IAAA,aAAI,EAAC,MAAM,CAAC;IACZ,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,0DAA0D;QACnE,WAAW,EACT,8HAA8H;KACjI,CAAC;IACoB,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,2BAAW;;yDAG5C;8BAzBU,mBAAmB;IAJ/B,IAAA,iBAAO,EAAC,eAAe,CAAC;IACxB,IAAA,uBAAa,GAAE;IACf,IAAA,iBAAQ,EAAC,6CAAoB,CAAC;IAC9B,IAAA,mBAAU,EAAC,iBAAiB,CAAC;qCAGW,yCAAkB;QACnB,uCAAiB;GAH5C,mBAAmB,CA0B/B"}

package/dist/admin/controllers/admin.scheduled.task.controller.d.ts

@@ -1,16 +1,17 @@
 import { ListFilterService } from '../../common/services/list.filter.service';
 import { AdminAccessService } from '../services/admin.access.service';
-import { CommonParamsDto } from '../../common/dtos/common.params.dto';
+import { QueueService } from '../../common/services/queue.service';
 import { AddScheduledTaskDto } from '../dtos/add.scheduled.task.dto';
 import { ScheduledTaskListDto } from '../dtos/scheduled.task.list.dto';
 import { SystemScheduledTaskEntity } from '../../common/entities/system.scheduled.task.entity';
 export declare class AdminScheduledTaskController {
     private readonly adminAccessService;
     private readonly listFilterService;
-    constructor(adminAccessService: AdminAccessService, listFilterService: ListFilterService);
+    private readonly queueService;
+    constructor(adminAccessService: AdminAccessService, listFilterService: ListFilterService, queueService: QueueService);
     save(dto: AddScheduledTaskDto): Promise<SystemScheduledTaskEntity>;
     list(dto: ScheduledTaskListDto): Promise<import("../..").CommonListResult>;
-    detail({ id }: CommonParamsDto): Promise<SystemScheduledTaskEntity>;
-    remove({ id }: CommonParamsDto): Promise<import("../..").DeleteResult>;
+    detail(id: string): Promise<SystemScheduledTaskEntity>;
+    remove(id: string): Promise<import("../..").DeleteResult>;
 }
 //# sourceMappingURL=admin.scheduled.task.controller.d.ts.map

package/dist/admin/controllers/admin.scheduled.task.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.scheduled.task.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.scheduled.task.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAItE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAC;AAE/F,qBAGa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBADjB,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IASjD,IAAI,CAAS,GAAG,EAAE,mBAAmB;IAUrC,IAAI,CAAS,GAAG,EAAE,oBAAoB;IAWtC,MAAM,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe;IAevC,MAAM,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe;CAI9C"}
+{"version":3,"file":"admin.scheduled.task.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.scheduled.task.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAKnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oDAAoD,CAAC;AAE/F,qBAIa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB,EACpC,YAAY,EAAE,YAAY;IASvC,IAAI,CAAS,GAAG,EAAE,mBAAmB;IAYrC,IAAI,CAAS,GAAG,EAAE,oBAAoB;IAWtC,MAAM,CAA6B,EAAE,EAAE,MAAM;IAe7C,MAAM,CAA6B,EAAE,EAAE,MAAM;CAIpD"}

package/dist/admin/controllers/admin.scheduled.task.controller.js

@@ -17,7 +17,9 @@ const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const list_filter_service_1 = require("../../common/services/list.filter.service");
 const admin_access_service_1 = require("../services/admin.access.service");
-const common_params_dto_1 = require("../../common/dtos/common.params.dto");
+const strict_validation_pipe_1 = require("../../common/pipes/strict.validation.pipe");
+const queue_service_1 = require("../../common/services/queue.service");
+const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
 const scheduled_task_data_processor_1 = require("../libraries/scheduled.task.data.processor");
 const scheduled_task_delete_processor_1 = require("../libraries/scheduled.task.delete.processor");
 const scheduled_task_list_processor_1 = require("../libraries/scheduled.task.list.processor");
@@ -25,26 +27,27 @@ const add_scheduled_task_dto_1 = require("../dtos/add.scheduled.task.dto");
 const scheduled_task_list_dto_1 = require("../dtos/scheduled.task.list.dto");
 const system_scheduled_task_entity_1 = require("../../common/entities/system.scheduled.task.entity");
 let AdminScheduledTaskController = class AdminScheduledTaskController {
-    constructor(adminAccessService, listFilterService) {
+    constructor(adminAccessService, listFilterService, queueService) {
         this.adminAccessService = adminAccessService;
         this.listFilterService = listFilterService;
+        this.queueService = queueService;
     }
     async save(dto) {
-        const { user } = await this.adminAccessService.validateContentManager();
-        return new scheduled_task_data_processor_1.ScheduledTaskDataProcessor(user).process(dto);
+        const access = await this.adminAccessService.validateContentManager();
+        return new scheduled_task_data_processor_1.ScheduledTaskDataProcessor(access, this.queueService).process(dto);
     }
     async list(dto) {
         await this.adminAccessService.validateContentReader();
         return new scheduled_task_list_processor_1.ScheduledTaskListProcessor(this.listFilterService).process(dto);
     }
-    async detail({ id }) {
+    async detail(id) {
         await this.adminAccessService.validateContentReader();
         const task = await system_scheduled_task_entity_1.SystemScheduledTaskEntity.findOne({ where: { id } });
         if (!task)
-            throw new common_1.NotFoundException('No scheduled task exists for this id');
+            throw new not_found_exception_1.NotFoundException('No scheduled task exists for this id');
         return task;
     }
-    async remove({ id }) {
+    async remove(id) {
         const { user } = await this.adminAccessService.validateContentManager();
         return new scheduled_task_delete_processor_1.ScheduledTaskDeleteProcessor(user).process(id);
     }
@@ -54,7 +57,7 @@ __decorate([
     (0, common_1.Post)(),
     (0, swagger_1.ApiOperation)({
         summary: 'Add or update a scheduled task.',
-        description: 'Send an `id` to edit that task, or omit it to create one; omitted optional fields keep their stored value. Changing `schedule`, `timezone` or `start_from` re-seats the cursor and discards occurrences that were materialised under the old schedule but are not yet due. Requires at least the global content manager role.',
+        description: 'Send an `id` to edit that task, or omit it to create one; omitted optional fields keep their stored value. `identifier` must name a job that opted in to scheduling; intervals are at least 60 seconds and cron expressions have 5 fields. Changing `schedule`, `timezone` or `start_from` re-seats the cursor and discards occurrences that were materialised under the old schedule but are not yet due. Requires at least the global content manager role for edits, and the global admin role to create a task or change its `identifier` or `payload`.',
     }),
     __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
@@ -76,11 +79,11 @@ __decorate([
     (0, common_1.Get)(':id'),
     (0, swagger_1.ApiOperation)({
         summary: 'One scheduled task, in full.',
-        description: 'Carries the schedule spec, payload and catch-up settings. Requires at least the global content reader role.',
+        description: 'Carries the schedule spec, payload and catch-up settings. Payloads are visible to readers, so they must not hold secrets. Requires at least the global content reader role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminScheduledTaskController.prototype, "detail", null);
 __decorate([
@@ -89,16 +92,18 @@ __decorate([
         summary: 'Delete a scheduled task.',
         description: 'Soft delete: the row keeps its data with `deleted_at` set and drops out of every listing. Occurrences that were materialised but have not been dispatched are dropped with it, so a deleted task stops firing immediately; ones already claimed, enqueued or terminal are left as history. Requires at least the global content manager role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminScheduledTaskController.prototype, "remove", null);
 exports.AdminScheduledTaskController = AdminScheduledTaskController = __decorate([
     (0, swagger_1.ApiTags)('Admin - Scheduled Tasks'),
     (0, swagger_1.ApiBearerAuth)(),
+    (0, common_1.UsePipes)(strict_validation_pipe_1.StrictValidationPipe),
     (0, common_1.Controller)('api/admin/scheduled-tasks'),
     __metadata("design:paramtypes", [admin_access_service_1.AdminAccessService,
-        list_filter_service_1.ListFilterService])
+        list_filter_service_1.ListFilterService,
+        queue_service_1.QueueService])
 ], AdminScheduledTaskController);
 //# sourceMappingURL=admin.scheduled.task.controller.js.map

package/dist/admin/controllers/admin.scheduled.task.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.scheduled.task.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.scheduled.task.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AACxB,6CAAuE;AACvE,mFAA8E;AAC9E,2EAAsE;AACtE,2EAAsE;AACtE,8FAAwF;AACxF,kGAA4F;AAC5F,8FAAwF;AACxF,2EAAqE;AACrE,6EAAuE;AACvE,qGAA+F;AAKxF,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACvC,YACmB,kBAAsC,EACtC,iBAAoC;QADpC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAQE,AAAN,KAAK,CAAC,IAAI,CAAS,GAAwB;QACzC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;QACxE,OAAO,IAAI,0DAA0B,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAOK,AAAN,KAAK,CAAC,IAAI,CAAS,GAAyB;QAC1C,MAAM,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC;QACtD,OAAO,IAAI,0DAA0B,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7E,CAAC;IAQK,AAAN,KAAK,CAAC,MAAM,CAAU,EAAE,EAAE,EAAmB;QAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC;QAEtD,MAAM,IAAI,GAAG,MAAM,wDAAyB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,0BAAiB,CAAC,sCAAsC,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAQK,AAAN,KAAK,CAAC,MAAM,CAAU,EAAE,EAAE,EAAmB;QAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;QACxE,OAAO,IAAI,8DAA4B,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AApDY,oEAA4B;AAYjC;IANL,IAAA,aAAI,GAAE;IACN,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,iCAAiC;QAC1C,WAAW,EACT,+TAA+T;KAClU,CAAC;IACU,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,4CAAmB;;wDAG1C;AAOK;IALL,IAAA,aAAI,EAAC,MAAM,CAAC;IACZ,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,0CAA0C;QACnD,WAAW,EAAE,mDAAmD;KACjE,CAAC;IACU,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,8CAAoB;;wDAG3C;AAQK;IANL,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,8BAA8B;QACvC,WAAW,EACT,6GAA6G;KAChH,CAAC;IACY,WAAA,IAAA,cAAK,GAAE,CAAA;;qCAAS,mCAAe;;0DAO5C;AAQK;IANL,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,0BAA0B;QACnC,WAAW,EACT,+UAA+U;KAClV,CAAC;IACY,WAAA,IAAA,cAAK,GAAE,CAAA;;qCAAS,mCAAe;;0DAG5C;uCAnDU,4BAA4B;IAHxC,IAAA,iBAAO,EAAC,yBAAyB,CAAC;IAClC,IAAA,uBAAa,GAAE;IACf,IAAA,mBAAU,EAAC,2BAA2B,CAAC;qCAGC,yCAAkB;QACnB,uCAAiB;GAH5C,4BAA4B,CAoDxC"}
+{"version":3,"file":"admin.scheduled.task.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.scheduled.task.controller.ts"],"names":[],"mappings":"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"}

package/dist/admin/controllers/admin.scope.controller.d.ts

@@ -1,6 +1,5 @@
 import { ListFilterService } from '../../common/services/list.filter.service';
 import { AdminAccessService } from '../services/admin.access.service';
-import { CommonParamsDto } from '../../common/dtos/common.params.dto';
 import { ScopeService } from '../../auth/services/scope.service';
 import { AddScopeDto } from '../dtos/add.scope.dto';
 import { ScopeListDto } from '../dtos/scope.list.dto';
@@ -12,9 +11,9 @@ export declare class AdminScopeController {
     constructor(adminAccessService: AdminAccessService, scopeService: ScopeService, listFilterService: ListFilterService);
     save(dto: AddScopeDto): Promise<ScopeEntity>;
     list(dto: ScopeListDto): Promise<import("../..").CommonListResult>;
-    saveChild({ id }: CommonParamsDto, dto: AddScopeDto): Promise<ScopeEntity>;
-    children({ id }: CommonParamsDto, dto: ScopeListDto): Promise<import("../..").CommonListResult>;
-    detail({ id }: CommonParamsDto): Promise<ScopeEntity>;
-    remove({ id }: CommonParamsDto): Promise<import("../..").DeleteResult>;
+    saveChild(id: string, dto: AddScopeDto): Promise<ScopeEntity>;
+    children(id: string, dto: ScopeListDto): Promise<import("../..").CommonListResult>;
+    detail(id: string): Promise<ScopeEntity>;
+    remove(id: string): Promise<import("../..").DeleteResult>;
 }
 //# sourceMappingURL=admin.scope.controller.d.ts.map

package/dist/admin/controllers/admin.scope.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.scope.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.scope.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAGtE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAGjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAQ/D,qBAGa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFjB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB;IASjD,IAAI,CAAS,GAAG,EAAE,WAAW;IAW7B,IAAI,CAAS,GAAG,EAAE,YAAY;IAW9B,SAAS,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe,EAAU,GAAG,EAAE,WAAW;IAWpE,QAAQ,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe,EAAU,GAAG,EAAE,YAAY;IAapE,MAAM,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe;IAevC,MAAM,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe;CAgB9C"}
+{"version":3,"file":"admin.scope.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.scope.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAQtE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAGjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAQ/D,qBAIa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFjB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB;IASjD,IAAI,CAAS,GAAG,EAAE,WAAW;IAW7B,IAAI,CAAS,GAAG,EAAE,YAAY;IAW9B,SAAS,CAA6B,EAAE,EAAE,MAAM,EAAU,GAAG,EAAE,WAAW;IAW1E,QAAQ,CAA6B,EAAE,EAAE,MAAM,EAAU,GAAG,EAAE,YAAY;IAa1E,MAAM,CAA6B,EAAE,EAAE,MAAM;IAe7C,MAAM,CAA6B,EAAE,EAAE,MAAM;CA6BpD"}

package/dist/admin/controllers/admin.scope.controller.js

@@ -17,9 +17,13 @@ const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const list_filter_service_1 = require("../../common/services/list.filter.service");
 const admin_access_service_1 = require("../services/admin.access.service");
-const common_params_dto_1 = require("../../common/dtos/common.params.dto");
-const global_admin_roles_enum_1 = require("../../auth/enums/global.admin.roles.enum");
-const access_exception_1 = require("../../global/exceptions/access.exception");
+const strict_validation_pipe_1 = require("../../common/pipes/strict.validation.pipe");
+const not_found_exception_1 = require("../../global/exceptions/not.found.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 admin_policy_1 = require("../utilities/admin.policy");
+const scope_grants_1 = require("../utilities/scope.grants");
 const scope_service_1 = require("../../auth/services/scope.service");
 const scope_data_processor_1 = require("../libraries/scope.data.processor");
 const scope_list_processor_1 = require("../libraries/scope.list.processor");
@@ -33,37 +37,50 @@ let AdminScopeController = class AdminScopeController {
         this.listFilterService = listFilterService;
     }
     async save(dto) {
-        const { user } = await this.adminAccessService.validateContentManager();
-        return new scope_data_processor_1.ScopeDataProcessor(user).process(dto);
+        const access = await this.adminAccessService.validateContentManager();
+        return new scope_data_processor_1.ScopeDataProcessor(access).process(dto);
     }
     async list(dto) {
         await this.adminAccessService.validateContentReader();
         return new scope_list_processor_1.ScopeListProcessor(this.listFilterService).process(dto);
     }
-    async saveChild({ id }, dto) {
-        const { user } = await this.adminAccessService.validateContentManager();
-        return new scope_data_processor_1.ScopeDataProcessor(user).process({ ...dto, parent_id: id });
+    async saveChild(id, dto) {
+        const access = await this.adminAccessService.validateContentManager();
+        return new scope_data_processor_1.ScopeDataProcessor(access).process({ ...dto, parent_id: id });
     }
-    async children({ id }, dto) {
+    async children(id, dto) {
         await this.adminAccessService.validateContentReader();
         return new scope_list_processor_1.ScopeListProcessor(this.listFilterService).process({
             ...dto,
             parent_id: id,
         });
     }
-    async detail({ id }) {
+    async detail(id) {
         await this.adminAccessService.validateContentReader();
         const scope = await scope_entity_1.ScopeEntity.findOne({ where: { id } });
         if (!scope)
-            throw new common_1.NotFoundException('No scope exists for this id');
+            throw new not_found_exception_1.NotFoundException('No scope exists for this id');
         return scope;
     }
-    async remove({ id }) {
-        const access = await this.adminAccessService.validateContentManager();
-        if ((await this.scopeService.isChildScope(id)) &&
-            !this.adminAccessService.holdsAtLeast(access, global_admin_roles_enum_1.GlobalAdminRoles.GLOBAL_ADMIN))
-            throw new access_exception_1.AccessException(`Deleting a child scope requires at least the "${global_admin_roles_enum_1.GlobalAdminRoles.GLOBAL_ADMIN}" role.`);
-        return this.scopeService.deleteScope(id, access.user.id);
+    async remove(id) {
+        const access = await this.adminAccessService.validateAdmin();
+        const scope = await scope_entity_1.ScopeEntity.findOne({ where: { id } });
+        if (!scope)
+            throw new not_found_exception_1.NotFoundException('No scope exists for this id');
+        const manager = scope_entity_1.ScopeEntity.getRepository().manager;
+        const { scopeIds, childCount } = await scope_grants_1.ScopeGrants.withChildren(manager, id);
+        const grantCount = await scope_grants_1.ScopeGrants.count(manager, scopeIds);
+        admin_access_service_1.AdminAccessService.assertHolds(access, admin_policy_1.AdminPolicy.scopeDeleteRole(childCount, grantCount), 'Deleting a scope that has children or live grants');
+        const result = await this.scopeService.deleteScope(id, access.user.id);
+        await admin_audit_1.AdminAudit.record(manager, {
+            actor: access.user,
+            sourceType: entity_constants_1.baseEntityConstants.scope,
+            sourceId: id,
+            action: audit_action_enum_1.AuditAction.SOFT_DELETE,
+            oldValue: admin_audit_1.AdminAudit.pick(scope, ['identifier', 'name', 'parent_id']),
+            context: { cascaded_scope_ids: scopeIds, grant_count: grantCount },
+        });
+        return result;
     }
 };
 exports.AdminScopeController = AdminScopeController;
@@ -93,12 +110,12 @@ __decorate([
     (0, common_1.Post)(':id/children'),
     (0, swagger_1.ApiOperation)({
         summary: 'Add a child scope under this one, or update an existing child.',
-        description: 'The parent comes from the path, so the body is an ordinary scope — send an `id` to edit a child, omit it to define one. The parent has to be a parent itself: a child scope never holds children. Requires at least the global content manager role.',
+        description: 'The parent comes from the path, so the body is an ordinary scope — send an `id` to edit a child, omit it to define one. The parent has to be a parent itself: a child scope never holds children. Requires at least the global content manager role, and the global super admin role when the parent is already granted or the child moves between parents.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __param(1, (0, common_1.Body)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto, add_scope_dto_1.AddScopeDto]),
+    __metadata("design:paramtypes", [String, add_scope_dto_1.AddScopeDto]),
     __metadata("design:returntype", Promise)
 ], AdminScopeController.prototype, "saveChild", null);
 __decorate([
@@ -107,10 +124,10 @@ __decorate([
         summary: 'List, search and filter the children of one scope.',
         description: 'The same listing as `POST /list`, with `parent_id` taken from the path — so a body that names a different parent cannot widen it. Requires at least the global content reader role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __param(1, (0, common_1.Body)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto, scope_list_dto_1.ScopeListDto]),
+    __metadata("design:paramtypes", [String, scope_list_dto_1.ScopeListDto]),
     __metadata("design:returntype", Promise)
 ], AdminScopeController.prototype, "children", null);
 __decorate([
@@ -119,25 +136,26 @@ __decorate([
         summary: 'One scope, in full.',
         description: 'Requires at least the global content reader role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminScopeController.prototype, "detail", null);
 __decorate([
     (0, common_1.Delete)(':id'),
     (0, swagger_1.ApiOperation)({
         summary: 'Delete a scope.',
-        description: 'Soft delete: the row keeps its data with `deleted_at` set and drops out of every listing. Its children go with it, and so does every grant of any of them — the tenant rows in `sys_tenant_scopes` and the API-key rows in `sys_api_scopes` — so no principal keeps a feature the catalogue no longer defines. Requires at least the global content manager role, and the global admin role to delete a child scope: a child is a slice of a feature tenants already hold, and removing it narrows their access rather than retiring the feature.',
+        description: 'Soft delete. Its children go with it, and so does every grant of any of them (principal grants and API-key grants), so no principal keeps a feature the catalogue no longer defines. Requires at least the global admin role, and the global super admin role when the scope has children or live grants.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminScopeController.prototype, "remove", null);
 exports.AdminScopeController = AdminScopeController = __decorate([
     (0, swagger_1.ApiTags)('Admin - Scopes'),
     (0, swagger_1.ApiBearerAuth)(),
+    (0, common_1.UsePipes)(strict_validation_pipe_1.StrictValidationPipe),
     (0, common_1.Controller)('api/admin/scopes'),
     __metadata("design:paramtypes", [admin_access_service_1.AdminAccessService,
         scope_service_1.ScopeService,

package/dist/admin/controllers/admin.scope.controller.js.map

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

package/dist/admin/controllers/admin.system.user.controller.d.ts

@@ -1,5 +1,4 @@
 import { UserEntity } from '../../auth/entities/user.entity';
-import { CommonParamsDto } from '../../common/dtos/common.params.dto';
 import { ListFilterService } from '../../common/services/list.filter.service';
 import { AddSystemUserDto } from '../dtos/add.system.user.dto';
 import { SystemUserListDto } from '../dtos/system.user.list.dto';
@@ -10,7 +9,7 @@ export declare class AdminSystemUserController {
     protected readonly systemUserService: SystemUserService;
     private readonly listFilterService;
     constructor(adminAccessService: AdminAccessService, systemUserService: SystemUserService, listFilterService: ListFilterService);
-    systemUserDetail({ id }: CommonParamsDto): Promise<UserEntity>;
+    systemUserDetail(id: string): Promise<UserEntity>;
     addSystemUser(dto: AddSystemUserDto): Promise<UserEntity>;
     listSystemUsers(dto: SystemUserListDto): Promise<import("../..").CommonListResult>;
     removeSystemUser(id: string): Promise<import("../..").DeleteResult>;

package/dist/admin/controllers/admin.system.user.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.system.user.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.system.user.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,qBACa,yBAAyB;IAElC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IACzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IACvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB,EACtC,iBAAiB,EAAE,iBAAiB;IAQjD,gBAAgB,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe;IAiBjD,aAAa,CAAS,GAAG,EAAE,gBAAgB;IAW3C,eAAe,CAAS,GAAG,EAAE,iBAAiB;IAW9C,gBAAgB,CAA6B,EAAE,EAAE,MAAM;CAI9D"}
+{"version":3,"file":"admin.system.user.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.system.user.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,qBAIa,yBAAyB;IAElC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IACzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IACvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB,EACtC,iBAAiB,EAAE,iBAAiB;IAQjD,gBAAgB,CAA6B,EAAE,EAAE,MAAM;IAiBvD,aAAa,CAAS,GAAG,EAAE,gBAAgB;IAW3C,eAAe,CAAS,GAAG,EAAE,iBAAiB;IAW9C,gBAAgB,CAA6B,EAAE,EAAE,MAAM;CAI9D"}

package/dist/admin/controllers/admin.system.user.controller.js

@@ -17,7 +17,8 @@ const common_1 = require("@nestjs/common");
 const swagger_1 = require("@nestjs/swagger");
 const user_entity_1 = require("../../auth/entities/user.entity");
 const user_type_enum_1 = require("../../auth/enums/user.type.enum");
-const common_params_dto_1 = require("../../common/dtos/common.params.dto");
+const strict_validation_pipe_1 = require("../../common/pipes/strict.validation.pipe");
+const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
 const list_filter_service_1 = require("../../common/services/list.filter.service");
 const add_system_user_dto_1 = require("../dtos/add.system.user.dto");
 const system_user_list_dto_1 = require("../dtos/system.user.list.dto");
@@ -31,18 +32,18 @@ let AdminSystemUserController = class AdminSystemUserController {
         this.systemUserService = systemUserService;
         this.listFilterService = listFilterService;
     }
-    async systemUserDetail({ id }) {
+    async systemUserDetail(id) {
         await this.adminAccessService.validateContentReader();
         const user = await user_entity_1.UserEntity.findOne({
             where: { id, user_type: user_type_enum_1.UserType.SYSTEM_USER },
         });
         if (!user)
-            throw new common_1.NotFoundException('No system user exists for this id');
+            throw new not_found_exception_1.NotFoundException('No system user exists for this id');
         return user;
     }
     async addSystemUser(dto) {
-        await this.adminAccessService.validateSuperAdmin();
-        return new system_user_data_processor_1.SystemUserDataProcessor().process(dto);
+        const { user } = await this.adminAccessService.validateSuperAdmin();
+        return new system_user_data_processor_1.SystemUserDataProcessor(user).process(dto);
     }
     async listSystemUsers(dto) {
         await this.adminAccessService.validateContentReader();
@@ -60,16 +61,16 @@ __decorate([
         summary: 'One tenantless system user, in full.',
         description: 'Requires at least the global content reader role.',
     }),
-    __param(0, (0, common_1.Param)()),
+    __param(0, (0, common_1.Param)('id', common_1.ParseUUIDPipe)),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [common_params_dto_1.CommonParamsDto]),
+    __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AdminSystemUserController.prototype, "systemUserDetail", null);
 __decorate([
     (0, common_1.Post)(),
     (0, swagger_1.ApiOperation)({
         summary: 'Register a tenantless system user, or update one.',
-        description: 'Send an `id` to edit that user; omit it to register a new one. `password` is required only when creating. `has_global_access` is what lets the account sign in to an organization through `POST /auth/impersonation/login`; withdrawing it revokes the sessions it opened. Requires the global super admin role.',
+        description: 'Send an `id` to edit that user; omit it to register a new one. `password` is required only when creating. Omitted optional fields keep their stored value. `has_global_access` is what lets the account sign in to an organization through `POST /auth/impersonation/login`; withdrawing it, suspending the account or changing its email revokes its sessions, and an email change clears `email_verified_at`. Audit-logged. Requires the global super admin role.',
     }),
     __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
@@ -99,6 +100,9 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], AdminSystemUserController.prototype, "removeSystemUser", null);
 exports.AdminSystemUserController = AdminSystemUserController = __decorate([
+    (0, swagger_1.ApiTags)('Admin - System Users'),
+    (0, swagger_1.ApiBearerAuth)(),
+    (0, common_1.UsePipes)(strict_validation_pipe_1.StrictValidationPipe),
     (0, common_1.Controller)('api/admin/system-users'),
     __metadata("design:paramtypes", [admin_access_service_1.AdminAccessService,
         system_user_service_1.SystemUserService,

package/dist/admin/controllers/admin.system.user.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.system.user.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.system.user.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,6CAA+C;AAC/C,iEAA6D;AAC7D,oEAA2D;AAC3D,2EAAsE;AACtE,mFAA8E;AAC9E,qEAA+D;AAC/D,uEAAiE;AACjE,wFAAkF;AAClF,wFAAkF;AAClF,2EAAsE;AACtE,yEAAoE;AAG7D,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IACpC,YACqB,kBAAsC,EACtC,iBAAoC,EACtC,iBAAoC;QAFlC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACpD,CAAC;IAOE,AAAN,KAAK,CAAC,gBAAgB,CAAU,EAAE,EAAE,EAAmB;QACrD,MAAM,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC;QAEtD,MAAM,IAAI,GAAG,MAAM,wBAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,yBAAQ,CAAC,WAAW,EAAE;SAC/C,CAAC,CAAC;QACH,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,0BAAiB,CAAC,mCAAmC,CAAC,CAAC;QAE5E,OAAO,IAAI,CAAC;IACd,CAAC;IAQK,AAAN,KAAK,CAAC,aAAa,CAAS,GAAqB;QAC/C,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;QACnD,OAAO,IAAI,oDAAuB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IAQK,AAAN,KAAK,CAAC,eAAe,CAAS,GAAsB;QAClD,MAAM,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,CAAC;QACtD,OAAO,IAAI,oDAAuB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1E,CAAC;IAQK,AAAN,KAAK,CAAC,gBAAgB,CAA6B,EAAU;QAC3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;QACpE,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAvDY,8DAAyB;AAY9B;IALL,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,sCAAsC;QAC/C,WAAW,EAAE,mDAAmD;KACjE,CAAC;IACsB,WAAA,IAAA,cAAK,GAAE,CAAA;;qCAAS,mCAAe;;iEAStD;AAQK;IANL,IAAA,aAAI,GAAE;IACN,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,mDAAmD;QAC5D,WAAW,EACT,kTAAkT;KACrT,CAAC;IACmB,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,sCAAgB;;8DAGhD;AAQK;IANL,IAAA,aAAI,EAAC,MAAM,CAAC;IACZ,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,kDAAkD;QAC3D,WAAW,EACT,8HAA8H;KACjI,CAAC;IACqB,WAAA,IAAA,aAAI,GAAE,CAAA;;qCAAM,wCAAiB;;gEAGnD;AAQK;IANL,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,uBAAuB;QAChC,WAAW,EACT,iIAAiI;KACpI,CAAC;IACsB,WAAA,IAAA,cAAK,EAAC,IAAI,EAAE,sBAAa,CAAC,CAAA;;;;iEAGjD;oCAtDU,yBAAyB;IADrC,IAAA,mBAAU,EAAC,wBAAwB,CAAC;qCAGM,yCAAkB;QACnB,uCAAiB;QACnB,uCAAiB;GAJ5C,yBAAyB,CAuDrC"}
+{"version":3,"file":"admin.system.user.controller.js","sourceRoot":"","sources":["../../../src/admin/controllers/admin.system.user.controller.ts"],"names":[],"mappings":"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"}

package/dist/admin/controllers/admin.tenant.controller.d.ts

@@ -1,6 +1,5 @@
 import { ListFilterService } from '../../common/services/list.filter.service';
 import { AdminAccessService } from '../services/admin.access.service';
-import { CommonParamsDto } from '../../common/dtos/common.params.dto';
 import { AddTenantDto } from '../dtos/add.tenant.dto';
 import { TenantListDto } from '../dtos/tenant.list.dto';
 import { TenantOnboardedMailJob } from '../../notification/jobs/tenant.onboarded.mail.job';
@@ -13,7 +12,7 @@ export declare class AdminTenantController {
     constructor(adminAccessService: AdminAccessService, tenantOnboardedMailJob: TenantOnboardedMailJob, listFilterService: ListFilterService);
     onboard(dto: AddTenantDto): Promise<TenantEntity>;
     list(dto: TenantListDto): Promise<import("../..").CommonListResult>;
-    detail({ id }: CommonParamsDto): Promise<TenantDetail>;
-    remove({ id }: CommonParamsDto): Promise<import("../types/admin.types").DeleteResult>;
+    detail(id: string): Promise<TenantDetail>;
+    remove(id: string): Promise<import("../types/admin.types").DeleteResult>;
 }
 //# sourceMappingURL=admin.tenant.controller.d.ts.map

package/dist/admin/controllers/admin.tenant.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.tenant.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.tenant.controller.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAItE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,qBAGa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFjB,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,iBAAiB,EAAE,iBAAiB;IASjD,OAAO,CAAS,GAAG,EAAE,YAAY;IAajC,IAAI,CAAS,GAAG,EAAE,aAAa;IAW/B,MAAM,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IA2B/D,MAAM,CAAU,EAAE,EAAE,EAAE,EAAE,eAAe;CAI9C"}
+{"version":3,"file":"admin.tenant.controller.d.ts","sourceRoot":"","sources":["../../../src/admin/controllers/admin.tenant.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAMtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,qBAIa,qBAAqB;IAE9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAFjB,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,iBAAiB,EAAE,iBAAiB;IASjD,OAAO,CAAS,GAAG,EAAE,YAAY;IAajC,IAAI,CAAS,GAAG,EAAE,aAAa;IAW/B,MAAM,CAA6B,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IA2BrE,MAAM,CAA6B,EAAE,EAAE,MAAM;CAIpD"}