@fdm-monster/server 1.9.3 → 2.0.0-rc1

package/dist/controllers/printer-files.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","logger","loggerFactory","printerApi","printerLogin","printerFilesStore","printerFileCleanTask","settingsStore","multerService","printerThumbnailCache","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileSchema","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","params","id","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","downloadFile","path","downloadFileSchema","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileSchema","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","toString","uploadPrinterFile","multerLoadFileAsync","AppConstants","defaultAcceptedGcodeExtensions","startPrintString","uploadFileSchema","ValidationException","join","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","catch","clearUploadedFile","loadPrinterThumbnailLocal","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","logger","loggerFactory","printerApi","printerLogin","printerFilesStore","printerFileCleanTask","settingsStore","multerService","printerThumbnailCache","name","purgeIndexedFiles","req","res","purgeFiles","send","getThumbnails","thumbnails","getAllValues","getFiles","currentPrinterId","getScopedPrinter","log","files","loadFiles","reloadThumbnail","filePath","validateInput","body","startPrintFileSchema","isThumbnailSupportEnabled","loadPrinterThumbnailRemote","e","error","errorSummary","captureException","startPrintFile","encodedFilePath","encodeURIComponent","startPrint","getFilesCache","currentPrinter","id","downloadFile","params","path","downloadFileSchema","response","setHeader","headers","length","data","pipe","deleteFileOrFolder","query","getFileSchema","result","deleteFile","clearPrinterFiles","failedFiles","succeededFiles","nonRecursiveFiles","file","push","purgePrinterFiles","getPrinterThumbnail","printerThumbnail","getValue","uploadPrinterFile","acceptedExtensions","getAcceptedFileExtensions","printerType","multerLoadFileAsync","startPrintString","uploadFileSchema","ValidationException","join","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","uploadedFile","token","startTrackingSession","uploadFile","catch","clearUploadedFile","loadPrinterThumbnailLocal","BambuType","AppConstants","defaultAcceptedBambuExtensions","defaultAcceptedGcodeExtensions","PrinterFiles","Clear","Get","Actions","Delete","Upload","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware"],"mappings":"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"}

package/dist/controllers/printer.controller.js

@@ -192,15 +192,14 @@ class PrinterController {
     }
     async testPrintApiConnection(inputLoginDto) {
         await (0, _validators.validateInput)(inputLoginDto, _printercontrollervalidation.testPrinterApiSchema);
+        this.logger.debug(`Testing API connection for printer type: ${inputLoginDto.printerType}`, inputLoginDto);
         try {
-            if (this.printerApi) {
-                await this.printerApi.getVersion();
-            } else {
-                const printerApi = this.printerApiFactory.getScopedPrinter(inputLoginDto);
-                await printerApi.getVersion();
-            }
+            const printerApi = this.printerApiFactory.getScopedPrinter(inputLoginDto);
+            await printerApi.validateConnection();
+            this.logger.debug("Connection validation completed successfully");
         } catch (e) {
-            this.logger.log("Printer version test failed");
+            this.logger.log("Printer connection validation failed");
+            this.logger.debug(`Error details: ${e}`);
             if (e instanceof _axios.AxiosError) {
                 this.logger.debug(e.message + " " + e.status + " " + e.response?.status);
                 switch(e.response?.status){

package/dist/controllers/printer.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","logger","loggerFactory","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","printerApi","floorStore","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledSchema","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonSchema","updateDisabledReason","disabledReason","refreshPrinterSocket","reconnectPrinterAdapter","deletePrinterSocketEvents","testConnection","printerURL","length","normalizeUrl","defaultProtocol","defaultHttpProtocol","testPrinterApiSchema","printerCorrelationToken","generateCorrelationToken","log","setupTestPrinter","e","correlationToken","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","setFeedRate","feedRateSchema","updateFeedRate","feedRate","setFlowRate","flowRateSchema","updateFlowRate","flowRate","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","logger","loggerFactory","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","printerApi","floorStore","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledSchema","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonSchema","updateDisabledReason","disabledReason","refreshPrinterSocket","reconnectPrinterAdapter","deletePrinterSocketEvents","testConnection","printerURL","length","normalizeUrl","defaultProtocol","defaultHttpProtocol","testPrinterApiSchema","printerCorrelationToken","generateCorrelationToken","log","setupTestPrinter","e","correlationToken","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","setFeedRate","feedRateSchema","updateFeedRate","feedRate","setFlowRate","flowRateSchema","updateFlowRate","flowRate","inputLoginDto","validateInput","debug","printerType","validateConnection","AxiosError","message","status","response","FailedDependencyException","code","InternalServerException","stack","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}

package/dist/controllers/server-public.controller.js

@@ -31,17 +31,15 @@ class ServerPublicController {
     serverVersion;
     serverReleaseService;
     monsterPiService;
-    isTypeormMode;
-    constructor(settingsStore, serverVersion, serverReleaseService, monsterPiService, isTypeormMode){
+    constructor(settingsStore, serverVersion, serverReleaseService, monsterPiService){
         this.settingsStore = settingsStore;
         this.serverVersion = serverVersion;
         this.serverReleaseService = serverReleaseService;
         this.monsterPiService = monsterPiService;
-        this.isTypeormMode = isTypeormMode;
     }
-    welcome(req, res) {
+    async welcome(req, res) {
         this.settingsStore.getSettings();
-        if (!this.settingsStore.getLoginRequired()) {
+        if (!await this.settingsStore.getLoginRequired()) {
             return res.send({
                 message: "Login disabled. Please load the Vue app."
             });
@@ -56,11 +54,6 @@ class ServerPublicController {
         const prusaLinkEnabled = serverSettings.experimentalPrusaLinkSupport;
         const bambuEnabled = serverSettings.experimentalBambuSupport;
         res.send({
-            printerGroupsApi: {
-                available: this.isTypeormMode,
-                version: 1,
-                subFeatures: {}
-            },
             multiplePrinterServices: {
                 available: true,
                 version: 1,
@@ -114,7 +107,7 @@ _ts_decorate([
         typeof _express.Request === "undefined" ? Object : _express.Request,
         typeof _express.Response === "undefined" ? Object : _express.Response
     ]),
-    _ts_metadata("design:returntype", void 0)
+    _ts_metadata("design:returntype", Promise)
 ], ServerPublicController.prototype, "welcome", null);
 _ts_decorate([
     (0, _awilixexpress.GET)(),
@@ -160,8 +153,7 @@ ServerPublicController = _ts_decorate([
         typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore,
         String,
         typeof _serverreleaseservice.ServerReleaseService === "undefined" ? Object : _serverreleaseservice.ServerReleaseService,
-        typeof _monsterpiservice.MonsterPiService === "undefined" ? Object : _monsterpiservice.MonsterPiService,
-        Boolean
+        typeof _monsterpiservice.MonsterPiService === "undefined" ? Object : _monsterpiservice.MonsterPiService
     ])
 ], ServerPublicController);
 

package/dist/controllers/server-public.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","settingsStore","serverVersion","serverReleaseService","monsterPiService","isTypeormMode","welcome","req","res","getSettings","getLoginRequired","send","message","getFeatures","serverSettings","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","bambuEnabled","experimentalBambuSupport","printerGroupsApi","available","version","subFeatures","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","authenticate","permission","PERMS","ServerInfo","Get","apiRoute"],"mappings":";;;;+BAWaA;;;eAAAA;;;+BAXsB;iCACN;0BACN;8BACkB;wCACnB;+BACQ;sCACO;kCACJ;yBACC;;;;;;;;;;AAG3B,MAAMA;;;;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,EACtC,AAAiBC,oBAA0C,EAC3D,AAAiBC,gBAAkC,EACnD,AAAiBC,aAAsB,CACvC;aALiBJ,gBAAAA;aACAC,gBAAAA;aACAC,uBAAAA;aACAC,mBAAAA;aACAC,gBAAAA;IAEnB;IAKAC,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACnC,IAAI,CAACP,aAAa,CAACQ,WAAW;QAE9B,IAAI,CAAC,IAAI,CAACR,aAAa,CAACS,gBAAgB,IAAI;YAC1C,OAAOF,IAAIG,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOJ,IAAIG,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAKAC,YAAYN,GAAY,EAAEC,GAAa,EAAE;QACvC,MAAMM,iBAAiB,IAAI,CAACb,aAAa,CAACc,iBAAiB;QAC3D,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QACpE,MAAMC,eAAeN,eAAeO,wBAAwB;QAC5Db,IAAIG,IAAI,CAAC;YACPW,kBAAkB;gBAEhBC,WAAW,IAAI,CAAClB,aAAa;gBAC7BmB,SAAS;gBACTC,aAAa,CAAC;YAChB;YACAC,yBAAyB;gBACvBH,WAAW;gBACXC,SAAS;gBACTC,aAAa;oBACXE,OAAO;wBACL;2BACIX,mBAAmB;4BAAC;yBAAU,GAAG,EAAE;2BACnCE,mBAAmB;4BAAC;yBAAY,GAAG,EAAE;2BACrCE,eAAe;4BAAC;yBAAQ,GAAG,EAAE;qBAClC;gBACH;YACF;QACF;IACF;IAEA,MAGMQ,WAAWrB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAMqB,cAAc,IAAI,CAAC1B,oBAAoB,CAAC2B,QAAQ;QACtD,MAAMC,mBAAmB,IAAI,CAAC3B,gBAAgB,CAAC4B,uBAAuB;QAEtExB,IAAIyB,IAAI,CAAC;YACPT,SAAS,IAAI,CAACtB,aAAa;YAC3BgC,QAAQA,IAAAA,gBAAM;YACdC,IAAIC,QAAQC,GAAG,CAACC,EAAE;YAClBC,WAAWR;YACXS,QAAQ;gBACNC,QAAQZ,YAAYY,MAAM;gBAC1BC,iBAAiBb,YAAYa,eAAe;gBAC5CC,WAAWd,YAAYc,SAAS;YAClC;QACF;IACF;IAEA,MAEMC,KAAKrC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIG,IAAI,CAAC;YACPC,SAAS;QACX;IACF;AACF;;;;;QAxEWiC,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;QAiB/CJ,IAAAA,0BAAY;;;;;;;;;;;;;QA8BZA,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;;;;;;;;4DA5DtCC"}
+{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","settingsStore","serverVersion","serverReleaseService","monsterPiService","welcome","req","res","getSettings","getLoginRequired","send","message","getFeatures","serverSettings","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","bambuEnabled","experimentalBambuSupport","multiplePrinterServices","available","version","subFeatures","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","authenticate","permission","PERMS","ServerInfo","Get","apiRoute"],"mappings":";;;;+BAWaA;;;eAAAA;;;+BAXsB;iCACN;0BACN;8BACkB;wCACnB;+BACQ;sCACO;kCACJ;yBACC;;;;;;;;;;AAG3B,MAAMA;;;;;IACX,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,EACtC,AAAiBC,oBAA0C,EAC3D,AAAiBC,gBAAkC,CACnD;aAJiBH,gBAAAA;aACAC,gBAAAA;aACAC,uBAAAA;aACAC,mBAAAA;IAChB;IAEH,MAGMC,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACzC,IAAI,CAACN,aAAa,CAACO,WAAW;QAE9B,IAAI,CAAE,MAAM,IAAI,CAACP,aAAa,CAACQ,gBAAgB,IAAK;YAClD,OAAOF,IAAIG,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOJ,IAAIG,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAKAC,YAAYN,GAAY,EAAEC,GAAa,EAAE;QACvC,MAAMM,iBAAiB,IAAI,CAACZ,aAAa,CAACa,iBAAiB;QAC3D,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QACpE,MAAMC,eAAeN,eAAeO,wBAAwB;QAC5Db,IAAIG,IAAI,CAAC;YACPW,yBAAyB;gBACvBC,WAAW;gBACXC,SAAS;gBACTC,aAAa;oBACXC,OAAO;wBACL;2BACIV,mBAAmB;4BAAC;yBAAU,GAAG,EAAE;2BACnCE,mBAAmB;4BAAC;yBAAY,GAAG,EAAE;2BACrCE,eAAe;4BAAC;yBAAQ,GAAG,EAAE;qBAClC;gBACH;YACF;QACF;IACF;IAEA,MAGMO,WAAWpB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAMoB,cAAc,IAAI,CAACxB,oBAAoB,CAACyB,QAAQ;QACtD,MAAMC,mBAAmB,IAAI,CAACzB,gBAAgB,CAAC0B,uBAAuB;QAEtEvB,IAAIwB,IAAI,CAAC;YACPR,SAAS,IAAI,CAACrB,aAAa;YAC3B8B,QAAQA,IAAAA,gBAAM;YACdC,IAAIC,QAAQC,GAAG,CAACC,EAAE;YAClBC,WAAWR;YACXS,QAAQ;gBACNC,QAAQZ,YAAYY,MAAM;gBAC1BC,iBAAiBb,YAAYa,eAAe;gBAC5CC,WAAWd,YAAYc,SAAS;YAClC;QACF;IACF;IAEA,MAEMC,KAAKpC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIG,IAAI,CAAC;YACPC,SAAS;QACX;IACF;AACF;;;;;QAlEWgC,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;QAiB/CJ,IAAAA,0BAAY;;;;;;;;;;;;;QAwBZA,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;;;;;;;;4DApDtCC"}

package/dist/controllers/user.controller.js

@@ -40,15 +40,13 @@ class UserController {
     roleService;
     authService;
     settingsStore;
-    isTypeormMode;
     logger;
-    constructor(loggerFactory, userService, configService, roleService, authService, settingsStore, isTypeormMode){
+    constructor(loggerFactory, userService, configService, roleService, authService, settingsStore){
         this.userService = userService;
         this.configService = configService;
         this.roleService = roleService;
         this.authService = authService;
         this.settingsStore = settingsStore;
-        this.isTypeormMode = isTypeormMode;
         this.logger = loggerFactory(UserController.name);
     }
     async list(req, res) {
@@ -56,14 +54,14 @@ class UserController {
         res.send(users.map((u)=>this.userService.toDto(u)));
     }
     async create(req, res) {
-        const { username, password, roleIds } = await (0, _validators.validateMiddleware)(req, (0, _usercontrollervalidation.registerUserWithRolesSchema)(this.isTypeormMode));
+        const { username, password, roles } = await (0, _validators.validateMiddleware)(req, _usercontrollervalidation.registerUserWithRolesSchema);
         if (username.toLowerCase().includes("admin") || username.toLowerCase().includes("root") || username.toLowerCase() === "demo") {
             throw new _runtimeexceptions.BadRequestException("Username is not allowed");
         }
         await this.userService.register({
             username,
             password,
-            roles: roleIds,
+            roles,
             needsPasswordChange: false,
             isDemoUser: false,
             isRootUser: false,
@@ -138,19 +136,18 @@ class UserController {
         const ownUser = await this.userService.getUser(ownUserId);
         const mappedUser = this.userService.toDto(ownUser);
         const ownUserRoles = mappedUser.roles;
-        const adminRole = await this.roleService.getSynchronizedRoleByName(_authorizationconstants.ROLES.ADMIN);
-        if (ownUserId == changedUserId && !ownUserRoles.includes(adminRole.id) && !mappedUser.isRootUser) {
+        if (ownUserId == changedUserId && !ownUserRoles.includes(_authorizationconstants.ROLES.ADMIN) && !mappedUser.isRootUser) {
             throw new _runtimeexceptions.ForbiddenError("Only an ADMIN or OWNER user is allowed to change its own roles");
         }
-        const { roleIds } = await (0, _validators.validateInput)(req.body, (0, _usercontrollervalidation.setUserRolesSchema)(this.isTypeormMode));
-        if (ownUserId == changedUserId && !roleIds.includes(adminRole.id)) {
+        const { roles } = await (0, _validators.validateInput)(req.body, _usercontrollervalidation.setUserRolesSchema);
+        if (ownUserId == changedUserId && !roles.includes(_authorizationconstants.ROLES.ADMIN)) {
             if (mappedUser.isRootUser) {
                 throw new _runtimeexceptions.BadRequestException("It does not make sense to remove ADMIN role from an OWNER user.");
             } else {
                 throw new _runtimeexceptions.BadRequestException("An ADMIN user cannot remove its ADMIN role.");
             }
         }
-        await this.userService.setUserRoleIds(changedUserId, roleIds);
+        await this.userService.setUserRoles(changedUserId, roles);
         res.send();
     }
     async setVerified(req, res) {
@@ -358,8 +355,7 @@ UserController = _ts_decorate([
         typeof _configservice.IConfigService === "undefined" ? Object : _configservice.IConfigService,
         typeof _roleserviceinterface.IRoleService === "undefined" ? Object : _roleserviceinterface.IRoleService,
         typeof _authserviceinterface.IAuthService === "undefined" ? Object : _authserviceinterface.IAuthService,
-        typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore,
-        Boolean
+        typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore
     ])
 ], UserController);
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","logger","loggerFactory","userService","configService","roleService","authService","settingsStore","isTypeormMode","name","list","req","res","users","listUsers","send","map","u","toDto","create","username","password","roleIds","validateMiddleware","registerUserWithRolesSchema","toLowerCase","includes","BadRequestException","register","roles","needsPasswordChange","isDemoUser","isRootUser","isVerified","listRoles","roleDtos","r","profile","user","id","getUser","get","local","delete","deletedUserId","ownUserId","ForbiddenError","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","changeUsername","changedUserId","getLoginRequired","validateInput","body","usernameSchema","updateUsernameById","changePassword","oldPassword","newPassword","changePasswordSchema","updatePasswordById","setUserRoles","ownUser","mappedUser","ownUserRoles","adminRole","getSynchronizedRoleByName","ROLES","ADMIN","setUserRolesSchema","setUserRoleIds","setVerified","isVerifiedSchema","setVerifiedById","setRootUser","userId","isRootUserSchema","setIsRootUserById","authorizeRoles","ParamId","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"mappings":";;;;+BA4BaA;;;eAAAA;;;yBA5BqB;iCACL;8BACgB;wCACvB;4BAC4B;mCACE;+BACrB;sCACF;gCACM;sCACN;sCACA;+BAEE;4BACF;+BACC;+BACmB;0CAQ1C;0CACiB;;;;;;;;;;AAIjB,MAAMA;;;;;;;IACXC,OAAsB;IAEtB,YACEC,aAA6B,EAC7B,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA6B,EAC9C,AAAiBC,WAAyB,EAC1C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAsB,CACvC;aANiBL,cAAAA;aACAC,gBAAAA;aACAC,cAAAA;aACAC,cAAAA;aACAC,gBAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACP,MAAM,GAAGC,cAAcF,eAAeS,IAAI;IACjD;IAEA,MAGMC,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,QAAQ,MAAM,IAAI,CAACV,WAAW,CAACW,SAAS;QAC9CF,IAAIG,IAAI,CAACF,MAAMG,GAAG,CAAC,CAACC,IAAM,IAAI,CAACd,WAAW,CAACe,KAAK,CAACD;IACnD;IAEA,MAGME,OAAOR,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEQ,QAAQ,EAAEC,QAAQ,EAAEC,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAC9DZ,KACAa,IAAAA,qDAA2B,EAAC,IAAI,CAAChB,aAAa;QAEhD,IACEY,SAASK,WAAW,GAAGC,QAAQ,CAAC,YAChCN,SAASK,WAAW,GAAGC,QAAQ,CAAC,WAChCN,SAASK,WAAW,OAAO,QAC3B;YACA,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAACxB,WAAW,CAACyB,QAAQ,CAAC;YAC9BR;YACAC;YACAQ,OAAOP;YACPQ,qBAAqB;YACrBC,YAAY;YACZC,YAAY;YAEZC,YAAY;QACd;QACArB,IAAIG,IAAI;IACV;IAEA,MAEMmB,UAAUvB,GAAY,EAAEC,GAAa,EAAE;QAC3C,MAAMuB,WAAW,IAAI,CAAC9B,WAAW,CAACwB,KAAK,CAACb,GAAG,CAAC,CAACoB,IAAM,IAAI,CAAC/B,WAAW,CAACa,KAAK,CAACkB;QAC1ExB,IAAIG,IAAI,CAACoB;IACX;IAEA,MAEME,QAAQ1B,GAAY,EAAEC,GAAa,EAAE;QACzC,IAAI,CAACD,IAAI2B,IAAI,EAAEC,IAAI;YACjB3B,IAAIG,IAAI,CAAC,CAAC;YACV;QACF;QAEA,MAAMuB,OAAO,MAAM,IAAI,CAACnC,WAAW,CAACqC,OAAO,CAAC7B,IAAI2B,IAAI,EAAEC;QACtD3B,IAAIG,IAAI,CAAC,IAAI,CAACZ,WAAW,CAACe,KAAK,CAACoB;IAClC;IAEA,MAGMG,IAAI9B,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM0B,OAAO,MAAM,IAAI,CAACnC,WAAW,CAACqC,OAAO,CAAC7B,IAAI+B,KAAK,CAACH,EAAE;QACxD3B,IAAIG,IAAI,CAAC,IAAI,CAACZ,WAAW,CAACe,KAAK,CAACoB;IAClC;IAEA,MAGMK,OAAOhC,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMgC,gBAAgBjC,IAAI+B,KAAK,CAACH,EAAE;QAClC,MAAMM,YAAYlC,IAAI2B,IAAI,EAAEC;QAC5B,IAAIM,aAAaD,eAAe;YAC9B,MAAM,IAAIE,iCAAc,CAAC;QAC3B;QAEA,MAAMd,aAAa,MAAM,IAAI,CAAC7B,WAAW,CAAC4C,cAAc,CAACH;QACzD,IAAIZ,YAAY;YACd,MAAM,IAAIc,iCAAc,CAAC;QAC3B;QAEA,IAAI,IAAI,CAAC1C,aAAa,CAAC4C,UAAU,IAAI;YACnC,MAAMC,aAAa,MAAM,IAAI,CAAC9C,WAAW,CAAC+C,aAAa;YACvD,IAAIN,kBAAkBK,YAAY;gBAChC,IAAI,CAACE,eAAe;YACtB;QACF;QAEA,MAAM,IAAI,CAAChD,WAAW,CAACiD,UAAU,CAACR;QAElC,IAAI;YACF,MAAM,IAAI,CAACtC,WAAW,CAAC+C,YAAY,CAACT;QACtC,EAAE,OAAOU,GAAG;YACV,IAAI,CAACrD,MAAM,CAACsD,KAAK,CAACC,IAAAA,wBAAY,EAACF;QACjC;QAEA1C,IAAIG,IAAI;IACV;IAEA,MAGM0C,eAAe9C,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM8C,gBAAgB/C,IAAI+B,KAAK,CAACH,EAAE;QAElC,IAAI5B,IAAI2B,IAAI,EAAEC,MAAMmB,iBAAkB,MAAM,IAAI,CAACnD,aAAa,CAACoD,gBAAgB,IAAK;YAClF,MAAM,IAAIb,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAE1B,QAAQ,EAAE,GAAG,MAAMwC,IAAAA,yBAAa,EAACjD,IAAIkD,IAAI,EAAEC,wCAAc;QACjE,MAAM,IAAI,CAAC3D,WAAW,CAAC4D,kBAAkB,CAACL,eAAetC;QACzDR,IAAIG,IAAI;IACV;IAEA,MAGMiD,eAAerD,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM8C,gBAAgB/C,IAAI+B,KAAK,CAACH,EAAE;QAElC,IAAI5B,IAAI2B,IAAI,EAAEC,MAAMmB,iBAAkB,MAAM,IAAI,CAACnD,aAAa,CAACoD,gBAAgB,IAAK;YAClF,MAAM,IAAIb,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEmB,WAAW,EAAEC,WAAW,EAAE,GAAG,MAAMN,IAAAA,yBAAa,EAACjD,IAAIkD,IAAI,EAAEM,8CAAoB;QACvF,MAAM,IAAI,CAAChE,WAAW,CAACiE,kBAAkB,CAACV,eAAeO,aAAaC;QACtEtD,IAAIG,IAAI;IACV;IAEA,MAGMsD,aAAa1D,GAAY,EAAEC,GAAa,EAAE;QAC9C,MAAM8C,gBAAgB/C,IAAI+B,KAAK,CAACH,EAAE;QAElC,MAAMM,YAAYlC,IAAI2B,IAAI,EAAEC;QAC5B,IAAI,CAACM,WAAW;YACd,MAAM,IAAIC,iCAAc,CAAC;QAC3B;QAEA,MAAMwB,UAAU,MAAM,IAAI,CAACnE,WAAW,CAACqC,OAAO,CAACK;QAE/C,MAAM0B,aAAa,IAAI,CAACpE,WAAW,CAACe,KAAK,CAACoD;QAE1C,MAAME,eAAeD,WAAW1C,KAAK;QACrC,MAAM4C,YAAY,MAAM,IAAI,CAACpE,WAAW,CAACqE,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAE9E,IAAI/B,aAAaa,iBAAiB,CAACc,aAAa9C,QAAQ,CAAC+C,UAAUlC,EAAE,KAAK,CAACgC,WAAWvC,UAAU,EAAE;YAChG,MAAM,IAAIc,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAExB,OAAO,EAAE,GAAG,MAAMsC,IAAAA,yBAAa,EAACjD,IAAIkD,IAAI,EAAEgB,IAAAA,4CAAkB,EAAC,IAAI,CAACrE,aAAa;QAEvF,IAAIqC,aAAaa,iBAAiB,CAACpC,QAAQI,QAAQ,CAAC+C,UAAUlC,EAAE,GAAG;YACjE,IAAIgC,WAAWvC,UAAU,EAAE;gBACzB,MAAM,IAAIL,sCAAmB,CAAC;YAChC,OAAO;gBACL,MAAM,IAAIA,sCAAmB,CAAC;YAChC;QACF;QAEA,MAAM,IAAI,CAACxB,WAAW,CAAC2E,cAAc,CAACpB,eAAepC;QACrDV,IAAIG,IAAI;IACV;IAEA,MAGMgE,YAAYpE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM8C,gBAAgB/C,IAAI+B,KAAK,CAACH,EAAE;QAElC,MAAMM,YAAYlC,IAAI2B,IAAI,EAAEC;QAC5B,IAAIM,aAAaa,eAAe;YAC9B,MAAM,IAAIZ,iCAAc,CAAC;QAC3B;QAEA,MAAMd,aAAa,MAAM,IAAI,CAAC7B,WAAW,CAAC4C,cAAc,CAACW;QACzD,IAAI1B,YAAY;YACd,MAAM,IAAIc,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEb,UAAU,EAAE,GAAG,MAAM2B,IAAAA,yBAAa,EAACjD,IAAIkD,IAAI,EAAEmB,0CAAgB;QACrE,MAAM,IAAI,CAAC7E,WAAW,CAAC8E,eAAe,CAACvB,eAAezB;QAEtDrB,IAAIG,IAAI;IACV;IAEA,MAGMmE,YAAYvE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM8C,gBAAgB/C,IAAI+B,KAAK,CAACH,EAAE;QAElC,MAAM4C,SAASxE,IAAI2B,IAAI,EAAEC;QACzB,IAAI4C,QAAQ;YACV,MAAMnD,aAAa,MAAM,IAAI,CAAC7B,WAAW,CAAC4C,cAAc,CAACoC;YACzD,IAAI,CAACnD,YAAY;gBACf,MAAM,IAAIc,iCAAc,CAAC;YAC3B;QACF;QACA,MAAM,EAAEd,UAAU,EAAE,GAAG,MAAM4B,IAAAA,yBAAa,EAACjD,IAAIkD,IAAI,EAAEuB,0CAAgB;QACrE,MAAM,IAAI,CAACjF,WAAW,CAACkF,iBAAiB,CAAC3B,eAAe1B;QACxDpB,IAAIG,IAAI;IACV;IAEAoC,kBAAkB;QAChB,MAAMH,aAAa,IAAI,CAAC5C,aAAa,CAAC4C,UAAU;QAChD,IAAIA,YAAY;YACd,MAAM,IAAIF,iCAAc,CAAC;QAC3B;IACF;AACF;;;;;QA/MWwC,IAAAA,4BAAc,EAAC;YAACX,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;QAQ5BU,IAAAA,4BAAc,EAAC;YAACX,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAgD5BU,IAAAA,4BAAc,EAAC;YAACX,6BAAK,CAACC,KAAK;SAAC;QAAGW,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAQvCD,IAAAA,4BAAc,EAAC;YAACX,6BAAK,CAACC,KAAK;SAAC;QAAGY,kCAAkB;QAAED,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAiC3DC,kCAAkB;QAAED,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAe5BC,kCAAkB;QAAED,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAe5BD,IAAAA,4BAAc,EAAC;YAACX,6BAAK,CAACC,KAAK;SAAC;QAAGY,kCAAkB;QAAED,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAoC3DD,IAAAA,4BAAc,EAAC;YAACX,6BAAK,CAACC,KAAK;SAAC;QAAGY,kCAAkB;QAAED,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAsB3DC,kCAAkB;QAAED,IAAAA,iCAAO,EAAC;;;;;;;;;;8BA5MhCE,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY"}
+{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","logger","loggerFactory","userService","configService","roleService","authService","settingsStore","name","list","req","res","users","listUsers","send","map","u","toDto","create","username","password","roles","validateMiddleware","registerUserWithRolesSchema","toLowerCase","includes","BadRequestException","register","needsPasswordChange","isDemoUser","isRootUser","isVerified","listRoles","roleDtos","r","profile","user","id","getUser","get","local","delete","deletedUserId","ownUserId","ForbiddenError","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","changeUsername","changedUserId","getLoginRequired","validateInput","body","usernameSchema","updateUsernameById","changePassword","oldPassword","newPassword","changePasswordSchema","updatePasswordById","setUserRoles","ownUser","mappedUser","ownUserRoles","ROLES","ADMIN","setUserRolesSchema","setVerified","isVerifiedSchema","setVerifiedById","setRootUser","userId","isRootUserSchema","setIsRootUserById","authorizeRoles","ParamId","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"mappings":"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"}

package/dist/controllers/validation/batch-controller.validation.js

@@ -21,18 +21,18 @@ _export(exports, {
 });
 const _zod = require("zod");
 const _genericvalidation = require("./generic.validation");
-const batchPrinterSchema = (isSqlite)=>_zod.z.object({
-        printerIds: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite))
-    });
-const executeBatchRePrinterSchema = (isSqlite)=>_zod.z.object({
-        prints: _zod.z.array(_zod.z.object({
-            printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
-            path: _zod.z.string()
-        }))
-    });
-const batchPrintersEnabledSchema = (isSqlite)=>_zod.z.object({
-        printerIds: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite)),
-        enabled: _zod.z.boolean()
-    });
+const batchPrinterSchema = _zod.z.object({
+    printerIds: _zod.z.array(_genericvalidation.idRuleV2)
+});
+const executeBatchRePrinterSchema = _zod.z.object({
+    prints: _zod.z.array(_zod.z.object({
+        printerId: _genericvalidation.idRuleV2,
+        path: _zod.z.string()
+    }))
+});
+const batchPrintersEnabledSchema = _zod.z.object({
+    printerIds: _zod.z.array(_genericvalidation.idRuleV2),
+    enabled: _zod.z.boolean()
+});
 
 //# sourceMappingURL=batch-controller.validation.js.map

package/dist/controllers/validation/batch-controller.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterSchema","batchPrintersEnabledSchema","executeBatchRePrinterSchema","isSqlite","z","object","printerIds","array","idRuleV2","prints","printerId","path","string","enabled","boolean"],"mappings":";;;;;;;;;;;QAGaA;eAAAA;;QAeAC;eAAAA;;QAVAC;eAAAA;;;qBARK;mCACO;AAElB,MAAMF,qBAAqB,CAACG,WACjCC,MAAC,CAACC,MAAM,CAAC;QACPC,YAAYF,MAAC,CAACG,KAAK,CAACC,IAAAA,2BAAQ,EAACL;IAC/B;AAEK,MAAMD,8BAA8B,CAACC,WAC1CC,MAAC,CAACC,MAAM,CAAC;QACPI,QAAQL,MAAC,CAACG,KAAK,CACbH,MAAC,CAACC,MAAM,CAAC;YACPK,WAAWF,IAAAA,2BAAQ,EAACL;YACpBQ,MAAMP,MAAC,CAACQ,MAAM;QAChB;IAEJ;AAEK,MAAMX,6BAA6B,CAACE,WACzCC,MAAC,CAACC,MAAM,CAAC;QACPC,YAAYF,MAAC,CAACG,KAAK,CAACC,IAAAA,2BAAQ,EAACL;QAC7BU,SAAST,MAAC,CAACU,OAAO;IACpB"}
+{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterSchema","batchPrintersEnabledSchema","executeBatchRePrinterSchema","z","object","printerIds","array","idRuleV2","prints","printerId","path","string","enabled","boolean"],"mappings":";;;;;;;;;;;QAGaA;eAAAA;;QAaAC;eAAAA;;QATAC;eAAAA;;;qBAPK;mCACO;AAElB,MAAMF,qBAAqBG,MAAC,CAACC,MAAM,CAAC;IACzCC,YAAYF,MAAC,CAACG,KAAK,CAACC,2BAAQ;AAC9B;AAEO,MAAML,8BAA8BC,MAAC,CAACC,MAAM,CAAC;IAClDI,QAAQL,MAAC,CAACG,KAAK,CACbH,MAAC,CAACC,MAAM,CAAC;QACPK,WAAWF,2BAAQ;QACnBG,MAAMP,MAAC,CAACQ,MAAM;IAChB;AAEJ;AAEO,MAAMV,6BAA6BE,MAAC,CAACC,MAAM,CAAC;IACjDC,YAAYF,MAAC,CAACG,KAAK,CAACC,2BAAQ;IAC5BK,SAAST,MAAC,CAACU,OAAO;AACpB"}

package/dist/controllers/validation/generic.validation.js

@@ -17,13 +17,9 @@ _export(exports, {
     }
 });
 const _zod = require("zod");
-const isHexadecimal = (str)=>/^[a-fA-F0-9]+$/.test(str);
-const isMongoId = (str)=>isHexadecimal(str) && str.length === 24;
-const idRuleV2 = (isSqlite)=>isSqlite ? _zod.z.number().min(1) : _zod.z.string().refine(isMongoId, {
-        message: "Invalid MongoDB ObjectId"
-    });
-const idRulesV2 = (isSqlite)=>_zod.z.object({
-        id: idRuleV2(isSqlite)
-    }).strict();
+const idRuleV2 = _zod.z.number().min(1);
+const idRulesV2 = _zod.z.object({
+    id: idRuleV2
+}).strict();
 
 //# sourceMappingURL=generic.validation.js.map

package/dist/controllers/validation/generic.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","isHexadecimal","str","test","isMongoId","length","isSqlite","z","number","min","string","refine","message","object","id","strict"],"mappings":";;;;;;;;;;;QAMaA;eAAAA;;QAOAC;eAAAA;;;qBAbK;AAElB,MAAMC,gBAAgB,CAACC,MAAgB,iBAAiBC,IAAI,CAACD;AAE7D,MAAME,YAAY,CAACF,MAAgBD,cAAcC,QAAQA,IAAIG,MAAM,KAAK;AAEjE,MAAMN,WAAW,CAACO,WACvBA,WACIC,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC,KACfF,MAAC,CAACG,MAAM,GAAGC,MAAM,CAACP,WAAW;QAC3BQ,SAAS;IACX;AAEC,MAAMZ,YAAY,CAACM,WACxBC,MAAC,CACEM,MAAM,CAAC;QACNC,IAAIf,SAASO;IACf,GACCS,MAAM"}
+{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","z","number","min","object","id","strict"],"mappings":";;;;;;;;;;;QAEaA;eAAAA;;QAEAC;eAAAA;;;qBAJK;AAEX,MAAMD,WAAWE,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC;AAEhC,MAAMH,YAAYC,MAAC,CAACG,MAAM,CAAC;IAAEC,IAAIN;AAAS,GAAGO,MAAM"}

package/dist/controllers/validation/printer-files-controller.validation.js

@@ -34,8 +34,8 @@ const getFileSchema = _zod.z.object({
 });
 const uploadFileSchema = _zod.z.object({
     startPrint: _zod.z.enum([
-        'true',
-        'false'
+        "true",
+        "false"
     ])
 });
 

package/dist/controllers/validation/user-controller.validation.js

@@ -33,7 +33,12 @@ _export(exports, {
 });
 const _zod = require("zod");
 const _serverconstants = require("../../server.constants");
-const _genericvalidation = require("./generic.validation");
+const _authorizationconstants = require("../../constants/authorization.constants");
+const roleNameSchema = _zod.z.enum([
+    _authorizationconstants.ROLES.ADMIN,
+    _authorizationconstants.ROLES.OPERATOR,
+    _authorizationconstants.ROLES.GUEST
+]);
 const registerUserSchema = _zod.z.object({
     username: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN).nonempty(),
     password: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN).nonempty()
@@ -42,14 +47,14 @@ const changePasswordSchema = _zod.z.object({
     oldPassword: _zod.z.string().nonempty(),
     newPassword: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN).nonempty()
 });
-const registerUserWithRolesSchema = (isSqlite)=>_zod.z.object({
-        username: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN).nonempty(),
-        password: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN).nonempty(),
-        roleIds: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite))
-    });
-const setUserRolesSchema = (isSqlite)=>_zod.z.object({
-        roleIds: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite))
-    });
+const registerUserWithRolesSchema = _zod.z.object({
+    username: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN).nonempty(),
+    password: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN).nonempty(),
+    roles: _zod.z.array(roleNameSchema)
+});
+const setUserRolesSchema = _zod.z.object({
+    roles: _zod.z.array(roleNameSchema)
+});
 const usernameSchema = _zod.z.object({
     username: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN).nonempty()
 });

package/dist/controllers/validation/user-controller.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/user-controller.validation.ts"],"names":["changePasswordSchema","isRootUserSchema","isVerifiedSchema","registerUserSchema","registerUserWithRolesSchema","setUserRolesSchema","usernameSchema","z","object","username","string","min","AppConstants","DEFAULT_USERNAME_MINLEN","nonempty","password","DEFAULT_PASSWORD_MINLEN","oldPassword","newPassword","isSqlite","roleIds","array","idRuleV2","isVerified","boolean","isRootUser"],"mappings":";;;;;;;;;;;QASaA;eAAAA;;QAyBAC;eAAAA;;QAJAC;eAAAA;;QA1BAC;eAAAA;;QAUAC;eAAAA;;QAOAC;eAAAA;;QAKAC;eAAAA;;;qBA1BK;iCACW;mCACJ;AAElB,MAAMH,qBAAqBI,MAAC,CAACC,MAAM,CAAC;IACzCC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,EAAEC,QAAQ;IACvEC,UAAUR,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACI,uBAAuB,EAAEF,QAAQ;AACzE;AAEO,MAAMd,uBAAuBO,MAAC,CAACC,MAAM,CAAC;IAC3CS,aAAaV,MAAC,CAACG,MAAM,GAAGI,QAAQ;IAChCI,aAAaX,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACI,uBAAuB,EAAEF,QAAQ;AAC5E;AAEO,MAAMV,8BAA8B,CAACe,WAC1CZ,MAAC,CAACC,MAAM,CAAC;QACPC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,EAAEC,QAAQ;QACvEC,UAAUR,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACI,uBAAuB,EAAEF,QAAQ;QACvEM,SAASb,MAAC,CAACc,KAAK,CAACC,IAAAA,2BAAQ,EAACH;IAC5B;AAEK,MAAMd,qBAAqB,CAACc,WACjCZ,MAAC,CAACC,MAAM,CAAC;QACPY,SAASb,MAAC,CAACc,KAAK,CAACC,IAAAA,2BAAQ,EAACH;IAC5B;AAEK,MAAMb,iBAAiBC,MAAC,CAACC,MAAM,CAAC;IACrCC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,EAAEC,QAAQ;AACzE;AAEO,MAAMZ,mBAAmBK,MAAC,CAACC,MAAM,CAAC;IACvCe,YAAYhB,MAAC,CAACiB,OAAO;AACvB;AAEO,MAAMvB,mBAAmBM,MAAC,CAACC,MAAM,CAAC;IACvCiB,YAAYlB,MAAC,CAACiB,OAAO;AACvB"}
+{"version":3,"sources":["../../../src/controllers/validation/user-controller.validation.ts"],"names":["changePasswordSchema","isRootUserSchema","isVerifiedSchema","registerUserSchema","registerUserWithRolesSchema","setUserRolesSchema","usernameSchema","roleNameSchema","z","enum","ROLES","ADMIN","OPERATOR","GUEST","object","username","string","min","AppConstants","DEFAULT_USERNAME_MINLEN","nonempty","password","DEFAULT_PASSWORD_MINLEN","oldPassword","newPassword","roles","array","isVerified","boolean","isRootUser"],"mappings":";;;;;;;;;;;QAWaA;eAAAA;;QAuBAC;eAAAA;;QAJAC;eAAAA;;QAxBAC;eAAAA;;QAUAC;eAAAA;;QAMAC;eAAAA;;QAIAC;eAAAA;;;qBA1BK;iCACW;wCACP;AAEtB,MAAMC,iBAAiBC,MAAC,CAACC,IAAI,CAAC;IAACC,6BAAK,CAACC,KAAK;IAAED,6BAAK,CAACE,QAAQ;IAAEF,6BAAK,CAACG,KAAK;CAAC;AAEjE,MAAMV,qBAAqBK,MAAC,CAACM,MAAM,CAAC;IACzCC,UAAUP,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,EAAEC,QAAQ;IACvEC,UAAUb,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACI,uBAAuB,EAAEF,QAAQ;AACzE;AAEO,MAAMpB,uBAAuBQ,MAAC,CAACM,MAAM,CAAC;IAC3CS,aAAaf,MAAC,CAACQ,MAAM,GAAGI,QAAQ;IAChCI,aAAahB,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACI,uBAAuB,EAAEF,QAAQ;AAC5E;AAEO,MAAMhB,8BAA8BI,MAAC,CAACM,MAAM,CAAC;IAClDC,UAAUP,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,EAAEC,QAAQ;IACvEC,UAAUb,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACI,uBAAuB,EAAEF,QAAQ;IACvEK,OAAOjB,MAAC,CAACkB,KAAK,CAACnB;AACjB;AAEO,MAAMF,qBAAqBG,MAAC,CAACM,MAAM,CAAC;IACzCW,OAAOjB,MAAC,CAACkB,KAAK,CAACnB;AACjB;AAEO,MAAMD,iBAAiBE,MAAC,CAACM,MAAM,CAAC;IACrCC,UAAUP,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB,EAAEC,QAAQ;AACzE;AAEO,MAAMlB,mBAAmBM,MAAC,CAACM,MAAM,CAAC;IACvCa,YAAYnB,MAAC,CAACoB,OAAO;AACvB;AAEO,MAAM3B,mBAAmBO,MAAC,CAACM,MAAM,CAAC;IACvCe,YAAYrB,MAAC,CAACoB,OAAO;AACvB"}

package/dist/data-source.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "AppDataSource", {
 require("reflect-metadata");
 const _typeorm = require("typeorm");
 const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
-const _path = require("path");
+const _nodepath = require("node:path");
 const _serverconstants = require("./server.constants");
 const _fsutils = require("./utils/fs.utils");
 const _floorentity = require("./entities/floor.entity");
@@ -32,6 +32,7 @@ const _1713300747465ChangeRoleNameUnique = require("./migrations/1713300747465-C
 const _1720338804844RemovePrinterFile = require("./migrations/1720338804844-RemovePrinterFile");
 const _1713897879622AddPrinterType = require("./migrations/1713897879622-AddPrinterType");
 const _1745141688926AddPrinterUsernamePassword = require("./migrations/1745141688926-AddPrinterUsernamePassword");
+const _1766576698569DropPermissions = require("./migrations/1766576698569-DropPermissions");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -39,12 +40,12 @@ function _interop_require_default(obj) {
 }
 if (process.env.NODE_ENV !== "test") {
     _dotenv.default.config({
-        path: (0, _path.join)((0, _fsutils.superRootPath)(), ".env")
+        path: (0, _nodepath.join)((0, _fsutils.superRootPath)(), ".env")
     });
 }
 const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] ?? "./database";
 const dbFile = process.env[_serverconstants.AppConstants.DATABASE_FILE] ?? "./fdm-monster.sqlite";
-const dbName = dbFile === ":memory:" ? dbFile : (0, _path.join)((0, _fsutils.superRootPath)(), dbFolder, dbFile);
+const dbName = dbFile === ":memory:" ? dbFile : (0, _nodepath.join)((0, _fsutils.superRootPath)(), dbFolder, dbFile);
 const AppDataSource = new _typeorm.DataSource({
     type: "better-sqlite3",
     database: dbName,
@@ -59,7 +60,6 @@ const AppDataSource = new _typeorm.DataSource({
         _camerastreamentity.CameraStream,
         _customgcodeentity.CustomGcode,
         _roleentity.Role,
-        _entities.Permission,
         _entities.RefreshToken,
         _entities.PrintCompletion,
         _userroleentity.UserRole,
@@ -73,7 +73,8 @@ const AppDataSource = new _typeorm.DataSource({
         _1713300747465ChangeRoleNameUnique.ChangeRoleNameUnique1713300747465,
         _1720338804844RemovePrinterFile.RemovePrinterFile1720338804844,
         _1713897879622AddPrinterType.AddPrinterType1713897879622,
-        _1745141688926AddPrinterUsernamePassword.AddPrinterUsernamePassword1745141688926
+        _1745141688926AddPrinterUsernamePassword.AddPrinterUsernamePassword1745141688926,
+        _1766576698569DropPermissions.DropPermissions1766576698569
     ],
     subscribers: []
 });

package/dist/data-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","process","env","NODE_ENV","dotenv","config","path","join","superRootPath","dbFolder","AppConstants","DATABASE_PATH","dbFile","DATABASE_FILE","dbName","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","CustomGcode","Role","Permission","RefreshToken","PrintCompletion","UserRole","Group","PrinterGroup","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","subscribers"],"mappings":";;;;+BAqCaA;;;eAAAA;;;QArCN;yBACoB;+DACR;sBACE;iCACQ;yBACC;6BACR;qCACQ;+BACN;gCACC;0BACuC;oCACnC;mCACD;4BACP;gCACI;yCACe;oCACX;6BACP;2CACoB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;;;;;;AAExD,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAMC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;IAC9B;AACF;AAEA,MAAMC,WAAWR,QAAQC,GAAG,CAACQ,6BAAY,CAACC,aAAa,CAAC,IAAI;AAC5D,MAAMC,SAASX,QAAQC,GAAG,CAACQ,6BAAY,CAACG,aAAa,CAAC,IAAI;AAC1D,MAAMC,SAASF,WAAW,aAAaA,SAASL,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,UAAUG;AAEzE,MAAMZ,gBAAgB,IAAIe,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUH;IACVI,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,8BAAW;QACXC,gBAAI;QACJC,oBAAU;QACVC,sBAAY;QACZC,yBAAe;QACfC,wBAAQ;QACRC,kBAAK;QACLC,gCAAY;KACb;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;KACxC;IACDC,aAAa,EAAE;AACjB"}
+{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","process","env","NODE_ENV","dotenv","config","path","join","superRootPath","dbFolder","AppConstants","DATABASE_PATH","dbFile","DATABASE_FILE","dbName","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","CustomGcode","Role","RefreshToken","PrintCompletion","UserRole","Group","PrinterGroup","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","subscribers"],"mappings":";;;;+BAoCaA;;;eAAAA;;;QApCN;yBACoB;+DACR;0BACE;iCACQ;yBACC;6BACR;qCACQ;+BACN;gCACC;0BAC2B;oCACvB;mCACD;4BACP;gCACI;yCACe;oCACX;6BACP;2CACoB;wEAC6B;mDACrB;gDACH;6CACH;yDACY;8CACX;;;;;;AAE7C,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAMC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI;IAC9B;AACF;AAEA,MAAMC,WAAWR,QAAQC,GAAG,CAACQ,6BAAY,CAACC,aAAa,CAAC,IAAI;AAC5D,MAAMC,SAASX,QAAQC,GAAG,CAACQ,6BAAY,CAACG,aAAa,CAAC,IAAI;AAC1D,MAAMC,SAASF,WAAW,aAAaA,SAASL,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAIC,UAAUG;AAEzE,MAAMZ,gBAAgB,IAAIe,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUH;IACVI,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,8BAAW;QACXC,gBAAI;QACJC,sBAAY;QACZC,yBAAe;QACfC,wBAAQ;QACRC,kBAAK;QACLC,gCAAY;KACb;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;KAC7B;IACDC,aAAa,EAAE;AACjB"}

package/dist/entities/index.js

@@ -21,9 +21,6 @@ _export(exports, {
     get FloorPosition () {
         return _floorpositionentity.FloorPosition;
     },
-    get Permission () {
-        return _permissionentity.Permission;
-    },
     get PrintCompletion () {
         return _printcompletionentity.PrintCompletion;
     },
@@ -44,7 +41,6 @@ _export(exports, {
     }
 });
 const _userentity = require("./user.entity");
-const _permissionentity = require("./permission.entity");
 const _camerastreamentity = require("./camera-stream.entity");
 const _customgcodeentity = require("./custom-gcode.entity");
 const _floorentity = require("./floor.entity");

package/dist/entities/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/index.ts"],"names":["CameraStream","CustomGcode","Floor","FloorPosition","Permission","PrintCompletion","Printer","RefreshToken","Role","Settings","User"],"mappings":";;;;;;;;;;;QAgBEA;eAAAA,gCAAY;;QACZC;eAAAA,8BAAW;;QACXC;eAAAA,kBAAK;;QACLC;eAAAA,kCAAa;;QALbC;eAAAA,4BAAU;;QASVC;eAAAA,sCAAe;;QAHfC;eAAAA,sBAAO;;QALPC;eAAAA,gCAAY;;QAMZC;eAAAA,gBAAI;;QACJC;eAAAA,wBAAQ;;QATRC;eAAAA,gBAAI;;;4BAbe;kCACM;oCACE;mCACD;6BACN;qCACQ;+BACN;4BACH;gCACI;uCACO;oCACH"}
+{"version":3,"sources":["../../src/entities/index.ts"],"names":["CameraStream","CustomGcode","Floor","FloorPosition","PrintCompletion","Printer","RefreshToken","Role","Settings","User"],"mappings":";;;;;;;;;;;QAcEA;eAAAA,gCAAY;;QACZC;eAAAA,8BAAW;;QACXC;eAAAA,kBAAK;;QACLC;eAAAA,kCAAa;;QAIbC;eAAAA,sCAAe;;QAHfC;eAAAA,sBAAO;;QALPC;eAAAA,gCAAY;;QAMZC;eAAAA,gBAAI;;QACJC;eAAAA,wBAAQ;;QARRC;eAAAA,gBAAI;;;4BAZe;oCACQ;mCACD;6BACN;qCACQ;+BACN;4BACH;gCACI;uCACO;oCACH"}

package/dist/entities/print-completion.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/print-completion.entity.ts"],"names":["PrintCompletion","id","fileName","createdAt","status","printer","printerId","printerReference","completionLog","context","type","Printer","p","printCompletions","onDelete","name","nullable"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBAN6F;+BAClF;2CACkB;;;;;;;;;;AAInC,MAAMA;IAEXC,GAAW;IAGXC,SAAiB;IAGjBC,UAAkB;IAGlBC,OAAe;IAQfC,QAA2B;IAG3BC,UAAkB;IAGlBC,iBAA0B;IAG1BC,cAAuB;IAGvBC,QAAmC;AACrC;;;;;;;;;;;QAzBsBC,MAAM;;;;;;;;;gCAOlBC,sBAAO,GACZC,IAAMA,EAAEC,gBAAgB;QACvBC,UAAU;;;QAEAC,MAAM;;;;;;QAGVC,UAAU;;;;;;QAGVA,UAAU;;;;;;QAGVA,UAAU;;;;;;QAGVN,MAAM;QAAeM,UAAU"}
+{"version":3,"sources":["../../src/entities/print-completion.entity.ts"],"names":["PrintCompletion","id","fileName","createdAt","status","printer","printerId","printerReference","completionLog","context","type","Printer","p","printCompletions","onDelete","name","nullable"],"mappings":";;;;+BAKaA;;;eAAAA;;;yBAL6F;+BAClF;2CACkB;;;;;;;;;;AAGnC,MAAMA;IAEXC,GAAW;IAGXC,SAAiB;IAGjBC,UAAkB;IAGlBC,OAAe;IAQfC,QAA2B;IAG3BC,UAAkB;IAGlBC,iBAA0B;IAG1BC,cAAuB;IAGvBC,QAAmC;AACrC;;;;;;;;;;;QAzBsBC,MAAM;;;;;;;;;gCAOlBC,sBAAO,GACZC,IAAMA,EAAEC,gBAAgB;QACvBC,UAAU;;;QAEAC,MAAM;;;;;;QAGVC,UAAU;;;;;;QAGVA,UAAU;;;;;;QAGVA,UAAU;;;;;;QAGVN,MAAM;QAAeM,UAAU"}

package/dist/entities/settings.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;;;;;;;;;;IASrD,MAYA,OAQA,OAOA,OAOA,OAQA;AA1CA,OAACC,0CAAiB;AAYlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAQnB,QAACC,0CAAiB;AA/Cb,MAAMN;IAEXO,GAAW;IAGX,CAAA,KAAmB,CASjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAKlB;IAGF,CAAA,MAAmB,CAGjB;AACJ;;;;;;;QA/CYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAWUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC"}
+{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","id","type","nullable"],"mappings":";;;;+BAWaA;;;eAAAA;;;yCAJN;yBACgD;;;;;;;;;;IAQrD,MAYA,OAQA,OAOA,OAOA,OAQA;AA1CA,OAACC,0CAAiB;AAYlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAQnB,QAACC,0CAAiB;AA/Cb,MAAMN;IAEXO,GAAW;IAGX,CAAA,KAAmB,CASjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAKlB;IAGF,CAAA,MAAmB,CAGjB;AACJ;;;;;;;QA/CYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAWUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC"}

package/dist/handlers/logging/file-logging.transport.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/handlers/logging/file-logging.transport.ts"],"names":["createFileLoggingTransport","options","enabled","date","DateTime","now","toISODate","logFilePath","join","superRootPath","AppConstants","defaultLogsFolder","logAppName","winston","transports","File","level","isTest","filename","maxsize","maxFiles"],"mappings":";;;;+BAWgBA;;;eAAAA;;;uBAXS;sBACJ;yBACS;iCACD;gEACT;;;;;;AAOb,SAASA,2BAA2BC,OAA0B;IACnE,IAAI,CAACA,QAAQC,OAAO,EAAE;QACpB;IACF;IAEA,MAAMC,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;IACrC,MAAMC,cAAcC,IAAAA,UAAI,EACtBC,IAAAA,sBAAa,KACbC,6BAAY,CAACC,iBAAiB,EAC9B,GAAGD,6BAAY,CAACE,UAAU,CAAC,CAAC,EAAET,KAAK,IAAI,CAAC;IAG1C,OAAO,IAAIU,gBAAO,CAACC,UAAU,CAACC,IAAI,CAAC;QACjCC,OAAOf,QAAQgB,MAAM,GAAG,SAAS;QACjCC,UAAUX;QACVY,SAAS;QACTC,UAAU;IACZ;AACF"}
+{"version":3,"sources":["../../../src/handlers/logging/file-logging.transport.ts"],"names":["createFileLoggingTransport","options","enabled","date","DateTime","now","toISODate","logFilePath","join","superRootPath","AppConstants","defaultLogsFolder","logAppName","winston","transports","File","level","isTest","filename","maxsize","maxFiles"],"mappings":";;;;+BAWgBA;;;eAAAA;;;uBAXS;sBACJ;yBACS;iCACD;gEACT;;;;;;AAOb,SAASA,2BAA2BC,OAA0B;IACnE,IAAI,CAACA,QAAQC,OAAO,EAAE;QACpB;IACF;IAEA,MAAMC,OAAOC,eAAQ,CAACC,GAAG,GAAGC,SAAS;IACrC,MAAMC,cAAcC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,6BAAY,CAACC,iBAAiB,EAAE,GAAGD,6BAAY,CAACE,UAAU,CAAC,CAAC,EAAET,KAAK,IAAI,CAAC;IAElH,OAAO,IAAIU,gBAAO,CAACC,UAAU,CAACC,IAAI,CAAC;QACjCC,OAAOf,QAAQgB,MAAM,GAAG,SAAS;QACjCC,UAAUX;QACVY,SAAS;QACTC,UAAU;IACZ;AACF"}

package/dist/handlers/logging/static.logger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/handlers/logging/static.logger.ts"],"names":["createStaticLogger","getStaticLogger","logContextClassProperty","staticLogger","levelMap","error","warn","info","debug","http","verbose","silly","Error","config","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","lokiTransport","createLokiLoggingTransport","logLevel","extraWinstonTransports","push","fileLoggerTransport","createFileLoggingTransport","enabled","enableFileLogs","winston","createLogger","transports","Console","level","format","combine","isDevelopmentEnvironment","ENABLE_COLORED_LOGS_KEY","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","serviceName","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice"],"mappings":"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"}
+{"version":3,"sources":["../../../src/handlers/logging/static.logger.ts"],"names":["createStaticLogger","getStaticLogger","logContextClassProperty","staticLogger","levelMap","error","warn","info","debug","http","verbose","silly","Error","config","isProd","process","env","AppConstants","NODE_ENV_KEY","defaultProductionEnv","isTest","defaultTestEnv","effectiveLogLevel","lokiTransport","createLokiLoggingTransport","logLevel","extraWinstonTransports","push","fileLoggerTransport","createFileLoggingTransport","enabled","enableFileLogs","winston","createLogger","transports","Console","level","format","combine","isDevelopmentEnvironment","ENABLE_COLORED_LOGS_KEY","rawLevel","colorize","colors","message","all","printf","now","Date","timestamp","toISOString","split","toTimeString","getMilliseconds","toString","padStart","levelAbbr","substring","toUpperCase","gray","reset","numberRegex","coloredMessage","replace","match","serviceName","logEntry","meta","metaString","JSON","stringify","coloredMeta","pascalCaseMeta","Object","entries","reduce","acc","key","value","pascalKey","charAt","slice"],"mappings":"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"}

package/dist/middleware/authenticate.js

@@ -42,7 +42,7 @@ const authenticate = ()=>(0, _awilixexpress.inject)((authService, loggerFactory,
             throw new _runtimeexceptions.AuthenticationError("Not authenticated", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredAuthToken);
         });
 function permission(requiredPermission) {
-    return (0, _awilixexpress.inject)((permissionService, roleService)=>async (req, res, next)=>{
+    return (0, _awilixexpress.inject)((permissionService, roleService)=>async (req, _res, next)=>{
             const userRoles = req.roles;
             if (!userRoles?.length) {
                 throw new _runtimeexceptions.AuthorizationError({
@@ -62,10 +62,10 @@ function permission(requiredPermission) {
             next();
         });
 }
-const authorizeRoles = (roles, subset = true)=>(0, _awilixexpress.inject)((roleService)=>async (req, res, next)=>{
-            if (!req.roles?.length || !roleService.authorizeRoles(roles, req.roles, subset)) {
+const authorizeRoles = (requiredRoles, subset = true)=>(0, _awilixexpress.inject)((roleService)=>async (req, res, next)=>{
+            if (!req.roles?.length || !roleService.authorizeRoles(requiredRoles, req.roles, subset)) {
                 throw new _runtimeexceptions.AuthorizationError({
-                    roles
+                    roles: requiredRoles
                 });
             }
             next();