@fdm-monster/server 1.7.3 → 1.7.4

package/RELEASE_NOTES.MD

@@ -1,12 +1,22 @@
 # Develop
 
+# FDM Monster 13/11/2024 1.7.4
+
+## Features:
+
+- User API: new endpoint which registers user directly with roles and without verification step
+
+## Fixes: 
+
+- PrinterEventsCache: when printers and test printers are deleted, the printer events cache should not be allowed to be filled by late update events
+
 # FDM Monster 11/11/2024 1.7.3
 
 ## Fixes:
 
 - BaseService: catch null or undefined id before querying database
 - Add set user roles API to avoid users staying in limbo with GUEST role after verification.
-- User API apply consistent string number coercion in user API to avoid unexpected ID comparison
+- User API: apply consistent string number coercion in user API to avoid unexpected ID comparison
 
 # FDM Monster 11/11/2024 1.7.2
 

package/dist/controllers/user.controller.js

@@ -18,6 +18,7 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _demomiddleware = require("../middleware/demo.middleware");
 const _errorutils = require("../utils/error.utils");
 const _awilixexpress = require("awilix-express");
+const _usercontrollervalidation = require("./validation/user-controller.validation");
 function _ts_decorate(decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -48,6 +49,22 @@ class UserController {
         const users = await this.userService.listUsers();
         res.send(users.map((u)=>this.userService.toDto(u)));
     }
+    async create(req, res) {
+        const { username, password, roleIds } = await (0, _validators.validateMiddleware)(req, (0, _usercontrollervalidation.registerUserWithRolesRules)(this.isTypeormMode));
+        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,
+            needsPasswordChange: false,
+            isDemoUser: false,
+            isRootUser: false,
+            isVerified: true
+        });
+        res.send();
+    }
     async listRoles(req, res) {
         const roleDtos = this.roleService.roles.map((r)=>this.roleService.toDto(r));
         res.send(roleDtos);
@@ -188,6 +205,21 @@ _ts_decorate([
     ]),
     _ts_metadata("design:returntype", Promise)
 ], UserController.prototype, "list", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/"),
+    (0, _awilixexpress.before)([
+        (0, _authenticate.authorizeRoles)([
+            _authorizationconstants.ROLES.ADMIN
+        ])
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], UserController.prototype, "create", null);
 _ts_decorate([
     (0, _awilixexpress.GET)(),
     (0, _awilixexpress.route)("/roles"),

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","isTypeormMode","constructor","loggerFactory","name","list","req","res","users","listUsers","send","map","u","toDto","listRoles","roleDtos","roles","r","profile","user","id","getUser","get","validateInput","params","idRulesV2","delete","ownUserId","ForbiddenError","isRootUser","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","changeUsername","getLoginRequired","username","body","updateUsernameById","changePassword","oldPassword","newPassword","updatePasswordById","setUserRoles","currentUserId","ownUser","ownUserRoles","adminRole","getSynchronizedRoleByName","ROLES","ADMIN","includes","roleIds","BadRequestException","setUserRoleIds","setVerified","isVerified","setVerifiedById","setRootUser","userId","setIsRootUserById","authorizeRoles","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"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","list","req","res","users","listUsers","send","map","u","toDto","create","username","password","roleIds","validateMiddleware","registerUserWithRolesRules","toLowerCase","includes","BadRequestException","register","roles","needsPasswordChange","isDemoUser","isRootUser","isVerified","listRoles","roleDtos","r","profile","user","id","getUser","get","validateInput","params","idRulesV2","delete","ownUserId","ForbiddenError","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","changeUsername","getLoginRequired","body","updateUsernameById","changePassword","oldPassword","newPassword","updatePasswordById","setUserRoles","currentUserId","ownUser","ownUserRoles","adminRole","getSynchronizedRoleByName","ROLES","ADMIN","setUserRoleIds","setVerified","setVerifiedById","setRootUser","userId","setIsRootUserById","authorizeRoles","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"mappings":";;;;+BAsBaA;;;eAAAA;;;yBArBqB;iCACL;8BACgB;wCACvB;4BAC4B;mCACxB;mCAC0B;gCAGjB;4BAKN;+BAEoB;0CACa;;;;;;;;;;AAIvD,MAAMA;IACXC,YAA0B;IAC1BC,YAA0B;IAC1BC,cAA8B;IAC9BC,YAA0B;IAC1BC,cAA6B;IAC7BC,OAAsB;IACtBC,cAAuB;IAEvBC,YAAY,EACVP,WAAW,EACXE,aAAa,EACbD,WAAW,EACXG,aAAa,EACbD,WAAW,EACXK,aAAa,EACbF,aAAa,EASd,CAAE;QACD,IAAI,CAACN,WAAW,GAAGA;QACnB,IAAI,CAACE,aAAa,GAAGA;QACrB,IAAI,CAACD,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACE,aAAa,GAAGA;QACrB,IAAI,CAACD,MAAM,GAAGG,cAAcT,eAAeU,IAAI;IACjD;IAEA,MAGMC,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,QAAQ,MAAM,IAAI,CAACb,WAAW,CAACc,SAAS;QAC9CF,IAAIG,IAAI,CAACF,MAAMG,GAAG,CAAC,CAACC,IAAM,IAAI,CAACjB,WAAW,CAACkB,KAAK,CAACD;IACnD;IAEA,MAGME,OAAOR,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEQ,QAAQ,EAAEC,QAAQ,EAAEC,OAAO,EAAE,GAAG,MAAMC,IAAAA,8BAAkB,EAACZ,KAAKa,IAAAA,oDAA0B,EAAC,IAAI,CAAClB,aAAa;QACnH,IACEc,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,CAAC3B,WAAW,CAAC4B,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,CAAClC,WAAW,CAAC4B,KAAK,CAACb,GAAG,CAAC,CAACoB,IAAM,IAAI,CAACnC,WAAW,CAACiB,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,CAACtC,WAAW,CAACwC,OAAO,CAAC7B,IAAI2B,IAAI,EAAEC;QACtD3B,IAAIG,IAAI,CAAC,IAAI,CAACf,WAAW,CAACkB,KAAK,CAACoB;IAClC;IAEA,MAGMG,IAAI9B,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAE2B,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAC3E,MAAMgC,OAAO,MAAM,IAAI,CAACtC,WAAW,CAACwC,OAAO,CAACD;QAC5C3B,IAAIG,IAAI,CAAC,IAAI,CAACf,WAAW,CAACkB,KAAK,CAACoB;IAClC;IAEA,MAGMO,OAAOlC,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAE2B,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAE3E,MAAMwC,YAAYnC,IAAI2B,IAAI,EAAEC;QAC5B,IAAIO,aAAaP,IAAI;YACnB,MAAM,IAAIQ,iCAAc,CAAC;QAC3B;QAEA,MAAMf,aAAa,MAAM,IAAI,CAAChC,WAAW,CAACgD,cAAc,CAACT;QACzD,IAAIP,YAAY;YACd,MAAM,IAAIe,iCAAc,CAAC;QAC3B;QAEA,IAAI,IAAI,CAAC7C,aAAa,CAAC+C,UAAU,IAAI;YACnC,MAAMC,aAAa,MAAM,IAAI,CAAClD,WAAW,CAACmD,aAAa;YACvD,IAAIZ,OAAOW,YAAY;gBACrB,IAAI,CAACE,eAAe;YACtB;QACF;QAEA,MAAM,IAAI,CAACpD,WAAW,CAACqD,UAAU,CAACd;QAElC,IAAI;YACF,MAAM,IAAI,CAACpC,WAAW,CAACmD,YAAY,CAACf;QACtC,EAAE,OAAOgB,GAAG;YACV,IAAI,CAAClD,MAAM,CAACmD,KAAK,CAACC,IAAAA,wBAAY,EAACF;QACjC;QAEA3C,IAAIG,IAAI;IACV;IAEA,MAGM2C,eAAe/C,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAE2B,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAE3E,IAAIK,IAAI2B,IAAI,EAAEC,MAAMA,MAAO,MAAM,IAAI,CAACnC,aAAa,CAACuD,gBAAgB,IAAK;YACvE,MAAM,IAAIZ,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAE3B,QAAQ,EAAE,GAAG,MAAMsB,IAAAA,yBAAa,EAAC/B,IAAIiD,IAAI,EAAE;YACjDxC,UAAU;QACZ;QACA,MAAM,IAAI,CAACpB,WAAW,CAAC6D,kBAAkB,CAACtB,IAAInB;QAC9CR,IAAIG,IAAI;IACV;IAEA,MAGM+C,eAAenD,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAE2B,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAE3E,IAAIK,IAAI2B,IAAI,EAAEC,MAAMA,MAAO,MAAM,IAAI,CAACnC,aAAa,CAACuD,gBAAgB,IAAK;YACvE,MAAM,IAAIZ,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEgB,WAAW,EAAEC,WAAW,EAAE,GAAG,MAAMtB,IAAAA,yBAAa,EAAC/B,IAAIiD,IAAI,EAAE;YACjEG,aAAa;YACbC,aAAa;QACf;QACA,MAAM,IAAI,CAAChE,WAAW,CAACiE,kBAAkB,CAAC1B,IAAIwB,aAAaC;QAC3DpD,IAAIG,IAAI;IACV;IAEA,MAGMmD,aAAavD,GAAY,EAAEC,GAAa,EAAE;QAC9C,MAAM,EAAE2B,IAAI4B,aAAa,EAAE,GAAG,MAAMzB,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAE1F,MAAMwC,YAAYnC,IAAI2B,IAAI,EAAEC;QAC5B,MAAM6B,UAAU,MAAM,IAAI,CAACpE,WAAW,CAACwC,OAAO,CAACM;QAC/C,MAAMuB,eAAeD,QAAQvC,KAAK;QAClC,MAAMyC,YAAY,MAAM,IAAI,CAACrE,WAAW,CAACsE,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAE9E,IAAI3B,aAAaqB,iBAAiB,CAACE,aAAa3C,QAAQ,CAAC4C,UAAU/B,EAAE,KAAK,CAAC6B,QAAQpC,UAAU,EAAE;YAC7F,MAAM,IAAIe,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEzB,OAAO,EAAE,GAAG,MAAMoB,IAAAA,yBAAa,EAAC/B,IAAIiD,IAAI,EAAE;YAChDtC,SAAS;YACT,aAAa;QACf;QAEA,IAAIwB,aAAaqB,iBAAiB,CAAC7C,QAAQI,QAAQ,CAAC4C,UAAU/B,EAAE,GAAG;YACjE,IAAI6B,QAAQpC,UAAU,EAAE;gBACtB,MAAM,IAAIL,sCAAmB,CAAC;YAChC,OAAO;gBACL,MAAM,IAAIA,sCAAmB,CAAC;YAChC;QACF;QAEA,MAAM,IAAI,CAAC3B,WAAW,CAAC0E,cAAc,CAACP,eAAe7C;QACrDV,IAAIG,IAAI;IACV;IAEA,MAGM4D,YAAYhE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAE2B,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAE3E,MAAMwC,YAAYnC,IAAI2B,IAAI,EAAEC;QAC5B,IAAIO,aAAaP,IAAI;YACnB,MAAM,IAAIQ,iCAAc,CAAC;QAC3B;QAEA,MAAMf,aAAa,MAAM,IAAI,CAAChC,WAAW,CAACgD,cAAc,CAACT;QACzD,IAAIP,YAAY;YACd,MAAM,IAAIe,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEd,UAAU,EAAE,GAAG,MAAMS,IAAAA,yBAAa,EAAC/B,IAAIiD,IAAI,EAAE;YACnD3B,YAAY;QACd;QACA,MAAM,IAAI,CAACjC,WAAW,CAAC4E,eAAe,CAACrC,IAAIN;QAE3CrB,IAAIG,IAAI;IACV;IAEA,MAGM8D,YAAYlE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAE2B,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAAC/B,IAAIgC,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACtC,aAAa;QAE3E,MAAMwE,SAASnE,IAAI2B,IAAI,EAAEC;QACzB,IAAI5B,IAAI2B,IAAI,EAAEC,IAAI;YAChB,MAAMP,aAAa,MAAM,IAAI,CAAChC,WAAW,CAACgD,cAAc,CAAC8B;YACzD,IAAI,CAAC9C,YAAY;gBACf,MAAM,IAAIe,iCAAc,CAAC;YAC3B;QACF;QACA,MAAM,EAAEf,UAAU,EAAE,GAAG,MAAMU,IAAAA,yBAAa,EAAC/B,IAAIiD,IAAI,EAAE;YACnD5B,YAAY;QACd;QACA,MAAM,IAAI,CAAChC,WAAW,CAAC+E,iBAAiB,CAACxC,IAAIP;QAC7CpB,IAAIG,IAAI;IACV;IAEAqC,kBAAkB;QAChB,MAAMH,aAAa,IAAI,CAAC/C,aAAa,CAAC+C,UAAU;QAChD,IAAIA,YAAY;YACd,MAAM,IAAIF,iCAAc,CAAC;QAC3B;IACF;AACF;;;;;QAnNWiC,IAAAA,4BAAc,EAAC;YAACR,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;QAQ5BO,IAAAA,4BAAc,EAAC;YAACR,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6C5BO,IAAAA,4BAAc,EAAC;YAACR,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;QAS5BO,IAAAA,4BAAc,EAAC;YAACR,6BAAK,CAACC,KAAK;SAAC;QAAGQ,kCAAkB;;;;;;;;;;;;;QAkCjDA,kCAAkB;;;;;;;;;;;;;QAiBlBA,kCAAkB;;;;;;;;;;;;;QAkBlBD,IAAAA,4BAAc,EAAC;YAACR,6BAAK,CAACC,KAAK;SAAC;QAAGQ,kCAAkB;;;;;;;;;;;;;QAgCjDD,IAAAA,4BAAc,EAAC;YAACR,6BAAK,CAACC,KAAK;SAAC;QAAGQ,kCAAkB;;;;;;;;;;;;;QAwBjDA,kCAAkB;;;;;;;;;;8BAlOtBC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterRules","batchPrintersEnabledRules","executeBatchRePrinterRule","isSqlite","printerIds","idRuleV2","prints","enabled"],"mappings":";;;;;;;;;;;IAEaA,iBAAiB;eAAjBA;;IAYAC,yBAAyB;eAAzBA;;IAPAC,yBAAyB;eAAzBA;;;mCAPuB;AAE7B,MAAMF,oBAAoB,CAACG,WAAuB,CAAA;QACvDC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;IAC3B,CAAA;AAEO,MAAMD,4BAA4B,CAACC,WAAuB,CAAA;QAC/DG,QAAQ;QACR,YAAY;QACZ,sBAAsBD,IAAAA,2BAAQ,EAACF;QAC/B,iBAAiB;IACnB,CAAA;AAEO,MAAMF,4BAA4B,CAACE,WAAuB,CAAA;QAC/DC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;QACzBI,SAAS;IACX,CAAA"}
+{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterRules","batchPrintersEnabledRules","executeBatchRePrinterRule","isSqlite","printerIds","idRuleV2","prints","enabled"],"mappings":";;;;;;;;;;;IAEaA,iBAAiB;eAAjBA;;IAYAC,yBAAyB;eAAzBA;;IAPAC,yBAAyB;eAAzBA;;;mCAPY;AAElB,MAAMF,oBAAoB,CAACG,WAAuB,CAAA;QACvDC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;IAC3B,CAAA;AAEO,MAAMD,4BAA4B,CAACC,WAAuB,CAAA;QAC/DG,QAAQ;QACR,YAAY;QACZ,sBAAsBD,IAAAA,2BAAQ,EAACF;QAC/B,iBAAiB;IACnB,CAAA;AAEO,MAAMF,4BAA4B,CAACE,WAAuB,CAAA;QAC/DC,YAAY;QACZ,gBAAgBC,IAAAA,2BAAQ,EAACF;QACzBI,SAAS;IACX,CAAA"}

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

@@ -16,7 +16,7 @@ _export(exports, {
         return idRulesV2;
     }
 });
-const idRuleV2 = (isSqlite)=>`required|${isSqlite ? "integer|min:1" : "required|mongoId"}`;
+const idRuleV2 = (isSqlite)=>`required|${isSqlite ? "integer|min:1" : "mongoId"}`;
 const idRulesV2 = (isSqlite)=>({
         id: idRuleV2(isSqlite)
     });

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

@@ -1 +1 @@
-{"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,oBAAoB;AAErG,MAAMD,YAAY,CAACC,WAAuB,CAAA;QAC/CC,IAAIH,SAASE;IACf,CAAA"}
+{"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,WAAW;AAE5F,MAAMD,YAAY,CAACC,WAAuB,CAAA;QAC/CC,IAAIH,SAASE;IACf,CAAA"}

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

@@ -2,16 +2,31 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "registerUserRules", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    registerUserRules: function() {
         return registerUserRules;
+    },
+    registerUserWithRolesRules: function() {
+        return registerUserWithRolesRules;
     }
 });
 const _serverconstants = require("../../server.constants");
+const _genericvalidation = require("./generic.validation");
 const registerUserRules = {
     username: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN}`,
     password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`
 };
+const registerUserWithRolesRules = (isSqlite)=>({
+        username: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN}`,
+        password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`,
+        roleIds: "array",
+        "roleIds.*": (0, _genericvalidation.idRuleV2)(isSqlite)
+    });
 
 //# sourceMappingURL=user-controller.validation.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/user-controller.validation.ts"],"names":["registerUserRules","username","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN"],"mappings":";;;;+BAEaA;;;eAAAA;;;iCAFgB;AAEtB,MAAMA,oBAAoB;IAC/BC,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,EAAE;IAC7EC,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,EAAE;AAC/E"}
+{"version":3,"sources":["../../../src/controllers/validation/user-controller.validation.ts"],"names":["registerUserRules","registerUserWithRolesRules","username","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN","isSqlite","roleIds","idRuleV2"],"mappings":";;;;;;;;;;;IAGaA,iBAAiB;eAAjBA;;IAKAC,0BAA0B;eAA1BA;;;iCARgB;mCACJ;AAElB,MAAMD,oBAAoB;IAC/BE,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,EAAE;IAC7EC,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,EAAE;AAC/E;AAEO,MAAML,6BAA6B,CAACM,WAAuB,CAAA;QAChEL,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,EAAE;QAC7EC,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,EAAE;QAC7EE,SAAS;QACT,aAAaC,IAAAA,2BAAQ,EAACF;IACxB,CAAA"}

package/dist/server.constants.js

@@ -66,7 +66,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.6.10",
+    defaultClientMinimum: "1.6.11",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

package/dist/state/printer-events.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getSettingsSensitive","server","debugSettings","debugSocketMessages","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubstate","substateName","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onOctoPrintSocketMessage","onMoonrakerSocketMessage","printerEvents","printersDeleted","bind","includes","event","pruneHistoryPayload","log","formatKB","eventType","logs","temps","messages"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getSettingsSensitive","server","debugSettings","debugSocketMessages","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubstate","substateName","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onOctoPrintSocketMessage","onMoonrakerSocketMessage","printerEvents","printersDeleted","bind","includes","event","pruneHistoryPayload","log","formatKB","eventType","logs","temps","messages"],"mappings":"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"}

package/dist/state/printer.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}

package/dist/state/test-printer-socket.store.js

@@ -17,6 +17,7 @@ const _errorutils = require("../utils/error.utils");
 const _node = require("@sentry/node");
 const _socketstatetype = require("../shared/dtos/socket-state.type");
 const _websocketconstants = require("../services/moonraker/constants/websocket.constants");
+const _eventconstants = require("../constants/event.constants");
 class TestPrinterSocketStore {
     testSocket;
     socketIoGateway;
@@ -103,6 +104,11 @@ class TestPrinterSocketStore {
             if (this.testSocket) {
                 this.testSocket.close();
             }
+            this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
+                printerIds: [
+                    correlationToken
+                ]
+            });
             delete this.testSocket;
             testEvents.forEach((te)=>{
                 this.eventEmitter2.off(te, listener);

package/dist/state/test-printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","off"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}

package/dist/utils/cache/key-diff.cache.js

@@ -75,6 +75,9 @@ class KeyDiffCache {
         if (!keyString?.length) {
             throw new Error("Key must be a non-empty serializable string");
         }
+        if (this.deletedKeys.includes(keyString)) {
+            return;
+        }
         this.keyValueStore[keyString] = value;
         if (markUpdated) {
             this.markUpdated(keyString);

package/dist/utils/cache/key-diff.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/cache/key-diff.cache.ts"],"names":["KeyDiffCache","deletedKeys","updatedKeys","keyValueStore","getAllValues","keys","Object","getValuesBatch","getAllKeyValues","getValue","key","keyString","toString","length","Error","processStateDiffs","updatedValues","resetDiffs","setKeyValuesBatch","keyValues","markUpdated","forEach","value","setKeyValue","map","batchMarkUpdated","deleteKeysBatch","markDeleted","deleteKeyValue","batchMarkDeleted","keyStrings","some","values","push","convertToKeyString","includes","splice","indexOf"],"mappings":"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"}
+{"version":3,"sources":["../../../src/utils/cache/key-diff.cache.ts"],"names":["KeyDiffCache","deletedKeys","updatedKeys","keyValueStore","getAllValues","keys","Object","getValuesBatch","getAllKeyValues","getValue","key","keyString","toString","length","Error","processStateDiffs","updatedValues","resetDiffs","setKeyValuesBatch","keyValues","markUpdated","forEach","value","setKeyValue","map","batchMarkUpdated","deleteKeysBatch","markDeleted","deleteKeyValue","batchMarkDeleted","keyStrings","some","values","push","convertToKeyString","includes","splice","indexOf"],"mappings":"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"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -53,11 +53,11 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.6.10",
-    "@fdm-monster/client-next": "0.0.7",
+    "@fdm-monster/client": "1.6.11",
+    "@fdm-monster/client-next": "0.0.8",
     "@influxdata/influxdb-client": "1.35.0",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "8.37.1",
+    "@sentry/node": "8.38.0",
     "adm-zip": "0.5.16",
     "awilix": "12.0.3",
     "awilix-express": "9.0.1",