@fdm-monster/server 1.5.0 → 1.5.3

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

@@ -40,13 +40,15 @@ class PrinterFilesController {
     multerService;
     printerFileCleanTask;
     logger;
-    constructor({ filesStore, octoPrintApiService, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService }){
+    isTypeormMode;
+    constructor({ filesStore, octoPrintApiService, batchCallService, printerFileCleanTask, settingsStore, loggerFactory, multerService, isTypeormMode }){
         this.filesStore = filesStore;
         this.settingsStore = settingsStore;
         this.printerFileCleanTask = printerFileCleanTask;
         this.octoPrintApiService = octoPrintApiService;
         this.batchCallService = batchCallService;
         this.multerService = multerService;
+        this.isTypeormMode = isTypeormMode;
         this.logger = loggerFactory(PrinterFilesController.name);
     }
     getTrackedUploads(req, res) {
@@ -115,7 +117,7 @@ class PrinterFilesController {
     /**
    * @deprecated this API endpoint will be moved to /batch from BatchCallController in 1.6.0
    */ async batchReprintFiles(req, res) {
-        const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterRules);
+        const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
         const results = await this.batchCallService.batchReprintCalls(printerIds);
         res.send(results);
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","filesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","response","eagerLoadPrinterFiles","statusResponse","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","failedFiles","succeededFiles","file","files","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","setExistingFileForPrint","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","uploadFileAsMultiPart","success","newOrUpdatedFile","local","appendOrSetPrinterFile","localUploadFile","localLocation","localFileUploadRules","endsWith","fs","existsSync","NotFoundException","lstatSync","isDirectory","stream","createReadStream","statusCode","status","data","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","filesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","response","eagerLoadPrinterFiles","statusResponse","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","failedFiles","succeededFiles","file","files","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","setExistingFileForPrint","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","uploadFileAsMultiPart","success","newOrUpdatedFile","local","appendOrSetPrinterFile","localUploadFile","localLocation","localFileUploadRules","endsWith","fs","existsSync","NotFoundException","lstatSync","isDirectory","stream","createReadStream","statusCode","status","data","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}

package/dist/controllers/printer-settings.controller.js

@@ -26,28 +26,30 @@ const _authorizationconstants = require("../constants/authorization.constants");
 class PrinterSettingsController {
     printerCache;
     octoPrintApiService;
-    constructor({ printerCache, octoPrintApiService }){
+    isTypeormMode;
+    constructor({ printerCache, octoPrintApiService, isTypeormMode }){
         this.printerCache = printerCache;
         this.octoPrintApiService = octoPrintApiService;
+        this.isTypeormMode = isTypeormMode;
     }
     async get(req, res) {
-        const { id: printerId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const loginDto = await this.printerCache.getLoginDtoAsync(printerId);
         const settings = await this.octoPrintApiService.getSettings(loginDto);
         res.send(settings);
     }
     async setGCodeAnalysis(req, res) {
-        const { id: printerId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const { enabled } = await (0, _validators.validateMiddleware)(req, _printersettingscontrollervalidation.setGcodeAnalysis);
         const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
         const settings = await this.octoPrintApiService.setGCodeAnalysis(printerLogin, enabled);
         res.send(settings);
     }
     async syncPrinterName(req, res) {
-        const { id: printerId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id: printerId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
-        const printerName = await this.printerCache.getNameAsync(printerId);
-        const settings = await this.octoPrintApiService.updatePrinterNameSetting(printerLogin, printerName);
+        const name = await this.printerCache.getNameAsync(printerId);
+        const settings = await this.octoPrintApiService.updatePrinterNameSetting(printerLogin, name);
         res.send(settings);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer-settings.controller.ts"],"names":["PrinterSettingsController","printerCache","octoPrintApiService","constructor","get","req","res","id","printerId","validateInput","params","idRules","loginDto","getLoginDtoAsync","settings","getSettings","send","setGCodeAnalysis","enabled","validateMiddleware","setGcodeAnalysis","printerLogin","syncPrinterName","printerName","getNameAsync","updatePrinterNameSetting","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterSettings","Get","post"],"mappings":";;;;;;;;;;;IAWaA,yBAAyB;eAAzBA;;IAoCb,OAKoD;eALpD;;;+BA/CiC;8BACY;4BACK;iCACrB;mCACL;qDACS;wCACX;AAKf,MAAMA;IACXC,aAA2B;IAC3BC,oBAAyC;IAEzCC,YAAY,EAAEF,YAAY,EAAEC,mBAAmB,EAA4E,CAAE;QAC3H,IAAI,CAACD,YAAY,GAAGA;QACpB,IAAI,CAACC,mBAAmB,GAAGA;IAC7B;IAEA,MAAME,IAAIC,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,0BAAO;QAEjE,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,gBAAgB,CAACL;QAC1D,MAAMM,WAAW,MAAM,IAAI,CAACZ,mBAAmB,CAACa,WAAW,CAACH;QAC5DN,IAAIU,IAAI,CAACF;IACX;IAEA,MAAMG,iBAAiBZ,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,0BAAO;QACjE,MAAM,EAAEO,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACd,KAAKe,qDAAgB;QAElE,MAAMC,eAAe,MAAM,IAAI,CAACpB,YAAY,CAACY,gBAAgB,CAACL;QAC9D,MAAMM,WAAW,MAAM,IAAI,CAACZ,mBAAmB,CAACe,gBAAgB,CAACI,cAAcH;QAC/EZ,IAAIU,IAAI,CAACF;IACX;IAEA,MAAMQ,gBAAgBjB,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,0BAAO;QAEjE,MAAMU,eAAe,MAAM,IAAI,CAACpB,YAAY,CAACY,gBAAgB,CAACL;QAC9D,MAAMe,cAAc,MAAM,IAAI,CAACtB,YAAY,CAACuB,YAAY,CAAChB;QACzD,MAAMM,WAAW,MAAM,IAAI,CAACZ,mBAAmB,CAACuB,wBAAwB,CAACJ,cAAcE;QACvFjB,IAAIU,IAAI,CAACF;IACX;AACF;MAEA,WAAeY,IAAAA,+BAAgB,EAAC1B,2BAC7B2B,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvB3B,GAAG,CAAC,QAAQ,OAAO4B,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,GAAG,GAC3DC,IAAI,CAAC,uBAAuB,oBAC5BA,IAAI,CAAC,yBAAyB"}
+{"version":3,"sources":["../../src/controllers/printer-settings.controller.ts"],"names":["PrinterSettingsController","printerCache","octoPrintApiService","isTypeormMode","constructor","get","req","res","id","printerId","validateInput","params","idRulesV2","loginDto","getLoginDtoAsync","settings","getSettings","send","setGCodeAnalysis","enabled","validateMiddleware","setGcodeAnalysis","printerLogin","syncPrinterName","name","getNameAsync","updatePrinterNameSetting","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterSettings","Get","post"],"mappings":";;;;;;;;;;;IAWaA,yBAAyB;eAAzBA;;IA8Cb,OAKoD;eALpD;;;+BAzDiC;8BACY;4BACK;iCACrB;mCACH;qDACO;wCACX;AAKf,MAAMA;IACXC,aAA2B;IAC3BC,oBAAyC;IACzCC,cAAuB;IAEvBC,YAAY,EACVH,YAAY,EACZC,mBAAmB,EACnBC,aAAa,EAKd,CAAE;QACD,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,IAAIC,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QAEtF,MAAMU,WAAW,MAAM,IAAI,CAACZ,YAAY,CAACa,gBAAgB,CAACL;QAC1D,MAAMM,WAAW,MAAM,IAAI,CAACb,mBAAmB,CAACc,WAAW,CAACH;QAC5DN,IAAIU,IAAI,CAACF;IACX;IAEA,MAAMG,iBAAiBZ,GAAY,EAAEC,GAAa,EAAE;QAClD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QACtF,MAAM,EAAEgB,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACd,KAAKe,qDAAgB;QAElE,MAAMC,eAAe,MAAM,IAAI,CAACrB,YAAY,CAACa,gBAAgB,CAACL;QAC9D,MAAMM,WAAW,MAAM,IAAI,CAACb,mBAAmB,CAACgB,gBAAgB,CAACI,cAAcH;QAC/EZ,IAAIU,IAAI,CAACF;IACX;IAEA,MAAMQ,gBAAgBjB,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,IAAIC,SAAS,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACJ,IAAIK,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACT,aAAa;QAEtF,MAAMmB,eAAe,MAAM,IAAI,CAACrB,YAAY,CAACa,gBAAgB,CAACL;QAC9D,MAAMe,OAAO,MAAM,IAAI,CAACvB,YAAY,CAACwB,YAAY,CAAChB;QAClD,MAAMM,WAAW,MAAM,IAAI,CAACb,mBAAmB,CAACwB,wBAAwB,CAACJ,cAAcE;QACvFjB,IAAIU,IAAI,CAACF;IACX;AACF;MAEA,WAAeY,IAAAA,+BAAgB,EAAC3B,2BAC7B4B,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,qBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvB3B,GAAG,CAAC,QAAQ,OAAO4B,IAAAA,4BAAc,EAACC,6BAAK,CAACC,eAAe,CAACC,GAAG,GAC3DC,IAAI,CAAC,uBAAuB,oBAC5BA,IAAI,CAAC,yBAAyB"}

package/dist/controllers/printer.controller.js

@@ -23,7 +23,6 @@ const _authenticate = require("../middleware/authenticate");
 const _validators = require("../handlers/validators");
 const _printercontrollervalidation = require("./validation/printer-controller.validation");
 const _serverconstants = require("../server.constants");
-const _serviceconstants = require("../constants/service.constants");
 const _printer = require("../middleware/printer");
 const _correlationtokenutil = require("../utils/correlation-token.util");
 const _authorizationconstants = require("../constants/authorization.constants");
@@ -127,7 +126,6 @@ class PrinterController {
     }
     async create(req, res) {
         let newPrinter = req.body;
-        newPrinter = this.#adjustPrinterObject(newPrinter);
         // Has internal validation, but might add some here above as well
         const createdPrinter = await this.printerService.create(newPrinter);
         const printer = await this.printerCache.getCachedPrinterOrThrowAsync(createdPrinter.id);
@@ -149,7 +147,6 @@ class PrinterController {
    */ async update(req, res) {
         const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
         let updatedPrinter = req.body;
-        updatedPrinter = this.#adjustPrinterObject(updatedPrinter);
         await this.printerService.update(currentPrinterId, updatedPrinter);
         const result = await this.printerCache.getCachedPrinterOrThrowAsync(currentPrinterId);
         res.send(result);
@@ -265,15 +262,6 @@ class PrinterController {
         const response = await this.octoPrintApiService.deleteBackup(printerLogin, fileName);
         res.send(response);
     }
-    #adjustPrinterObject(printer) {
-        // TODO move to service
-        printer.settingsAppearance = (0, _serviceconstants.getSettingsAppearanceDefault)();
-        if (printer.printerName) {
-            printer.settingsAppearance.name = printer.printerName;
-            delete printer.printerName;
-        }
-        return printer;
-    }
 }
 const _default = (0, _awilixexpress.createController)(PrinterController).prefix(_serverconstants.AppConstants.apiRoute + "/printer").before([
     (0, _authenticate.authenticate)(),

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","octoPrintApiService","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","printers","listCachedPrinters","send","listPrinterFloors","currentPrinterId","getScopedPrinter","results","Floor","find","getPrinter","foundPrinter","getCachedPrinterOrThrowAsync","getPrinterSocketInfo","getPrinterSocketEvents","getPrinterLoginDetails","printerLogin","octoPrintListCommands","commands","getSystemCommands","octoPrintSystemRestart","result","postSystemRestartCommand","sendSerialConnectCommand","command","connectCommand","sendConnectionCommand","sendSerialDisconnectCommand","disconnectCommand","pausePrintJob","pauseJobCommand","sendJobCommand","resumePrintJob","resumeJobCommand","stopPrintJob","cancelJobCommand","create","newPrinter","body","adjustPrinterObject","createdPrinter","printer","id","log","correlationToken","importBatch","importResult","batchImport","delete","removePrinterFromAnyFloor","update","updatedPrinter","updateConnectionSettings","inputData","validateMiddleware","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","updateEnabled","data","updatePrinterEnabledRule","JSON","stringify","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPluginList","pluginList","getCache","getPrinterPluginList","getPluginManagerPlugins","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","generateCorrelationToken","setupTestPrinter","e","failure","error","toString","refreshPrinterSocket","reconnectOctoPrint","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","response","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","settingsAppearance","getSettingsAppearanceDefault","printerName","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post","patch"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","octoPrintApiService","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","printers","listCachedPrinters","send","listPrinterFloors","currentPrinterId","getScopedPrinter","results","Floor","find","getPrinter","foundPrinter","getCachedPrinterOrThrowAsync","getPrinterSocketInfo","getPrinterSocketEvents","getPrinterLoginDetails","printerLogin","octoPrintListCommands","commands","getSystemCommands","octoPrintSystemRestart","result","postSystemRestartCommand","sendSerialConnectCommand","command","connectCommand","sendConnectionCommand","sendSerialDisconnectCommand","disconnectCommand","pausePrintJob","pauseJobCommand","sendJobCommand","resumePrintJob","resumeJobCommand","stopPrintJob","cancelJobCommand","create","newPrinter","body","createdPrinter","printer","id","log","correlationToken","importBatch","importResult","batchImport","delete","removePrinterFromAnyFloor","update","updatedPrinter","updateConnectionSettings","inputData","validateMiddleware","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","updateEnabled","data","updatePrinterEnabledRule","JSON","stringify","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPluginList","pluginList","getCache","getPrinterPluginList","getPluginManagerPlugins","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","generateCorrelationToken","setupTestPrinter","e","failure","error","toString","refreshPrinterSocket","reconnectOctoPrint","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","response","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post","patch"],"mappings":"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"}

package/dist/controllers/user.controller.js

@@ -32,12 +32,14 @@ class UserController {
     authService;
     settingsStore;
     logger;
-    constructor({ userService, configService, roleService, settingsStore, authService, loggerFactory }){
+    isTypeormMode;
+    constructor({ userService, configService, roleService, settingsStore, authService, loggerFactory, isTypeormMode }){
         this.userService = userService;
         this.configService = configService;
         this.roleService = roleService;
         this.authService = authService;
         this.settingsStore = settingsStore;
+        this.isTypeormMode = isTypeormMode;
         this.logger = loggerFactory(UserController.name);
     }
     async profile(req, res) {
@@ -57,7 +59,7 @@ class UserController {
         res.send(roleDtos);
     }
     async delete(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const ownUserId = req.user?.id;
         if (ownUserId) {
             if (ownUserId === id) {
@@ -83,12 +85,12 @@ class UserController {
         res.send();
     }
     async get(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const user = await this.userService.getUser(id);
         res.send(this.userService.toDto(user));
     }
     async changeUsername(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         if (req.user?.id !== id && await this.settingsStore.getLoginRequired()) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change username of other users");
         }
@@ -99,7 +101,7 @@ class UserController {
         res.send();
     }
     async changePassword(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         if (req.user?.id !== id && await this.settingsStore.getLoginRequired()) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change password of other users");
         }
@@ -111,7 +113,7 @@ class UserController {
         res.send();
     }
     async setVerified(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const ownUserId = req.user?.id;
         if (ownUserId) {
             if (ownUserId === id) {
@@ -137,7 +139,7 @@ class UserController {
         res.send();
     }
     async setRootUser(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const userId = req.user?.id;
         if (req.user?.id) {
             const isRootUser = await this.userService.isUserRootUser(userId);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","userService","roleService","configService","authService","settingsStore","logger","constructor","loggerFactory","name","profile","req","res","user","id","send","getUser","toDto","list","users","listUsers","map","u","listRoles","roleDtos","roles","r","delete","validateInput","params","idRules","ownUserId","ForbiddenError","isRootUser","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","get","changeUsername","getLoginRequired","username","body","updateUsernameById","changePassword","oldPassword","newPassword","updatePasswordById","setVerified","isVerified","setVerifiedById","setRootUser","userId","setIsRootUserById","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","post","demoUserNotAllowedInterceptor"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","userService","roleService","configService","authService","settingsStore","logger","isTypeormMode","constructor","loggerFactory","name","profile","req","res","user","id","send","getUser","toDto","list","users","listUsers","map","u","listRoles","roleDtos","roles","r","delete","validateInput","params","idRulesV2","ownUserId","ForbiddenError","isRootUser","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","get","changeUsername","getLoginRequired","username","body","updateUsernameById","changePassword","oldPassword","newPassword","updatePasswordById","setVerified","isVerified","setVerifiedById","setRootUser","userId","setIsRootUserById","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","post","demoUserNotAllowedInterceptor"],"mappings":"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"}

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

@@ -16,14 +16,15 @@ _export(exports, {
         return batchPrintersEnabledRules;
     }
 });
-const batchPrinterRules = {
-    printerIds: "required|array",
-    "printerIds.*": "required|mongoId"
-};
-const batchPrintersEnabledRules = {
-    printerIds: "required|array",
-    "printerIds.*": "required|mongoId",
-    enabled: "required|boolean"
-};
+const _genericvalidation = require("./generic.validation");
+const batchPrinterRules = (isSqlite)=>({
+        printerIds: "required|array",
+        "printerIds.*": (0, _genericvalidation.idRuleV2)(isSqlite)
+    });
+const batchPrintersEnabledRules = (isSqlite)=>({
+        printerIds: "required|array",
+        "printerIds.*": (0, _genericvalidation.idRuleV2)(isSqlite),
+        enabled: "required|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":["batchPrinterRules","batchPrintersEnabledRules","printerIds","enabled"],"mappings":";;;;;;;;;;;IAAaA,iBAAiB;eAAjBA;;IAKAC,yBAAyB;eAAzBA;;;AALN,MAAMD,oBAAoB;IAC/BE,YAAY;IACZ,gBAAgB;AAClB;AAEO,MAAMD,4BAA4B;IACvCC,YAAY;IACZ,gBAAgB;IAChBC,SAAS;AACX"}
+{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterRules","batchPrintersEnabledRules","isSqlite","printerIds","idRuleV2","enabled"],"mappings":";;;;;;;;;;;IAEaA,iBAAiB;eAAjBA;;IAKAC,yBAAyB;eAAzBA;;;mCAPuB;AAE7B,MAAMD,oBAAoB,CAACE,WAAuB,CAAA;QACvDC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;IAC3B,CAAA;AAEO,MAAMD,4BAA4B,CAACC,WAAuB,CAAA;QAC/DC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;QACzBG,SAAS;IACX,CAAA"}

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

@@ -2,14 +2,23 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "idRules", {
-    enumerable: true,
-    get: function() {
-        return idRules;
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    idRuleV2: function() {
+        return idRuleV2;
+    },
+    idRulesV2: function() {
+        return idRulesV2;
     }
 });
-const idRules = {
-    id: "required|mongoId"
-};
+const idRuleV2 = (isSqlite)=>`required|${isSqlite ? "integer|min:1" : "required|mongoId"}`;
+const idRulesV2 = (isSqlite)=>({
+        id: idRuleV2(isSqlite)
+    });
 
 //# 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":["idRules","id"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,UAA0B;IACrCC,IAAI;AACN"}
+{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","isSqlite","id"],"mappings":";;;;;;;;;;;IAAaA,QAAQ;eAARA;;IAEAC,SAAS;eAATA;;;AAFN,MAAMD,WAAW,CAACE,WAAsB,CAAC,SAAS,EAAEA,WAAW,kBAAkB,mBAAmB,CAAC;AAErG,MAAMD,YAAY,CAACC,WAAuB,CAAA;QAC/CC,IAAIH,SAASE;IACf,CAAA"}

package/dist/middleware/authenticate.js

@@ -25,26 +25,6 @@ _export(exports, {
 const _awilixexpress = require("awilix-express");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _authorizationconstants = require("../constants/authorization.constants");
-function authorizePermission(permission) {
-    return (0, _awilixexpress.inject)(({ permissionService, roleService })=>async (req, res, next)=>{
-            if (!req.roles?.length) {
-                throw new _runtimeexceptions.AuthorizationError({
-                    permissions: [
-                        permission
-                    ]
-                });
-            }
-            const assignedPermissions = roleService.getRolesPermissions(req.roles);
-            if (!permissionService.authorizePermission(permission, assignedPermissions)) {
-                throw new _runtimeexceptions.AuthorizationError({
-                    permissions: [
-                        permission
-                    ]
-                });
-            }
-            next();
-        });
-}
 const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authService, loggerFactory })=>async (req, res, next)=>{
             const logger = loggerFactory("Middleware:authenticate");
             const isLoginRequired = await settingsStore.getLoginRequired();
@@ -67,8 +47,30 @@ const authenticate = ()=>(0, _awilixexpress.inject)(({ settingsStore, authServic
             logger.log(`Not authenticated for route: ${req.originalUrl}`);
             throw new _runtimeexceptions.AuthenticationError("Not authenticated", _authorizationconstants.AUTH_ERROR_REASON.InvalidOrExpiredAuthToken);
         });
+function authorizePermission(permission) {
+    return (0, _awilixexpress.inject)(({ permissionService, roleService })=>async (req, res, next)=>{
+            const userRoles = req.roles;
+            if (!userRoles?.length) {
+                throw new _runtimeexceptions.AuthorizationError({
+                    permissions: [
+                        permission
+                    ]
+                });
+            }
+            const assignedPermissions = roleService.getRolesPermissions(userRoles);
+            if (!permissionService.authorizePermission(permission, assignedPermissions)) {
+                throw new _runtimeexceptions.AuthorizationError({
+                    permissions: [
+                        permission
+                    ]
+                });
+            }
+            next();
+        });
+}
 const authorizeRoles = (roles, subset = true)=>(0, _awilixexpress.inject)(({ roleService })=>async (req, res, next)=>{
-            if (!roleService.authorizeRoles(roles, req.roles, subset)) {
+            const userRoles = req.roles;
+            if (!roleService.authorizeRoles(roles, userRoles, subset)) {
                 throw new _runtimeexceptions.AuthorizationError({
                     roles
                 });

package/dist/middleware/authenticate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizePermission","authorizeRoles","withPermission","permission","inject","permissionService","roleService","req","res","next","roles","length","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","settingsStore","authService","loggerFactory","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","isJwtBlacklisted","isJwtTokenBlacklisted","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","subset","before"],"mappings":";;;;;;;;;;;IAuBaA,YAAY;eAAZA;;IAfGC,mBAAmB;eAAnBA;;IAqDHC,cAAc;eAAdA;;IASGC,cAAc;eAAdA;;;+BAtEO;mCACiC;wCAEtB;AAK3B,SAASF,oBAAoBG,UAAkB;IACpD,OAAOC,IAAAA,qBAAM,EAAC,CAAC,EAAEC,iBAAiB,EAAEC,WAAW,EAAE,GAAK,OAAOC,KAAcC,KAAeC;YACxF,IAAI,CAACF,IAAIG,KAAK,EAAEC,QAAQ;gBACtB,MAAM,IAAIC,qCAAkB,CAAC;oBAAEC,aAAa;wBAACV;qBAAW;gBAAC;YAC3D;YAEA,MAAMW,sBAAsBR,YAAYS,mBAAmB,CAACR,IAAIG,KAAK;YACrE,IAAI,CAACL,kBAAkBL,mBAAmB,CAACG,YAAYW,sBAAsB;gBAC3E,MAAM,IAAIF,qCAAkB,CAAC;oBAAEC,aAAa;wBAACV;qBAAW;gBAAC;YAC3D;YAEAM;QACF;AACF;AAEO,MAAMV,eAAe,IAC1BK,IAAAA,qBAAM,EACJ,CAAC,EACGY,aAAa,EACbC,WAAW,EACXC,aAAa,EAKd,GACD,OAAOX,KAAcC,KAAeC;YAClC,MAAMU,SAASD,cAAc;YAC7B,MAAME,kBAAkB,MAAMJ,cAAcK,gBAAgB;YAC5D,IAAI,CAACD,iBAAiB;gBACpB,OAAOX;YACT;YAEA,yCAAyC;YACzC,IAAIF,IAAIe,IAAI,EAAEC,qBAAqB;gBACjC,MAAM,IAAIC,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB;YACpG;YAEA,+BAA+B;YAC/B,MAAMC,SAASpB,IAAIqB,OAAO,CAACC,aAAa,EAAEC,QAAQ,WAAW,OAAOC;YACpE,MAAMC,mBAAmBf,YAAYgB,qBAAqB,CAACN;YAC3D,IAAI,CAAC,CAACA,QAAQhB,UAAUqB,kBAAkB;gBACxC,MAAM,IAAIR,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACS,aAAa;YACpF;YAEA,IAAI3B,IAAI4B,eAAe,IAAI;gBACzB,OAAO1B;YACT;YAEAU,OAAOiB,GAAG,CAAC,CAAC,6BAA6B,EAAE7B,IAAI8B,WAAW,CAAC,CAAC;YAC5D,MAAM,IAAIb,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACa,yBAAyB;QAChG;AAEC,MAAMrC,iBAAiB,CAACS,OAAiB6B,SAAS,IAAI,GAC3DnC,IAAAA,qBAAM,EAAC,CAAC,EAAEE,WAAW,EAAE,GAAK,OAAOC,KAAcC,KAAeC;YAC9D,IAAI,CAACH,YAAYL,cAAc,CAACS,OAAOH,IAAIG,KAAK,EAAE6B,SAAS;gBACzD,MAAM,IAAI3B,qCAAkB,CAAC;oBAAEF;gBAAM;YACvC;YAEAD;QACF;AAEK,SAASP,eAAeC,UAAkB;IAC/C,OAAO;QACLqC,QAAQ;YAACxC,oBAAoBG;SAAY;IAC3C;AACF"}
+{"version":3,"sources":["../../src/middleware/authenticate.ts"],"names":["authenticate","authorizePermission","authorizeRoles","withPermission","inject","settingsStore","authService","loggerFactory","req","res","next","logger","isLoginRequired","getLoginRequired","user","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","bearer","headers","authorization","replace","undefined","isJwtBlacklisted","isJwtTokenBlacklisted","length","LoginRequired","isAuthenticated","log","originalUrl","InvalidOrExpiredAuthToken","permission","permissionService","roleService","userRoles","roles","AuthorizationError","permissions","assignedPermissions","getRolesPermissions","subset","before"],"mappings":";;;;;;;;;;;IAWaA,YAAY;eAAZA;;IAuCGC,mBAAmB;eAAnBA;;IAmBHC,cAAc;eAAdA;;IAUGC,cAAc;eAAdA;;;+BA/EO;mCACiC;wCAEtB;AAQ3B,MAAMH,eAAe,IAC1BI,IAAAA,qBAAM,EACJ,CAAC,EACGC,aAAa,EACbC,WAAW,EACXC,aAAa,EAKd,GACD,OAAOC,KAAcC,KAAeC;YAClC,MAAMC,SAASJ,cAAc;YAC7B,MAAMK,kBAAkB,MAAMP,cAAcQ,gBAAgB;YAC5D,IAAI,CAACD,iBAAiB;gBACpB,OAAOF;YACT;YAEA,yCAAyC;YACzC,IAAIF,IAAIM,IAAI,EAAEC,qBAAqB;gBACjC,MAAM,IAAIC,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB;YACpG;YAEA,+BAA+B;YAC/B,MAAMC,SAASX,IAAIY,OAAO,CAACC,aAAa,EAAEC,QAAQ,WAAW,OAAOC;YACpE,MAAMC,mBAAmBlB,YAAYmB,qBAAqB,CAACN;YAC3D,IAAI,CAAC,CAACA,QAAQO,UAAUF,kBAAkB;gBACxC,MAAM,IAAIR,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACU,aAAa;YACpF;YAEA,IAAInB,IAAIoB,eAAe,IAAI;gBACzB,OAAOlB;YACT;YAEAC,OAAOkB,GAAG,CAAC,CAAC,6BAA6B,EAAErB,IAAIsB,WAAW,CAAC,CAAC;YAC5D,MAAM,IAAId,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACc,yBAAyB;QAChG;AAGC,SAAS9B,oBAAoB+B,UAAkB;IACpD,OAAO5B,IAAAA,qBAAM,EACX,CAAC,EAAE6B,iBAAiB,EAAEC,WAAW,EAAwE,GACvG,OAAO1B,KAAcC,KAAeC;YAClC,MAAMyB,YAAY3B,IAAI4B,KAAK;YAC3B,IAAI,CAACD,WAAWT,QAAQ;gBACtB,MAAM,IAAIW,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAW;gBAAC;YAC3D;YAEA,MAAMO,sBAAsBL,YAAYM,mBAAmB,CAACL;YAC5D,IAAI,CAACF,kBAAkBhC,mBAAmB,CAAC+B,YAAYO,sBAAsB;gBAC3E,MAAM,IAAIF,qCAAkB,CAAC;oBAAEC,aAAa;wBAACN;qBAAW;gBAAC;YAC3D;YAEAtB;QACF;AAEN;AAEO,MAAMR,iBAAiB,CAACkC,OAAiBK,SAAS,IAAI,GAC3DrC,IAAAA,qBAAM,EAAC,CAAC,EAAE8B,WAAW,EAAiC,GAAK,OAAO1B,KAAcC,KAAeC;YAC7F,MAAMyB,YAAY3B,IAAI4B,KAAK;YAC3B,IAAI,CAACF,YAAYhC,cAAc,CAACkC,OAAOD,WAAWM,SAAS;gBACzD,MAAM,IAAIJ,qCAAkB,CAAC;oBAAED;gBAAM;YACvC;YAEA1B;QACF;AAEK,SAASP,eAAe6B,UAAkB;IAC/C,OAAO;QACLU,QAAQ;YAACzC,oBAAoB+B;SAAY;IAC3C;AACF"}

package/dist/middleware/global.middleware.js

@@ -66,9 +66,13 @@ const validateWhitelistedIp = (0, _awilixexpress.inject)(({ settingsStore, logge
         }
         next();
     });
-const interceptRoles = (0, _awilixexpress.inject)(({ settingsStore, roleService })=>async (req, res, next)=>{
+const interceptRoles = (0, _awilixexpress.inject)(({ settingsStore, roleService, isTypeormMode })=>async (req, res, next)=>{
         const serverSettings = await settingsStore.getSettings();
-        req.roles = req.user?.roles;
+        if (isTypeormMode) {
+            req.roles = req.user?.roles.map((r)=>r.id);
+        } else {
+            req.roles = req.user?.roles;
+        }
         // If server settings are not set, we can't determine the default role
         if (serverSettings && !req.user) {
             const roleName = await roleService.getAppDefaultRole();

package/dist/middleware/global.middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWhitelistedIp","validateWizardCompleted","inject","settingsStore","loggerFactory","req","res","next","logger","name","serverSettings","getSettings","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","getServerSettings","whitelistEnabled","whitelist","serverSettingsKey","whitelistedIpAddresses","ipAddress","socket","remoteAddress","length","subnextMatched","find","w","roleService","roles","user","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IA+DaA,cAAc;eAAdA;;IA9BAC,qBAAqB;eAArBA;;IA1BAC,uBAAuB;eAAvBA;;;+BAPU;yCACW;mCACH;AAKxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,CAAC,CAACR,cAAcS,iBAAiB,IAAIC,iBAAiB;YACxDN;YACA;QACF;QAEA,MAAMO,eAAe;YACnB;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACV,IAAIW,IAAI,KAAK,CAACX,IAAIW,IAAI,CAACC,UAAU,CAAC,SAAS;YACnEV;YACA;QACF,OAAO;YACLC,OAAOU,KAAK,CAAC,wBAAwBb,IAAIW,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CAAC,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,MAAM,CAAC;QACpH;IACF;AAGG,MAAMpB,wBAAwBE,IAAAA,qBAAM,EACzC,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,AAAC,CAACD,kBAAkB,CAACP,cAAckB,iBAAiB,MAAO,CAAClB,cAAckB,iBAAiB,IAAIC,kBAAkB;YACnHf;YACA;QACF;QAEA,MAAMgB,YAAYb,cAAc,CAACc,0CAAiB,CAAC,CAACC,sBAAsB;QAC1E,MAAMC,YAAYrB,IAAIsB,MAAM,CAACC,aAAa;QAC1C,iDAAiD;QACjD,uDAAuD;QACvD,IAAIL,WAAWM,UAAU,CAACN,UAAUR,QAAQ,CAACW,cAAcA,cAAc,oBAAoB;YAC3F,8DAA8D;YAC9D,MAAMI,iBAAiBP,UAAUQ,IAAI,CAAC,CAACC;gBACrC,OAAON,UAAUT,UAAU,CAACe;YAC9B;YAEA,IAAI,CAACF,gBAAgB;gBACnBtB,OAAOU,KAAK,CAAC,sCAAsCb,IAAIsB,MAAM,CAACC,aAAa;gBAC3E,MAAM,IAAIT,iCAAc,CAAC,aAAad,IAAIsB,MAAM,CAACC,aAAa;YAChE;QACF;QAEArB;IACF;AAGG,MAAMR,iBAAiBG,IAAAA,qBAAM,EAClC,CAAC,EAAEC,aAAa,EAAE8B,WAAW,EAAE,GAC7B,OAAO5B,KAAcC,KAAeC;QAClC,MAAMG,iBAAiB,MAAMP,cAAcQ,WAAW;QAEtDN,IAAI6B,KAAK,GAAG7B,IAAI8B,IAAI,EAAED;QAEtB,sEAAsE;QACtE,IAAIxB,kBAAkB,CAACL,IAAI8B,IAAI,EAAE;YAC/B,MAAMC,WAAW,MAAMH,YAAYI,iBAAiB;YACpDhC,IAAI6B,KAAK,GAAG;gBAACE;aAAS;QACxB;QAEA7B;IACF"}
+{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWhitelistedIp","validateWizardCompleted","inject","settingsStore","loggerFactory","req","res","next","logger","name","serverSettings","getSettings","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","getServerSettings","whitelistEnabled","whitelist","serverSettingsKey","whitelistedIpAddresses","ipAddress","socket","remoteAddress","length","subnextMatched","find","w","roleService","isTypeormMode","roles","user","map","r","id","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IA+DaA,cAAc;eAAdA;;IA9BAC,qBAAqB;eAArBA;;IA1BAC,uBAAuB;eAAvBA;;;+BAPU;yCACW;mCACH;AAKxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,CAAC,CAACR,cAAcS,iBAAiB,IAAIC,iBAAiB;YACxDN;YACA;QACF;QAEA,MAAMO,eAAe;YACnB;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACV,IAAIW,IAAI,KAAK,CAACX,IAAIW,IAAI,CAACC,UAAU,CAAC,SAAS;YACnEV;YACA;QACF,OAAO;YACLC,OAAOU,KAAK,CAAC,wBAAwBb,IAAIW,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CAAC,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,MAAM,CAAC;QACpH;IACF;AAGG,MAAMpB,wBAAwBE,IAAAA,qBAAM,EACzC,CAAC,EAAEC,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,sBAAsBS,IAAI;QACvD,MAAMC,iBAAiBP,cAAcQ,WAAW;QAChD,IAAI,AAAC,CAACD,kBAAkB,CAACP,cAAckB,iBAAiB,MAAO,CAAClB,cAAckB,iBAAiB,IAAIC,kBAAkB;YACnHf;YACA;QACF;QAEA,MAAMgB,YAAYb,cAAc,CAACc,0CAAiB,CAAC,CAACC,sBAAsB;QAC1E,MAAMC,YAAYrB,IAAIsB,MAAM,CAACC,aAAa;QAC1C,iDAAiD;QACjD,uDAAuD;QACvD,IAAIL,WAAWM,UAAU,CAACN,UAAUR,QAAQ,CAACW,cAAcA,cAAc,oBAAoB;YAC3F,8DAA8D;YAC9D,MAAMI,iBAAiBP,UAAUQ,IAAI,CAAC,CAACC;gBACrC,OAAON,UAAUT,UAAU,CAACe;YAC9B;YAEA,IAAI,CAACF,gBAAgB;gBACnBtB,OAAOU,KAAK,CAAC,sCAAsCb,IAAIsB,MAAM,CAACC,aAAa;gBAC3E,MAAM,IAAIT,iCAAc,CAAC,aAAad,IAAIsB,MAAM,CAACC,aAAa;YAChE;QACF;QAEArB;IACF;AAGG,MAAMR,iBAAiBG,IAAAA,qBAAM,EAClC,CAAC,EAAEC,aAAa,EAAE8B,WAAW,EAAEC,aAAa,EAAE,GAC5C,OAAO7B,KAAcC,KAAeC;QAClC,MAAMG,iBAAiB,MAAMP,cAAcQ,WAAW;QAEtD,IAAIuB,eAAe;YACjB7B,IAAI8B,KAAK,GAAG9B,IAAI+B,IAAI,EAAED,MAAME,IAAI,CAACC,IAAMA,EAAEC,EAAE;QAC7C,OAAO;YACLlC,IAAI8B,KAAK,GAAG9B,IAAI+B,IAAI,EAAED;QACxB;QAEA,sEAAsE;QACtE,IAAIzB,kBAAkB,CAACL,IAAI+B,IAAI,EAAE;YAC/B,MAAMI,WAAW,MAAMP,YAAYQ,iBAAiB;YACpDpC,IAAI8B,KAAK,GAAG;gBAACK;aAAS;QACxB;QAEAjC;IACF"}

package/dist/models/FloorPrinter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/FloorPrinter.ts"],"names":["PrinterInFloorSchema","Schema","printerId","type","Types","ObjectId","ref","required","x","Number","y","_id"],"mappings":";;;;+BAQaA;;;eAAAA;;;0BARiB;AAQvB,MAAMA,uBAAuB,IAAIC,gBAAM,CAAkB;IAC9DC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,KAAK;QACLC,UAAU;IACZ;IACAC,GAAG;QACDL,MAAMM;QACNF,UAAU;IACZ;IACAG,GAAG;QACDP,MAAMM;QACNF,UAAU;IACZ;IACAI,KAAK;AACP"}
+{"version":3,"sources":["../../src/models/FloorPrinter.ts"],"names":["PrinterInFloorSchema","Schema","printerId","type","Types","ObjectId","ref","required","x","Number","y","_id"],"mappings":";;;;+BASaA;;;eAAAA;;;0BATiB;AASvB,MAAMA,uBAAuB,IAAIC,gBAAM,CAAkB;IAC9DC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,KAAK;QACLC,UAAU;IACZ;IACAC,GAAG;QACDL,MAAMM;QACNF,UAAU;IACZ;IACAG,GAAG;QACDP,MAAMM;QACNF,UAAU;IACZ;IACAI,KAAK;AACP"}

package/dist/models/PrintCompletion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/PrintCompletion.ts"],"names":["PrintCompletion","PrintCompletionSchema","Schema","fileName","type","String","required","createdAt","Number","status","printerId","Types","ObjectId","completionLog","context","Object","model"],"mappings":";;;;+BAsCaA;;;eAAAA;;;0BAtCiB;AAW9B,MAAMC,wBAAwB,IAAIC,gBAAM,CAAmB;IACzDC,UAAU;QACRC,MAAMC;QACNC,UAAU;IACZ;IACAC,WAAW;QACTH,MAAMI;QACNF,UAAU;IACZ;IACAG,QAAQ;QACNL,MAAMC;QACNC,UAAU;IACZ;IACAI,WAAW;QACTN,MAAMF,gBAAM,CAACS,KAAK,CAACC,QAAQ;QAC3BN,UAAU;IACZ;IACAO,eAAe;QACbT,MAAMC;QACNC,UAAU;IACZ;IACAQ,SAAS;QACPV,MAAMW;QACNT,UAAU;IACZ;AACF;AAEO,MAAMN,kBAAkBgB,IAAAA,eAAK,EAAC,mBAAmBf"}
+{"version":3,"sources":["../../src/models/PrintCompletion.ts"],"names":["PrintCompletion","PrintCompletionSchema","Schema","fileName","type","String","required","createdAt","Number","status","printerId","Types","ObjectId","completionLog","context","Object","model"],"mappings":";;;;+BAwCaA;;;eAAAA;;;0BAxCiB;AAa9B,MAAMC,wBAAwB,IAAIC,gBAAM,CAAmB;IACzDC,UAAU;QACRC,MAAMC;QACNC,UAAU;IACZ;IACAC,WAAW;QACTH,MAAMI;QACNF,UAAU;IACZ;IACAG,QAAQ;QACNL,MAAMC;QACNC,UAAU;IACZ;IACAI,WAAW;QACTN,MAAMF,gBAAM,CAACS,KAAK,CAACC,QAAQ;QAC3BN,UAAU;IACZ;IACAO,eAAe;QACbT,MAAMC;QACNC,UAAU;IACZ;IACAQ,SAAS;QACPV,MAAMW;QACNT,UAAU;IACZ;AACF;AAEO,MAAMN,kBAAkBgB,IAAAA,eAAK,EAAC,mBAAmBf"}

package/dist/models/Printer.js

@@ -35,14 +35,8 @@ const PrinterSchema = new _mongoose.Schema({
         type: String,
         required: false
     },
-    settingsAppearance: {
-        // Not modeling properties is the cause of .save() not working
-        type: {
-            name: {
-                type: String,
-                required: false
-            }
-        },
+    name: {
+        type: String,
         required: true
     },
     // Auto-generated below

package/dist/models/Printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","enabled","Boolean","default","disabledReason","settingsAppearance","name","currentUser","dateAdded","Number","lastPrintedFile","fileName","editTimestamp","parsedColor","parsedVisualizationRAL","parsedAmount","parsedMaterial","parsedOrderCode","fileList","Object","files","folders","free","total","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IA2HaA,OAAO;eAAPA;;IA5FAC,aAAa;eAAbA;;;0BA/BiB;AA+BvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,SAAS;QACPJ,MAAMK;QACNH,UAAU;QACVI,SAAS;IACX;IACAC,gBAAgB;QACdP,MAAMC;QACNC,UAAU;IACZ;IACAM,oBAAoB;QAClB,8DAA8D;QAC9DR,MAAM;YACJS,MAAM;gBACJT,MAAMC;gBACNC,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,uBAAuB;IACvBQ,aAAa;QACXV,MAAMC;QACNC,UAAU;IACZ;IACAS,WAAW;QACTX,MAAMY;QACNV,UAAU;IACZ;IACA,uCAAuC;IACvCW,iBAAiB;QACfb,MAAM;YACJc,UAAU;gBACRd,MAAMC;gBACNC,UAAU;YACZ;YACAa,eAAe;gBACbf,MAAMY;gBACNV,UAAU;YACZ;YACAc,aAAa;gBACXhB,MAAMC;gBACNC,UAAU;YACZ;YACAe,wBAAwB;gBACtBjB,MAAMY;gBACNV,UAAU;YACZ;YACAgB,cAAc;gBACZlB,MAAMY;gBACNV,UAAU;YACZ;YACAiB,gBAAgB;gBACdnB,MAAMC;gBACNC,UAAU;YACZ;YACAkB,iBAAiB;gBACfpB,MAAMC;gBACNC,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,uBAAuB;IACvBmB,UAAU;QACRrB,MAAMsB;QACNhB,SAAS;YACPiB,OAAO,EAAE;YACTC,SAAS,EAAE;YACXC,MAAM;YACNC,OAAO;QACT;QACAxB,UAAU;IACZ;IACAyB,UAAU;QACR3B,MAAMY;QACNV,UAAU;IACZ;IACA0B,UAAU;QACR5B,MAAMY;QACNV,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUiC,IAAAA,eAAK,EAAC,WAAWhC"}
+{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","enabled","Boolean","default","disabledReason","name","currentUser","dateAdded","Number","lastPrintedFile","fileName","editTimestamp","parsedColor","parsedVisualizationRAL","parsedAmount","parsedMaterial","parsedOrderCode","fileList","Object","files","folders","free","total","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoHaA,OAAO;eAAPA;;IAtFAC,aAAa;eAAbA;;;0BA9BiB;AA8BvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,SAAS;QACPJ,MAAMK;QACNH,UAAU;QACVI,SAAS;IACX;IACAC,gBAAgB;QACdP,MAAMC;QACNC,UAAU;IACZ;IACAM,MAAM;QACJR,MAAMC;QACNC,UAAU;IACZ;IACA,uBAAuB;IACvBO,aAAa;QACXT,MAAMC;QACNC,UAAU;IACZ;IACAQ,WAAW;QACTV,MAAMW;QACNT,UAAU;IACZ;IACA,uCAAuC;IACvCU,iBAAiB;QACfZ,MAAM;YACJa,UAAU;gBACRb,MAAMC;gBACNC,UAAU;YACZ;YACAY,eAAe;gBACbd,MAAMW;gBACNT,UAAU;YACZ;YACAa,aAAa;gBACXf,MAAMC;gBACNC,UAAU;YACZ;YACAc,wBAAwB;gBACtBhB,MAAMW;gBACNT,UAAU;YACZ;YACAe,cAAc;gBACZjB,MAAMW;gBACNT,UAAU;YACZ;YACAgB,gBAAgB;gBACdlB,MAAMC;gBACNC,UAAU;YACZ;YACAiB,iBAAiB;gBACfnB,MAAMC;gBACNC,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,uBAAuB;IACvBkB,UAAU;QACRpB,MAAMqB;QACNf,SAAS;YACPgB,OAAO,EAAE;YACTC,SAAS,EAAE;YACXC,MAAM;YACNC,OAAO;QACT;QACAvB,UAAU;IACZ;IACAwB,UAAU;QACR1B,MAAMW;QACNT,UAAU;IACZ;IACAyB,UAAU;QACR3B,MAAMW;QACNT,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUgC,IAAAA,eAAK,EAAC,WAAW/B"}

package/dist/mongo-migrations/20231111081809-printer-flatten-name.js

@@ -0,0 +1,40 @@
+"use strict";
+module.exports = {
+    async up (db, client) {
+        const session = client.startSession();
+        try {
+            await session.withTransaction(async ()=>{
+                const dbCollection = db.collection("printers");
+                await dbCollection.updateMany({}, {
+                    $rename: {
+                        "settingsAppearance.name": "name"
+                    }
+                });
+            });
+        } finally{
+            await session.endSession();
+        }
+    // See https://github.com/seppevs/migrate-mongo/#creating-a-new-migration-script
+    // Example:
+    // await db.collection('albums').updateOne({artist: 'The Beatles'}, {$set: {blacklisted: true}});
+    },
+    async down (db, client) {
+        const session = client.startSession();
+        try {
+            // Safety first
+            await session.withTransaction(async ()=>{
+                // Do the inverse migration
+                const dbCollection = db.collection("printers");
+                await dbCollection.updateMany({}, {
+                    $rename: {
+                        name: "settingsAppearance.name"
+                    }
+                });
+            });
+        } finally{
+            await session.endSession();
+        }
+    }
+};
+
+//# sourceMappingURL=20231111081809-printer-flatten-name.js.map