@fdm-monster/server 1.8.3 → 1.9.0

package/dist/services/orm/floor.service.js

@@ -15,12 +15,10 @@ const _validators = require("../../handlers/validators");
 const _floorservicevalidation = require("../validators/floor-service.validation");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floordto.FloorDto, _floordto.CreateFloorDto, _floordto.UpdateFloorDto) {
+    typeormService;
     floorPositionService;
-    constructor({ floorPositionService, typeormService }){
-        super({
-            typeormService
-        });
-        this.floorPositionService = floorPositionService;
+    constructor(typeormService, floorPositionService){
+        super(typeormService), this.typeormService = typeormService, this.floorPositionService = floorPositionService;
     }
     async list(options) {
         return super.list(Object.assign(options || {}, {
@@ -29,23 +27,23 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
             ]
         }));
     }
-    async get(id, throwIfNotFound = true, options) {
-        return super.get(id, throwIfNotFound, Object.assign(options || {}, {
+    async get(id, options) {
+        return super.get(id, Object.assign(options || {}, {
             relations: [
                 "printers"
             ]
         }));
     }
     async create(dto) {
-        await (0, _validators.validateInput)(dto, _floorservicevalidation.createFloorRules);
+        const outcome = await (0, _validators.validateInput)(dto, (0, _floorservicevalidation.createOrUpdateFloorSchema)(true));
         const floor = await super.create({
-            name: dto.name,
-            floor: dto.floor,
+            name: outcome.name,
+            floor: outcome.floor,
             printers: []
         });
-        if (dto.printers?.length) {
-            for (const printer of dto.printers){
-                await this.addOrUpdatePrinter(floor.id, printer);
+        if (outcome.printers?.length) {
+            for (const position of outcome.printers){
+                await this.addOrUpdatePrinter(floor.id, position);
             }
         }
         return this.get(floor.id);
@@ -71,58 +69,64 @@ class FloorService extends (0, _baseservice.BaseService)(_entities.Floor, _floor
         return await this.get(floor.id);
     }
     async update(floorId, update) {
-        const floor = await this.get(floorId);
+        const existingFloor = await this.get(floorId);
         const floorUpdate = {
-            ...floor,
+            ...existingFloor,
             name: update.name,
             printers: update.printers,
             floor: update.floor
         };
-        await (0, _validators.validateInput)(floorUpdate, _floorservicevalidation.updateFloorRules);
-        const desiredPositions = floorUpdate.printers;
+        const validatedFloor = await (0, _validators.validateInput)(floorUpdate, (0, _floorservicevalidation.createOrUpdateFloorSchema)(true));
+        const desiredPositions = validatedFloor.printers;
         if (desiredPositions?.length) {
-            for (let printer of desiredPositions){
-                await this.addOrUpdatePrinter(floor.id, printer);
+            for (const printer of desiredPositions){
+                await this.addOrUpdatePrinter(existingFloor.id, printer);
+            }
+            const undesiredPositions = existingFloor.printers.filter((pos)=>!desiredPositions.find((dp)=>dp.printerId === pos.printerId));
+            if (undesiredPositions?.length) {
+                await this.floorPositionService.deleteMany(undesiredPositions.map((pos)=>pos.id));
             }
-        }
-        const undesiredPositions = floor.printers.filter((pos)=>!desiredPositions.find((dp)=>dp.printerId === pos.printerId));
-        if (undesiredPositions?.length) {
-            await this.floorPositionService.deleteMany(undesiredPositions.map((pos)=>pos.id));
         }
         delete floorUpdate.printers;
         return super.update(floorId, floorUpdate);
     }
-    async updateName(floorId, name) {
-        let floor = await this.get(floorId);
+    async updateName(floorId, floorName) {
+        const { name } = await (0, _validators.validateInput)({
+            name: floorName
+        }, _floorservicevalidation.updateFloorNameSchema);
+        const floor = await this.get(floorId);
         floor.name = name;
-        floor = await this.update(floorId, floor);
-        return floor;
+        return this.update(floorId, floor);
     }
     async updateLevel(floorId, level) {
-        let floor = await this.get(floorId);
-        floor.floor = level;
-        floor = await this.update(floorId, floor);
-        return floor;
+        const { floor: validLevel } = await (0, _validators.validateInput)({
+            floor: level
+        }, _floorservicevalidation.updateFloorLevelSchema);
+        const floor = await this.get(floorId);
+        floor.floor = validLevel;
+        return await this.update(floorId, floor);
     }
     async addOrUpdatePrinter(floorId, positionDto) {
-        await this.get(floorId, true);
-        const position = await this.floorPositionService.findPrinterPosition(positionDto.printerId);
-        if (position && position.floorId === floorId && position.x === positionDto.x && position.x === positionDto.y && position.printerId === positionDto.printerId) {
+        await this.get(floorId);
+        positionDto.floorId = floorId;
+        const validInput = await (0, _validators.validateInput)(positionDto, (0, _floorservicevalidation.printerInFloorSchema)(true));
+        const position = await this.floorPositionService.findPrinterPosition(validInput.printerId);
+        if (position && position.floorId === floorId && position.x === validInput.x && position.x === validInput.y && position.printerId === validInput.printerId) {
             return this.get(floorId);
         }
         if (position) {
             await this.floorPositionService.delete(position.id);
         }
-        const xyPosition = await this.floorPositionService.findPosition(floorId, positionDto.x, positionDto.y);
+        const xyPosition = await this.floorPositionService.findPosition(floorId, validInput.x, validInput.y);
         if (xyPosition) {
             await this.floorPositionService.delete(xyPosition.id);
         }
         const newPosition = new _entities.FloorPosition();
         Object.assign(newPosition, {
-            x: positionDto.x,
-            y: positionDto.y,
-            printerId: positionDto.printerId,
-            floorId: floorId
+            x: validInput.x,
+            y: validInput.y,
+            printerId: validInput.printerId,
+            floorId
         });
         await this.floorPositionService.create(newPosition);
         return this.get(floorId);

package/dist/services/orm/floor.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","floorPositionService","constructor","typeormService","list","options","Object","assign","relations","get","id","throwIfNotFound","create","dto","validateInput","createFloorRules","floor","name","printers","length","printer","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","floorUpdate","updateFloorRules","desiredPositions","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","updateLevel","level","positionDto","position","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/floor.service.ts"],"names":["FloorService","BaseService","Floor","FloorDto","CreateFloorDto","UpdateFloorDto","constructor","typeormService","floorPositionService","list","options","Object","assign","relations","get","id","create","dto","outcome","validateInput","createOrUpdateFloorSchema","floor","name","printers","length","position","addOrUpdatePrinter","toDto","map","p","printerId","floorId","x","y","createDefaultFloor","update","existingFloor","floorUpdate","validatedFloor","desiredPositions","printer","undesiredPositions","filter","pos","find","dp","deleteMany","updateName","floorName","updateFloorNameSchema","updateLevel","level","validLevel","updateFloorLevelSchema","positionDto","validInput","printerInFloorSchema","findPrinterPosition","delete","xyPosition","findPosition","newPosition","FloorPosition","removePrinter","findPrinterPositionOnFloor","NotFoundException","deletePrinterFromAnyFloor","deletePrinterPositionsByPrinterId"],"mappings":"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"}

package/dist/services/orm/permission.service.js

@@ -16,10 +16,9 @@ const _authorizationconstants = require("../../constants/authorization.constants
 class PermissionService extends (0, _baseservice.BaseService)(_entities.Permission, _permissiondto.PermissionDto) {
     logger;
     _permissions = [];
-    constructor({ loggerFactory, typeormService }){
-        super({
-            typeormService
-        });
+    constructor(loggerFactory, typeormService){
+        super(typeormService);
+        this.logger = loggerFactory(PermissionService.name);
     }
     get permissions() {
         return this._permissions;

package/dist/services/orm/permission.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","permissions","toDto","permission","id","name","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BATe;0BACD;+BACG;mCACI;wCAIU;AAErC,MAAMA,0BACHC,IAAAA,wBAAW,EAACC,oBAAU,EAAEC,4BAAa;IAGrCC,OAAsB;IACtBC,eAA6B,EAAE,CAAC;IAExCC,YAAY,EAAEC,aAAa,EAAEC,cAAc,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAEA;QAAe;IACzB;IACA,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACJ,YAAY;IAC1B;IAEAK,MAAMC,UAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBC,MAAMF,WAAWE,IAAI;QACvB;IACF;IAEAC,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAW;QACtF,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAuB;QACrE,MAAMV,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAET,IAAI,KAAKQ;QAC3D,IAAI,CAACV,YAAY,MAAM,IAAIY,oCAAiB,CAAC;QAC7C,OAAOZ;IACT;IAEA,MAAMa,cAAcC,YAA0B,EAAuB;QACnE,MAAMd,aAAa,IAAI,CAACF,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKa;QACzD,IAAI,CAACd,YAAY,MAAM,IAAIY,oCAAiB,CAAC,CAAC,sCAAsC,CAAC;QAErF,OAAOZ;IACT;IAEA,MAAMe,kBAAiC;QACrC,IAAI,CAACrB,YAAY,GAAG,EAAE;QAEtB,MAAMsB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIjB,cAAcgB,qBAAsB;YAC3C,MAAME,mBAAmB,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAElB,MAAMF;YAAW;YAC5E,IAAI,CAACkB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAM,IAAI,CAACC,MAAM,CAAC;oBACtCpB,MAAMF;gBACR;gBACA,IAAI,CAACN,YAAY,CAAC6B,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAAC3B,YAAY,CAAC6B,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAAmC,EAAU;QAC/D,MAAMiB,qBAAqB,IAAI,CAAC1B,WAAW,CAACQ,IAAI,CAAC,CAACK,IAAMA,EAAEV,EAAE,KAAKM,sBAAsBI,EAAET,IAAI,KAAKK;QAClG,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC/B,MAAM,CAACgC,IAAI,CAAC,CAAC,oDAAoD,CAAC;YACvE;QACF;QACA,OAAOD,mBAAmBtB,IAAI;IAChC;AACF"}
+{"version":3,"sources":["../../../src/services/orm/permission.service.ts"],"names":["PermissionService","BaseService","Permission","PermissionDto","logger","_permissions","constructor","loggerFactory","typeormService","name","permissions","toDto","permission","id","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","repository","findOneBy","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BAWaA;;;eAAAA;;;6BATe;0BACD;+BACG;mCACI;wCAIU;AAErC,MAAMA,0BACHC,IAAAA,wBAAW,EAACC,oBAAU,EAAEC,4BAAa;IAG5BC,OAAsB;IAC/BC,eAA6B,EAAE,CAAC;IAExCC,YAAYC,aAA6B,EAAEC,cAA8B,CAAE;QACzE,KAAK,CAACA;QACN,IAAI,CAACJ,MAAM,GAAGG,cAAcP,kBAAkBS,IAAI;IACpD;IAEA,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACL,YAAY;IAC1B;IAEAM,MAAMC,UAAsB,EAA+B;QACzD,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBJ,MAAMG,WAAWH,IAAI;QACvB;IACF;IAEAK,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAW;QACtF,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAuB;QACrE,MAAMT,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAEb,IAAI,KAAKY;QAC3D,IAAI,CAACT,YAAY,MAAM,IAAIW,oCAAiB,CAAC;QAC7C,OAAOX;IACT;IAEA,MAAMY,cAAcC,YAA0B,EAAuB;QACnE,MAAMb,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKY;QACzD,IAAI,CAACb,YAAY,MAAM,IAAIW,oCAAiB,CAAC,CAAC,sCAAsC,CAAC;QAErF,OAAOX;IACT;IAEA,MAAMc,kBAAiC;QACrC,IAAI,CAACrB,YAAY,GAAG,EAAE;QAEtB,MAAMsB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIhB,cAAce,qBAAsB;YAC3C,MAAME,mBAAmB,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAEtB,MAAMG;YAAW;YAC5E,IAAI,CAACiB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAM,IAAI,CAACC,MAAM,CAAC;oBACtCxB,MAAMG;gBACR;gBACA,IAAI,CAACP,YAAY,CAAC6B,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAAC3B,YAAY,CAAC6B,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAAmC,EAAE;QACvD,MAAMiB,qBAAqB,IAAI,CAACzB,WAAW,CAACO,IAAI,CAC9C,CAACK,IAAMA,EAAET,EAAE,KAAKK,sBAAsBI,EAAEb,IAAI,KAAKS;QAEnD,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC/B,MAAM,CAACgC,IAAI,CAAC,CAAC,oDAAoD,CAAC;YACvE;QACF;QACA,OAAOD,mBAAmB1B,IAAI;IAChC;AACF"}

package/dist/services/orm/print-completion.service.js

@@ -17,10 +17,8 @@ const _arrayutil = require("../../utils/array.util");
 const _printcompletionshared = require("../mongoose/print-completion.shared");
 class PrintCompletionService extends (0, _baseservice.BaseService)(_entities.PrintCompletion, _printcompletiondto.PrintCompletionDto) {
     logger;
-    constructor({ typeormService, loggerFactory }){
-        super({
-            typeormService
-        });
+    constructor(typeormService, loggerFactory){
+        super(typeormService);
         this.logger = loggerFactory(PrintCompletionService.name);
     }
     toDto(entity) {

package/dist/services/orm/print-completion.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","filter","c","updateContext","length","warn","completionEntry","findOneBy","EVENT_TYPES","PrintStarted","update","listGroupByPrinterStatus","limitedCompletions","listPaged","printCompletionsAggr","groupArrayBy","val","toString","Object","entries","map","pc","parseInt","printEvents","processCompletions","loadPrintContexts","find","where","Not","In","PrintDone","PrintFailed","order"],"mappings":";;;;+BAaaA;;;eAAAA;;;6BAbe;0BACI;oCACqD;yBAG7D;6CACI;2BACC;uCAI2B;AAEjD,MAAMA,+BACHC,IAAAA,wBAAW,EAACC,yBAAe,EAAEC,sCAAkB;IAGvDC,OAAsB;IAEtBC,YAAY,EAAEC,cAAc,EAAEC,aAAa,EAAqE,CAAE;QAChH,KAAK,CAAC;YAAED;QAAe;QACvB,IAAI,CAACF,MAAM,GAAGG,cAAcP,uBAAuBQ,IAAI;IACzD;IAEAC,MAAMC,MAAuB,EAAoC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,kBAAkBN,OAAOM,gBAAgB;YACzCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS;QAC7B;IACF;IAEA,MAAMC,OAAOC,KAA6C,EAAE;QAC1D,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,MAAMC,cAAc,MAAM,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC,CAAC;QAClD,OAAOF,YAAYG,MAAM,CAAC,CAACC,IAAMA,EAAEd,OAAO,EAAES,kBAAkBA;IAChE;IAEA,MAAMM,cAAcN,aAAqB,EAAET,OAA+B,EAAiB;QACzF,IAAI,CAACS,eAAeO,QAAQ;YAC1B,IAAI,CAACzB,MAAM,CAAC0B,IAAI,CAAC;YACjB;QACF;QAEA,MAAMC,kBAAkB,MAAM,IAAI,CAACP,UAAU,CAACQ,SAAS,CAAC;YACtDnB,SAAS;gBAAES;YAAc;YACzBL,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QACA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC3B,MAAM,CAAC0B,IAAI,CAAC,CAAC,yBAAyB,EAAER,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAS,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAM,IAAI,CAACsB,MAAM,CAACJ,gBAAgBpB,EAAE,EAAEoB;IACxC;IAEA,MAAMK,2BAA2D;QAC/D,MAAMC,qBAAqB,MAAM,IAAI,CAACC,SAAS;QAC/C,MAAMC,uBAAuBC,IAAAA,uBAAY,EAACH,oBAAoB,CAACI,MAAQA,IAAIvB,SAAS,CAACwB,QAAQ;QAC7F,MAAMnB,cAAcoB,OAAOC,OAAO,CAACL,sBAAsBM,GAAG,CAAC,CAAC,CAACC,IAAIL,IAAI,GAAM,CAAA;gBAC3EvB,WAAW6B,SAASD;gBACpBE,aAAaP;YACf,CAAA;QACA,OAAOQ,IAAAA,yCAAkB,EAAC1B;IAC5B;IAEA,MAAM2B,oBAAgE;QACpE,MAAM3B,cAAc,MAAM,IAAI,CAACC,UAAU,CAAC2B,IAAI,CAAC;YAC7CC,OAAO;gBACLnC,QAAQoC,IAAAA,YAAG,EAACC,IAAAA,WAAE,EAAC;oBAACrB,wCAAW,CAACsB,SAAS;oBAAEtB,wCAAW,CAACuB,WAAW;iBAAC;YACjE;YACAC,OAAO;gBACLvC,WAAW;gBACXH,WAAW,CAAC;YACd;QACF;QAEA,OAAOyB,IAAAA,uBAAY,EAACjB,aAAa,CAACkB,MAAQA,IAAI9B,EAAE,CAAC+B,QAAQ;IAC3D;AACF"}
+{"version":3,"sources":["../../../src/services/orm/print-completion.service.ts"],"names":["PrintCompletionService","BaseService","PrintCompletion","PrintCompletionDto","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","printerReference","status","printerId","create","input","findPrintCompletion","correlationId","completions","repository","findBy","filter","c","updateContext","length","warn","completionEntry","findOneBy","EVENT_TYPES","PrintStarted","update","listGroupByPrinterStatus","limitedCompletions","listPaged","printCompletionsAggr","groupArrayBy","val","toString","Object","entries","map","pc","parseInt","printEvents","processCompletions","loadPrintContexts","find","where","Not","In","PrintDone","PrintFailed","order"],"mappings":";;;;+BAkBaA;;;eAAAA;;;6BAlBe;0BACI;oCAKzB;yBAGiB;6CACI;2BACC;uCAI2B;AAGjD,MAAMA,+BACHC,IAAAA,wBAAW,EAACC,yBAAe,EAAEC,sCAAkB;IAGtCC,OAAsB;IAEvCC,YAAYC,cAA8B,EAAEC,aAA6B,CAAE;QACzE,KAAK,CAACD;QACN,IAAI,CAACF,MAAM,GAAGG,cAAcP,uBAAuBQ,IAAI;IACzD;IAEAC,MAAMC,MAAuB,EAAoC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,kBAAkBN,OAAOM,gBAAgB;YACzCC,QAAQP,OAAOO,MAAM;YACrBC,WAAWR,OAAOQ,SAAS;QAC7B;IACF;IAEA,MAAMC,OAAOC,KAA6C,EAAE;QAC1D,OAAO,MAAM,KAAK,CAACD,OAAOC;IAC5B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,MAAMC,cAAc,MAAM,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC,CAAC;QAClD,OAAOF,YAAYG,MAAM,CAAC,CAACC,IAAMA,EAAEd,OAAO,EAAES,kBAAkBA;IAChE;IAEA,MAAMM,cAAcN,aAAiC,EAAET,OAA+B,EAAiB;QACrG,IAAI,CAACS,eAAeO,QAAQ;YAC1B,IAAI,CAACzB,MAAM,CAAC0B,IAAI,CAAC;YACjB;QACF;QAEA,MAAMC,kBAAkB,MAAM,IAAI,CAACP,UAAU,CAACQ,SAAS,CAAC;YACtDnB,SAAS;gBAAES;YAAc;YACzBL,QAAQgB,wCAAW,CAACC,YAAY;QAClC;QACA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC3B,MAAM,CAAC0B,IAAI,CACd,CAAC,yBAAyB,EAAER,cAAc,0DAA0D,CAAC;YAEvG;QACF;QACAS,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAM,IAAI,CAACsB,MAAM,CAACJ,gBAAgBpB,EAAE,EAAEoB;IACxC;IAEA,MAAMK,2BAA2D;QAC/D,MAAMC,qBAAqB,MAAM,IAAI,CAACC,SAAS;QAC/C,MAAMC,uBAAuBC,IAAAA,uBAAY,EAACH,oBAAoB,CAACI,MAAQA,IAAIvB,SAAS,CAACwB,QAAQ;QAC7F,MAAMnB,cAAcoB,OAAOC,OAAO,CAACL,sBAAsBM,GAAG,CAAC,CAAC,CAACC,IAAIL,IAAI,GAAM,CAAA;gBAC3EvB,WAAW6B,SAASD;gBACpBE,aAAaP;YACf,CAAA;QACA,OAAOQ,IAAAA,yCAAkB,EAAC1B;IAC5B;IAEA,MAAM2B,oBAAiF;QACrF,MAAM3B,cAAc,MAAM,IAAI,CAACC,UAAU,CAAC2B,IAAI,CAAC;YAC7CC,OAAO;gBACLnC,QAAQoC,IAAAA,YAAG,EAACC,IAAAA,WAAE,EAAC;oBAACrB,wCAAW,CAACsB,SAAS;oBAAEtB,wCAAW,CAACuB,WAAW;iBAAC;YACjE;YACAC,OAAO;gBACLvC,WAAW;gBACXH,WAAW,CAAC;YACd;QACF;QAEA,OAAOyB,IAAAA,uBAAY,EAACjB,aAAa,CAACkB,MAAQA,IAAI9B,EAAE,CAAC+B,QAAQ;IAC3D;AACF"}

package/dist/services/orm/printer-group.service.js

@@ -16,10 +16,8 @@ const _classvalidator = require("class-validator");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class PrinterGroupService extends (0, _baseservice.BaseService)(_printergroupentity.PrinterGroup, _printergroupdto.PrinterGroupDto) {
     groupRepository;
-    constructor({ typeormService }){
-        super({
-            typeormService
-        });
+    constructor(typeormService){
+        super(typeormService);
         this.groupRepository = typeormService.getDataSource().getRepository(_groupentity.Group);
     }
     async listGroups() {
@@ -60,9 +58,6 @@ class PrinterGroupService extends (0, _baseservice.BaseService)(_printergroupent
         };
     }
     async createGroup(dto) {
-        if (dto.id) {
-            delete dto.id;
-        }
         await (0, _classvalidator.validate)(dto);
         const entity = this.groupRepository.create(dto);
         await (0, _classvalidator.validate)(entity);

package/dist/services/orm/printer-group.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}

package/dist/services/orm/printer.service.js

@@ -12,27 +12,16 @@ const _printerdto = require("../interfaces/printer.dto");
 const _printerentity = require("../../entities/printer.entity");
 const _baseservice = require("./base.service");
 const _validators = require("../../handlers/validators");
-const _printerservicevalidation = require("../validators/printer-service.validation");
 const _eventconstants = require("../../constants/event.constants");
 const _normalizeurl = require("../../utils/normalize-url");
 const _urlutils = require("../../utils/url.utils");
-class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printer, _printerdto.PrinterDto) {
-    logger;
+const _printerservicevalidation = require("../validators/printer-service.validation");
+class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printer, _printerdto.PrinterDto, _printerdto.CreatePrinterDto) {
     eventEmitter2;
-    constructor({ loggerFactory, typeormService, eventEmitter2 }){
-        super({
-            typeormService
-        });
+    logger;
+    constructor(loggerFactory, typeormService, eventEmitter2){
+        super(typeormService), this.eventEmitter2 = eventEmitter2;
         this.logger = loggerFactory(PrinterService.name);
-        this.eventEmitter2 = eventEmitter2;
-    }
-    toUnsafeDto(entity) {
-        return {
-            ...this.toDto(entity),
-            apiKey: entity.apiKey,
-            printerURL: entity.printerURL,
-            printerType: entity.printerType
-        };
     }
     toDto(entity) {
         return {
@@ -40,7 +29,12 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
             name: entity.name,
             enabled: entity.enabled,
             disabledReason: entity.disabledReason,
-            dateAdded: entity.dateAdded
+            dateAdded: entity.dateAdded,
+            apiKey: entity.apiKey,
+            username: entity.username,
+            password: entity.password,
+            printerURL: entity.printerURL,
+            printerType: entity.printerType
         };
     }
     async list() {
@@ -51,9 +45,6 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
         });
     }
     async create(newPrinter, emitEvent = true) {
-        if (newPrinter.id) {
-            delete newPrinter.id;
-        }
         const mergedPrinter = await this.validateAndDefault(newPrinter);
         mergedPrinter.dateAdded = Date.now();
         const printer = await super.create(mergedPrinter);
@@ -72,23 +63,24 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
             });
         }
         Object.assign(printer, partial);
-        const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterRules);
+        const { printerURL, apiKey, enabled, name, printerType, password, username } = await (0, _validators.validateInput)(printer, _printerservicevalidation.createPrinterSchema);
         const updatedPrinter = await super.update(printerId, {
             printerURL,
             name,
             apiKey,
             enabled,
-            printerType
+            printerType,
+            password,
+            username
         });
         this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
-            printer,
-            updatedPrinter
+            printer
         });
         return updatedPrinter;
     }
     async batchImport(printers) {
         if (!printers?.length) return [];
-        this.logger.log("Validating passed");
+        this.logger.log("Validation passed");
         for (let printer of printers){
             await this.validateAndDefault(printer);
         }
@@ -104,31 +96,24 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
         return newPrinters;
     }
     async delete(printerId, emitEvent = true) {
-        const result = await this.repository.delete([
+        await this.repository.delete([
             printerId
         ]);
         if (emitEvent) {
             this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
                 printerIds: [
-                    [
-                        printerId
-                    ]
+                    printerId
                 ]
             });
         }
-        return result;
     }
     async deleteMany(printerIds, emitEvent = true) {
-        const result = await this.repository.delete(printerIds);
+        await this.repository.delete(printerIds);
         if (emitEvent) {
             this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
                 printerIds
             });
         }
-        return result;
-    }
-    updateConnectionSettings(printerId, partial) {
-        return this.update(printerId, partial);
     }
     updateDisabledReason(printerId, disabledReason) {
         return this.update(printerId, {
@@ -160,7 +145,7 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
                 defaultProtocol: _urlutils.defaultHttpProtocol
             });
         }
-        return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createPrinterRules);
+        return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createPrinterSchema);
     }
 }
 

package/dist/services/orm/printer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","logger","eventEmitter2","constructor","loggerFactory","typeormService","name","toUnsafeDto","entity","toDto","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterRules","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","result","printersDeleted","printerIds","deleteMany","updateConnectionSettings","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","constructor","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}

package/dist/services/orm/refresh-token.service.js

@@ -19,11 +19,8 @@ const _authorizationconstants = require("../../constants/authorization.constants
 class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.RefreshToken, _refreshtokendto.RefreshTokenDto) {
     settingsStore;
     logger;
-    constructor({ typeormService, settingsStore, loggerFactory }){
-        super({
-            typeormService
-        });
-        this.settingsStore = settingsStore;
+    constructor(settingsStore, loggerFactory, typeormService){
+        super(typeormService), this.settingsStore = settingsStore;
         this.logger = loggerFactory(RefreshTokenService.name);
     }
     toDto(entity) {
@@ -34,15 +31,12 @@ class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.Refres
             refreshAttemptsUsed: entity.refreshAttemptsUsed
         };
     }
-    async getRefreshToken(refreshToken, throwNotFoundError = true) {
+    async getRefreshToken(refreshToken) {
         const entity = await this.repository.findOneBy({
             refreshToken
         });
         if (!entity) {
-            if (throwNotFoundError) {
-                throw new _runtimeexceptions.AuthenticationError(`The entity ${_entities.RefreshToken.name} by provided refresh token is not found`, _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
-            }
-            return null;
+            throw new _runtimeexceptions.AuthenticationError(`The entity ${_entities.RefreshToken.name} by provided refresh token is not found`, _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredRefreshToken);
         }
         return entity;
     }
@@ -62,7 +56,7 @@ class RefreshTokenService extends (0, _baseservice.BaseService)(_entities.Refres
         return refreshToken;
     }
     async updateRefreshTokenAttempts(refreshToken, refreshAttemptsUsed) {
-        await this.getRefreshToken(refreshToken, true);
+        await this.getRefreshToken(refreshToken);
         await this.repository.update({
             refreshToken
         }, {

package/dist/services/orm/refresh-token.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/refresh-token.service.ts"],"names":["RefreshTokenService","BaseService","RefreshToken","RefreshTokenDto","settingsStore","logger","constructor","typeormService","loggerFactory","name","toDto","entity","id","userId","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","throwNotFoundError","repository","findOneBy","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","update","purgeAllOutdatedRefreshTokens","result","delete","LessThan","affected","debug","deleteRefreshTokenByUserId","deleteRefreshToken","purgeOutdatedRefreshTokensByUserId"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/refresh-token.service.ts"],"names":["RefreshTokenService","BaseService","RefreshToken","RefreshTokenDto","logger","constructor","settingsStore","loggerFactory","typeormService","name","toDto","entity","id","userId","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","repository","findOneBy","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","update","purgeAllOutdatedRefreshTokens","result","delete","LessThan","affected","debug","deleteRefreshTokenByUserId","deleteRefreshToken","purgeOutdatedRefreshTokensByUserId"],"mappings":"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"}

package/dist/services/orm/role.service.js

@@ -15,20 +15,15 @@ const _lodash = require("lodash");
 const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _authorizationconstants = require("../../constants/authorization.constants");
 class RoleService extends (0, _baseservice.BaseService)(_entities.Role, _roledto.RoleDto) {
-    settingsStore;
     appDefaultRole;
     appDefaultRoleNoLogin;
+    settingsStore;
     logger;
-    constructor({ loggerFactory, appDefaultRole, appDefaultRoleNoLogin, settingsStore, typeormService }){
-        super({
-            typeormService
-        });
+    constructor(typeormService, loggerFactory, appDefaultRole, appDefaultRoleNoLogin, settingsStore){
+        super(typeormService), this.appDefaultRole = appDefaultRole, this.appDefaultRoleNoLogin = appDefaultRoleNoLogin, this.settingsStore = settingsStore, this._roles = [];
         this.logger = loggerFactory(RoleService.name);
-        this.settingsStore = settingsStore;
-        this.appDefaultRole = appDefaultRole;
-        this.appDefaultRoleNoLogin = appDefaultRoleNoLogin;
     }
-    _roles = [];
+    _roles;
     get roles() {
         return this._roles;
     }
@@ -93,7 +88,13 @@ class RoleService extends (0, _baseservice.BaseService)(_entities.Role, _roledto
         return role;
     }
     getRolePermissions(role) {
+        if (!role || !role?.length) {
+            return [];
+        }
         const normalizedRole = this.normalizeRoleIdOrName(role);
+        if (!normalizedRole?.length) {
+            return [];
+        }
         return _authorizationconstants.ROLE_PERMS[normalizedRole];
     }
     async getSynchronizedRoleByName(roleName) {
@@ -121,7 +122,7 @@ class RoleService extends (0, _baseservice.BaseService)(_entities.Role, _roledto
     normalizeRoleIdOrName(assignedRole) {
         const roleInstance = this.roles.find((r)=>r.id === assignedRole || r.name === assignedRole);
         if (!roleInstance) {
-            console.warn(`The role by provided id was not found. Skipping.`);
+            this.logger.warn(`The role by provided id was not found. Skipping.`);
             return;
         }
         return roleInstance.name;

package/dist/services/orm/role.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/role.service.ts"],"names":["RoleService","BaseService","Role","RoleDto","settingsStore","appDefaultRole","appDefaultRoleNoLogin","logger","constructor","loggerFactory","typeormService","name","_roles","roles","getAppDefaultRole","getLoginRequired","getAppDefaultRoleIds","length","syncRoles","guestRole","getRoleByName","id","toDto","role","getRolesPermissions","permissions","normalizedRole","normalizeRoleIdOrName","rolePermissions","getRolePermissions","union","authorizeRoles","requiredRoles","assignedRoles","subset","isAuthorized","forEach","rr","result","authorizeRole","requiredRole","find","ar","getManyRoles","roleIds","map","roleId","getRole","r","NotFoundException","roleName","ROLE_PERMS","getSynchronizedRoleByName","Object","values","ROLES","storedRole","repository","findOneBy","newRole","create","push","assignedRole","roleInstance","console","warn"],"mappings":";;;;+BAaaA;;;eAAAA;;;6BAbe;0BAGP;yBAKG;wBACF;mCACY;wCACA;AAE3B,MAAMA,oBAAoBC,IAAAA,wBAAW,EAACC,cAAI,EAAEC,gBAAO;IACxDC,cAA6B;IAC7BC,eAAwB;IACxBC,sBAA8B;IACtBC,OAAsB;IAE9BC,YAAY,EACVC,aAAa,EACbJ,cAAc,EACdC,qBAAqB,EACrBF,aAAa,EACbM,cAAc,EAOf,CAAE;QACD,KAAK,CAAC;YAAEA;QAAe;QACvB,IAAI,CAACH,MAAM,GAAGE,cAAcT,YAAYW,IAAI;QAC5C,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAACC,cAAc,GAAGA;QACtB,IAAI,CAACC,qBAAqB,GAAGA;IAC/B;IAEQM,SAAiB,EAAE,CAAC;IAE5B,IAAIC,QAAQ;QACV,OAAO,IAAI,CAACD,MAAM;IACpB;IAEA,MAAME,oBAAqC;QACzC,IAAI,MAAM,IAAI,CAACV,aAAa,CAACW,gBAAgB,IAAI;YAC/C,OAAO,IAAI,CAACV,cAAc;QAC5B;QACA,OAAO,IAAI,CAACC,qBAAqB;IACnC;IAEA,MAAMU,uBAA0C;QAC9C,IAAI,CAAC,IAAI,CAACJ,MAAM,EAAEK,QAAQ;YACxB,MAAM,IAAI,CAACC,SAAS;QACtB;QAEA,MAAMC,YAAY,IAAI,CAACC,aAAa,CAAC,MAAM,IAAI,CAACN,iBAAiB;QACjE,OAAO;YAACK,UAAUE,EAAE;SAAC;IACvB;IAEAC,MAAMC,IAAU,EAAyB;QACvC,OAAO;YACLF,IAAIE,KAAKF,EAAE;YACXV,MAAMY,KAAKZ,IAAI;QACjB;IACF;IAEAa,oBAAoBX,KAAgC,EAAY;QAC9D,IAAIY,cAAwB,EAAE;QAC9B,IAAI,CAACZ,OAAOI,QAAQ,OAAO,EAAE;QAE7B,KAAK,IAAIM,QAAQV,MAAO;YACtB,MAAMa,iBAAiB,IAAI,CAACC,qBAAqB,CAACJ;YAClD,MAAMK,kBAAkB,IAAI,CAACC,kBAAkB,CAACH;YAChDD,cAAcK,IAAAA,aAAK,EAACL,aAAaG;QACnC;QAEA,OAAOH;IACT;IAQAM,eAAeC,aAAwC,EAAEC,aAAwC,EAAEC,MAAe,EAAW;QAC3H,IAAIC,eAAe;QAEnB,IAAI,CAACH,eAAef,QAAQ,OAAO;QACnCe,cAAcI,OAAO,CAAC,CAACC;YACrB,MAAMC,SAAS,IAAI,CAACC,aAAa,CAACF,IAAIJ;YACtCE,eAAeD,SAASC,gBAAgBG,SAASH,gBAAgBG;QACnE;QAEA,OAAOH;IACT;IAEAI,cAAcC,YAAmC,EAAEP,aAAwC,EAAW;QACpG,OAAO,CAAC,CAACA,cAAcQ,IAAI,CAAC,CAACC;YAC3B,MAAMhB,iBAAiB,IAAI,CAACC,qBAAqB,CAACe;YAClD,IAAI,CAAChB,gBAAgB,OAAO;YAC5B,OAAOA,mBAAmBc;QAC5B;IACF;IAEAG,aAAaC,OAAuB,EAAU;QAC5C,OAAOA,QAAQC,GAAG,CAAC,CAACC,SAAW,IAAI,CAACC,OAAO,CAACD;IAC9C;IAEAC,QAAQD,MAAoB,EAAQ;QAClC,MAAMvB,OAAO,IAAI,CAACX,MAAM,CAAC6B,IAAI,CAAC,CAACO,IAAMA,EAAE3B,EAAE,KAAKyB;QAC9C,IAAI,CAACvB,MAAM,MAAM,IAAI0B,oCAAiB,CAAC,CAAC,iCAAiC,CAAC;QAE1E,OAAO1B;IACT;IAEAH,cAAc8B,QAAgB,EAAQ;QACpC,MAAM3B,OAAO,IAAI,CAACX,MAAM,CAAC6B,IAAI,CAAC,CAACO,IAAMA,EAAErC,IAAI,KAAKuC;QAChD,IAAI,CAAC3B,MAAM,MAAM,IAAI0B,oCAAiB,CAAC,CAAC,mCAAmC,CAAC;QAE5E,OAAO1B;IACT;IAEAM,mBAAmBN,IAA2B,EAAY;QACxD,MAAMG,iBAAiB,IAAI,CAACC,qBAAqB,CAACJ;QAClD,OAAO4B,kCAAU,CAACzB,eAAe;IACnC;IAEA,MAAM0B,0BAA0BF,QAAgB,EAAiB;QAC/D,IAAI,CAAC,IAAI,CAACtC,MAAM,EAAEK,QAAQ;YACxB,MAAM,IAAI,CAACC,SAAS;QACtB;QAEA,OAAO,IAAI,CAACE,aAAa,CAAC8B;IAC5B;IAEA,MAAMhC,YAA2B;QAC/B,IAAI,CAACN,MAAM,GAAG,EAAE;QAChB,KAAK,IAAIsC,YAAYG,OAAOC,MAAM,CAACC,6BAAK,EAAG;YACzC,MAAMC,aAAa,MAAM,IAAI,CAACC,UAAU,CAACC,SAAS,CAAC;gBAAE/C,MAAMuC;YAAS;YACpE,IAAI,CAACM,YAAY;gBACf,MAAMG,UAAU,MAAM,IAAI,CAACC,MAAM,CAAC;oBAChCjD,MAAMuC;gBACR;gBACA,IAAI,CAACtC,MAAM,CAACiD,IAAI,CAACF;YACnB,OAAO;gBACL,IAAI,CAAC/C,MAAM,CAACiD,IAAI,CAACL;YACnB;QACF;IACF;IAEQ7B,sBAAsBmC,YAAmC,EAAsB;QACrF,MAAMC,eAAe,IAAI,CAAClD,KAAK,CAAC4B,IAAI,CAAC,CAACO,IAAMA,EAAE3B,EAAE,KAAKyC,gBAAgBd,EAAErC,IAAI,KAAKmD;QAChF,IAAI,CAACC,cAAc;YACjBC,QAAQC,IAAI,CAAC,CAAC,gDAAgD,CAAC;YAC/D;QACF;QAEA,OAAOF,aAAapD,IAAI;IAC1B;AACF"}
+{"version":3,"sources":["../../../src/services/orm/role.service.ts"],"names":["RoleService","BaseService","Role","RoleDto","logger","constructor","typeormService","loggerFactory","appDefaultRole","appDefaultRoleNoLogin","settingsStore","_roles","name","roles","getAppDefaultRole","getLoginRequired","getAppDefaultRoleIds","length","syncRoles","guestRole","getRoleByName","id","toDto","role","getRolesPermissions","permissions","normalizedRole","normalizeRoleIdOrName","rolePermissions","getRolePermissions","union","authorizeRoles","requiredRoles","assignedRoles","subset","isAuthorized","forEach","rr","result","authorizeRole","requiredRole","find","ar","getManyRoles","roleIds","map","roleId","getRole","r","NotFoundException","roleName","ROLE_PERMS","getSynchronizedRoleByName","Object","values","ROLES","storedRole","repository","findOneBy","newRole","create","push","assignedRole","roleInstance","warn"],"mappings":"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"}