@fdm-monster/server 1.7.1 → 1.7.3

package/README.md

@@ -76,7 +76,7 @@ Please join the discord, but stay professional and proactive!
 These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -106,6 +106,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
       <td align="center" valign="top" width="14.28%"><a href="https://techinterview.guide"><img src="https://avatars.githubusercontent.com/u/168030?v=4?s=80" width="80px;" alt="w. ian douglas"/><br /><sub><b>w. ian douglas</b></sub></a><br /><a href="#ideas-iandouglas" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://insanityautomation.com/"><img src="https://avatars.githubusercontent.com/u/38436470?v=4?s=80" width="80px;" alt="InsanityAutomation"/><br /><sub><b>InsanityAutomation</b></sub></a><br /><a href="#ideas-InsanityAutomation" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3AInsanityAutomation" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LyfeOnEdge"><img src="https://avatars.githubusercontent.com/u/26140376?v=4?s=80" width="80px;" alt="Andrew (LyfeOnEdge) (ArcticGentoo)"/><br /><sub><b>Andrew (LyfeOnEdge) (ArcticGentoo)</b></sub></a><br /><a href="#ideas-LyfeOnEdge" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/callanova"><img src="https://avatars.githubusercontent.com/u/175639705?v=4?s=80" width="80px;" alt="callanova"/><br /><sub><b>callanova</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Acallanova" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

package/RELEASE_NOTES.MD

@@ -1,5 +1,19 @@
 # Develop
 
+# 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
+
+# FDM Monster 11/11/2024 1.7.2
+
+## Fixes:
+
+- API & Service validators: adjust max length of apiKey property validation to 43 to allow new `secrets` based OctoPrint api keys
+ 
 # FDM Monster 04/11/2024 1.7.1
 
 ## Changes:

package/dist/consoles/check-ports.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    checkPort: function() {
+        return checkPort;
+    },
+    scanPortRange: function() {
+        return scanPortRange;
+    }
+});
+const _net = /*#__PURE__*/ _interop_require_default(require("net"));
+const _cluster = /*#__PURE__*/ _interop_require_default(require("cluster"));
+const _os = require("os");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const numCPUs = (0, _os.cpus)().length;
+const commonServices = {
+    80: "HTTP",
+    443: "HTTPS",
+    22: "SSH",
+    21: "FTP",
+    3306: "MySQL",
+    5432: "PostgreSQL",
+    27017: "MongoDB",
+    6379: "Redis",
+    8080: "HTTP-Alternate",
+    8443: "HTTPS-Alternate"
+};
+async function checkPort(host, port) {
+    console.log("Worker defined " + host + ":" + port);
+    return new Promise((resolve)=>{
+        const socket = new _net.default.Socket();
+        const timeout = 1000;
+        socket.setTimeout(timeout);
+        socket.on("connect", ()=>{
+            socket.destroy();
+            resolve({
+                port,
+                status: "open",
+                service: commonServices[port]
+            });
+        });
+        socket.on("timeout", ()=>{
+            socket.destroy();
+            resolve({
+                port,
+                status: "closed"
+            });
+        });
+        socket.on("error", ()=>{
+            socket.destroy();
+            resolve({
+                port,
+                status: "closed"
+            });
+        });
+        socket.connect(port, host);
+    });
+}
+async function scanPortRange(host, start, end, specificPorts = []) {
+    const portsToScan = [
+        ...Array.from({
+            length: end - start + 1
+        }, (_, i)=>start + i),
+        ...specificPorts
+    ].filter((value, index, self)=>self.indexOf(value) === index);
+    const chunkSize = Math.ceil(portsToScan.length / numCPUs);
+    const chunks = Array.from({
+        length: numCPUs
+    }, (_, i)=>portsToScan.slice(i * chunkSize, (i + 1) * chunkSize));
+    if (_cluster.default.isPrimary) {
+        console.log(`Primary ${process.pid} is running`);
+        console.log(`Starting scan on ${host} for ports ${start}-${end} and specific ports: ${specificPorts.join(", ")}`);
+        console.log(`Number of CPU cores: ${numCPUs}`);
+        const results = [];
+        const workers = new Set();
+        _cluster.default.on("exit", (worker, code, signal)=>{
+            console.log(`Worker ${worker.process.pid} died. Signal: ${signal}. Code: ${code}`);
+            workers.delete(worker);
+            if (workers.size === 0) {
+                console.log("All workers completed");
+                process.emit("allWorkersCompleted", results);
+            }
+        });
+        return new Promise((resolve, reject)=>{
+            const timeout = setTimeout(()=>{
+                for (const worker of workers){
+                    worker.kill();
+                }
+                reject(new Error("Scan timeout after 30 seconds"));
+            }, 30000);
+            process.once("allWorkersCompleted", (finalResults)=>{
+                clearTimeout(timeout);
+                resolve(finalResults.sort((a, b)=>a.port - b.port));
+            });
+            chunks.forEach((chunk, index)=>{
+                try {
+                    const worker = _cluster.default.fork();
+                    workers.add(worker);
+                    console.log(`Created worker ${worker.process.pid} for chunk ${index + 1}/${chunks.length}`);
+                    worker.on("message", (msg)=>{
+                        console.log(`Received results from worker ${worker.process.pid}: ${msg.length} ports`);
+                        results.push(...msg);
+                    });
+                    worker.on("error", (error)=>{
+                        console.error(`Worker ${worker.process.pid} error:`, error);
+                    });
+                    worker.send({
+                        host,
+                        ports: chunk
+                    });
+                } catch (error) {
+                    console.error("Error creating worker:", error);
+                }
+            });
+        });
+    } else {
+        console.log(`Worker ${process.pid} started`);
+        return new Promise((resolve)=>{
+            process.on("message", async (msg)=>{
+                try {
+                    console.log(`Worker ${process.pid} received ${msg.ports.length} ports to scan`);
+                    const results = [];
+                    const promises = msg.ports.map((port)=>checkPort(msg.host, port));
+                    const workerResults = await Promise.all(promises);
+                    results.push(...workerResults);
+                    if (process.send) {
+                        process.send(results);
+                        console.log(`Worker ${process.pid} completed scanning`);
+                    }
+                    process.exit(0);
+                } catch (error) {
+                    console.error(`Worker ${process.pid} error:`, error);
+                    process.exit(1);
+                }
+            });
+        });
+    }
+}
+if (require.main === module) {
+    const host = process.argv[2] || "localhost";
+    scanPortRange(host, 80, 8888, [
+        27017
+    ]).then((results)=>{
+        console.log("\nScan Results:");
+        const openPorts = results.filter((r)=>r.status === "open");
+        if (openPorts.length === 0) {
+            console.log("No open ports found");
+        } else {
+            console.table(openPorts);
+        }
+        process.exit(0);
+    }).catch((error)=>{
+        console.error("Error during scan:", error);
+        process.exit(1);
+    });
+}
+
+//# sourceMappingURL=check-ports.js.map

package/dist/consoles/check-ports.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consoles/check-ports.ts"],"names":["checkPort","scanPortRange","numCPUs","cpus","length","commonServices","host","port","console","log","Promise","resolve","socket","net","Socket","timeout","setTimeout","on","destroy","status","service","connect","start","end","specificPorts","portsToScan","Array","from","_","i","filter","value","index","self","indexOf","chunkSize","Math","ceil","chunks","slice","cluster","isPrimary","process","pid","join","results","workers","Set","worker","code","signal","delete","size","emit","reject","kill","Error","once","finalResults","clearTimeout","sort","a","b","forEach","chunk","fork","add","msg","push","error","send","ports","promises","map","workerResults","all","exit","require","main","module","argv","then","openPorts","r","table","catch"],"mappings":"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"}

package/dist/constants/service.constants.js

@@ -9,18 +9,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    UUID_LENGTH: function() {
-        return UUID_LENGTH;
+    apiKeyLengthMaxDefault: function() {
+        return apiKeyLengthMaxDefault;
     },
-    apiKeyLengthMinimumDefault: function() {
-        return apiKeyLengthMinimumDefault;
+    apiKeyLengthMinDefault: function() {
+        return apiKeyLengthMinDefault;
     },
     minFloorNameLength: function() {
         return minFloorNameLength;
     }
 });
-const UUID_LENGTH = 32;
 const minFloorNameLength = 3;
-const apiKeyLengthMinimumDefault = 32;
+const apiKeyLengthMinDefault = 32;
+const apiKeyLengthMaxDefault = 43;
 
 //# sourceMappingURL=service.constants.js.map

package/dist/constants/service.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/constants/service.constants.ts"],"names":["UUID_LENGTH","apiKeyLengthMinimumDefault","minFloorNameLength"],"mappings":";;;;;;;;;;;IAAaA,WAAW;eAAXA;;IAGAC,0BAA0B;eAA1BA;;IAFAC,kBAAkB;eAAlBA;;;AADN,MAAMF,cAAc;AACpB,MAAME,qBAAqB;AAE3B,MAAMD,6BAA6B"}
+{"version":3,"sources":["../../src/constants/service.constants.ts"],"names":["apiKeyLengthMaxDefault","apiKeyLengthMinDefault","minFloorNameLength"],"mappings":";;;;;;;;;;;IAGaA,sBAAsB;eAAtBA;;IADAC,sBAAsB;eAAtBA;;IAFAC,kBAAkB;eAAlBA;;;AAAN,MAAMA,qBAAqB;AAE3B,MAAMD,yBAAyB;AAC/B,MAAMD,yBAAyB"}

package/dist/controllers/user.controller.js

@@ -2,21 +2,13 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    UserController: function() {
+Object.defineProperty(exports, "UserController", {
+    enumerable: true,
+    get: function() {
         return UserController;
-    },
-    default: function() {
-        return _default;
     }
 });
-const _awilixexpress = require("awilix-express");
+const _express = require("express");
 const _serverconstants = require("../server.constants");
 const _authenticate = require("../middleware/authenticate");
 const _authorizationconstants = require("../constants/authorization.constants");
@@ -25,6 +17,16 @@ const _genericvalidation = require("./validation/generic.validation");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _demomiddleware = require("../middleware/demo.middleware");
 const _errorutils = require("../utils/error.utils");
+const _awilixexpress = require("awilix-express");
+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);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
 class UserController {
     userService;
     roleService;
@@ -42,6 +44,14 @@ class UserController {
         this.isTypeormMode = isTypeormMode;
         this.logger = loggerFactory(UserController.name);
     }
+    async list(req, res) {
+        const users = await this.userService.listUsers();
+        res.send(users.map((u)=>this.userService.toDto(u)));
+    }
+    async listRoles(req, res) {
+        const roleDtos = this.roleService.roles.map((r)=>this.roleService.toDto(r));
+        res.send(roleDtos);
+    }
     async profile(req, res) {
         if (!req.user?.id) {
             res.send({});
@@ -50,21 +60,16 @@ class UserController {
         const user = await this.userService.getUser(req.user?.id);
         res.send(this.userService.toDto(user));
     }
-    async list(req, res) {
-        const users = await this.userService.listUsers();
-        res.send(users.map((u)=>this.userService.toDto(u)));
-    }
-    async listRoles(req, res) {
-        const roleDtos = this.roleService.roles.map((r)=>this.roleService.toDto(r));
-        res.send(roleDtos);
+    async get(req, res) {
+        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 delete(req, res) {
         const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const ownUserId = req.user?.id;
-        if (ownUserId) {
-            if (ownUserId === id) {
-                throw new _runtimeexceptions.ForbiddenError("Not allowed to delete own account");
-            }
+        if (ownUserId == id) {
+            throw new _runtimeexceptions.ForbiddenError("Not allowed to delete own account");
         }
         const isRootUser = await this.userService.isUserRootUser(id);
         if (isRootUser) {
@@ -84,14 +89,9 @@ class UserController {
         }
         res.send();
     }
-    async get(req, res) {
-        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, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
-        if (req.user?.id !== id && await this.settingsStore.getLoginRequired()) {
+        if (req.user?.id != id && await this.settingsStore.getLoginRequired()) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change username of other users");
         }
         const { username } = await (0, _validators.validateInput)(req.body, {
@@ -102,7 +102,7 @@ class UserController {
     }
     async changePassword(req, res) {
         const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
-        if (req.user?.id !== id && await this.settingsStore.getLoginRequired()) {
+        if (req.user?.id != id && await this.settingsStore.getLoginRequired()) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change password of other users");
         }
         const { oldPassword, newPassword } = await (0, _validators.validateInput)(req.body, {
@@ -112,13 +112,34 @@ class UserController {
         await this.userService.updatePasswordById(id, oldPassword, newPassword);
         res.send();
     }
+    async setUserRoles(req, res) {
+        const { id: currentUserId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
+        const ownUserId = req.user?.id;
+        const ownUser = await this.userService.getUser(ownUserId);
+        const ownUserRoles = ownUser.roles;
+        const adminRole = await this.roleService.getSynchronizedRoleByName(_authorizationconstants.ROLES.ADMIN);
+        if (ownUserId == currentUserId && !ownUserRoles.includes(adminRole.id) && !ownUser.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, {
+            roleIds: "array",
+            "roleIds.*": "alphaNumeric"
+        });
+        if (ownUserId == currentUserId && !roleIds.includes(adminRole.id)) {
+            if (ownUser.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(currentUserId, roleIds);
+        res.send();
+    }
     async setVerified(req, res) {
         const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const ownUserId = req.user?.id;
-        if (ownUserId) {
-            if (ownUserId === id) {
-                throw new _runtimeexceptions.ForbiddenError("Not allowed to change own verified status");
-            }
+        if (ownUserId == id) {
+            throw new _runtimeexceptions.ForbiddenError("Not allowed to change own verified status");
         }
         const isRootUser = await this.userService.isUserRootUser(id);
         if (isRootUser) {
@@ -152,38 +173,152 @@ class UserController {
         }
     }
 }
-const _default = (0, _awilixexpress.createController)(UserController).prefix(_serverconstants.AppConstants.apiRoute + "/user").before([
-    (0, _authenticate.authenticate)()
-]).get("/", "list", {
-    before: [
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ])
-    ]
-}).get("/roles", "listRoles", {}).get("/profile", "profile").get("/:id", "get", {
-    before: [
+    ]),
+    _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, "list", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/roles"),
+    _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, "listRoles", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/profile"),
+    _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, "profile", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/:id"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ])
-    ]
-}).delete("/:id", "delete", {
-    before: [
+    ]),
+    _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, "get", null);
+_ts_decorate([
+    (0, _awilixexpress.DELETE)(),
+    (0, _awilixexpress.route)("/:id"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ]),
         _demomiddleware.demoUserNotAllowed
-    ]
-}).post("/:id/set-root-user", "setRootUser", {
-    before: [
+    ]),
+    _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, "delete", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:id/change-username"),
+    (0, _awilixexpress.before)([
+        _demomiddleware.demoUserNotAllowed
+    ]),
+    _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, "changeUsername", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:id/change-password"),
+    (0, _awilixexpress.before)([
         _demomiddleware.demoUserNotAllowed
-    ]
-}).post("/:id/set-verified", "setVerified", {
-    before: [
+    ]),
+    _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, "changePassword", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:id/set-user-roles"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ]),
         _demomiddleware.demoUserNotAllowed
-    ]
-}).post("/:id/change-username", "changeUsername", _demomiddleware.demoUserNotAllowedInterceptor).post("/:id/change-password", "changePassword", _demomiddleware.demoUserNotAllowedInterceptor);
+    ]),
+    _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, "setUserRoles", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:id/set-verified"),
+    (0, _awilixexpress.before)([
+        (0, _authenticate.authorizeRoles)([
+            _authorizationconstants.ROLES.ADMIN
+        ]),
+        _demomiddleware.demoUserNotAllowed
+    ]),
+    _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, "setVerified", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/:id/set-root-user"),
+    (0, _awilixexpress.before)([
+        _demomiddleware.demoUserNotAllowed
+    ]),
+    _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, "setRootUser", null);
+UserController = _ts_decorate([
+    (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/user"),
+    (0, _awilixexpress.before)([
+        (0, _authenticate.authenticate)()
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        Object
+    ])
+], UserController);
 
 //# sourceMappingURL=user.controller.js.map

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","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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"}
+{"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":";;;;+BAqBaA;;;eAAAA;;;yBApBqB;iCACL;8BACgB;wCACvB;4BACQ;mCACJ;mCAC0B;gCAGjB;4BAKN;+BAEoB;;;;;;;;;;AAI1C,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,MAEME,UAAUR,GAAY,EAAEC,GAAa,EAAE;QAC3C,MAAMQ,WAAW,IAAI,CAACnB,WAAW,CAACoB,KAAK,CAACL,GAAG,CAAC,CAACM,IAAM,IAAI,CAACrB,WAAW,CAACiB,KAAK,CAACI;QAC1EV,IAAIG,IAAI,CAACK;IACX;IAEA,MAEMG,QAAQZ,GAAY,EAAEC,GAAa,EAAE;QACzC,IAAI,CAACD,IAAIa,IAAI,EAAEC,IAAI;YACjBb,IAAIG,IAAI,CAAC,CAAC;YACV;QACF;QAEA,MAAMS,OAAO,MAAM,IAAI,CAACxB,WAAW,CAAC0B,OAAO,CAACf,IAAIa,IAAI,EAAEC;QACtDb,IAAIG,IAAI,CAAC,IAAI,CAACf,WAAW,CAACkB,KAAK,CAACM;IAClC;IAEA,MAGMG,IAAIhB,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEa,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAC3E,MAAMkB,OAAO,MAAM,IAAI,CAACxB,WAAW,CAAC0B,OAAO,CAACD;QAC5Cb,IAAIG,IAAI,CAAC,IAAI,CAACf,WAAW,CAACkB,KAAK,CAACM;IAClC;IAEA,MAGMO,OAAOpB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEa,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAE3E,MAAM0B,YAAYrB,IAAIa,IAAI,EAAEC;QAC5B,IAAIO,aAAaP,IAAI;YACnB,MAAM,IAAIQ,iCAAc,CAAC;QAC3B;QAEA,MAAMC,aAAa,MAAM,IAAI,CAAClC,WAAW,CAACmC,cAAc,CAACV;QACzD,IAAIS,YAAY;YACd,MAAM,IAAID,iCAAc,CAAC;QAC3B;QAEA,IAAI,IAAI,CAAC/B,aAAa,CAACkC,UAAU,IAAI;YACnC,MAAMC,aAAa,MAAM,IAAI,CAACrC,WAAW,CAACsC,aAAa;YACvD,IAAIb,OAAOY,YAAY;gBACrB,IAAI,CAACE,eAAe;YACtB;QACF;QAEA,MAAM,IAAI,CAACvC,WAAW,CAACwC,UAAU,CAACf;QAElC,IAAI;YACF,MAAM,IAAI,CAACtB,WAAW,CAACsC,YAAY,CAAChB;QACtC,EAAE,OAAOiB,GAAG;YACV,IAAI,CAACrC,MAAM,CAACsC,KAAK,CAACC,IAAAA,wBAAY,EAACF;QACjC;QAEA9B,IAAIG,IAAI;IACV;IAEA,MAGM8B,eAAelC,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAEa,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAE3E,IAAIK,IAAIa,IAAI,EAAEC,MAAMA,MAAO,MAAM,IAAI,CAACrB,aAAa,CAAC0C,gBAAgB,IAAK;YACvE,MAAM,IAAIb,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEc,QAAQ,EAAE,GAAG,MAAMnB,IAAAA,yBAAa,EAACjB,IAAIqC,IAAI,EAAE;YACjDD,UAAU;QACZ;QACA,MAAM,IAAI,CAAC/C,WAAW,CAACiD,kBAAkB,CAACxB,IAAIsB;QAC9CnC,IAAIG,IAAI;IACV;IAEA,MAGMmC,eAAevC,GAAY,EAAEC,GAAa,EAAE;QAChD,MAAM,EAAEa,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAE3E,IAAIK,IAAIa,IAAI,EAAEC,MAAMA,MAAO,MAAM,IAAI,CAACrB,aAAa,CAAC0C,gBAAgB,IAAK;YACvE,MAAM,IAAIb,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEkB,WAAW,EAAEC,WAAW,EAAE,GAAG,MAAMxB,IAAAA,yBAAa,EAACjB,IAAIqC,IAAI,EAAE;YACjEG,aAAa;YACbC,aAAa;QACf;QACA,MAAM,IAAI,CAACpD,WAAW,CAACqD,kBAAkB,CAAC5B,IAAI0B,aAAaC;QAC3DxC,IAAIG,IAAI;IACV;IAEA,MAGMuC,aAAa3C,GAAY,EAAEC,GAAa,EAAE;QAC9C,MAAM,EAAEa,IAAI8B,aAAa,EAAE,GAAG,MAAM3B,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAE1F,MAAM0B,YAAYrB,IAAIa,IAAI,EAAEC;QAC5B,MAAM+B,UAAU,MAAM,IAAI,CAACxD,WAAW,CAAC0B,OAAO,CAACM;QAC/C,MAAMyB,eAAeD,QAAQnC,KAAK;QAClC,MAAMqC,YAAY,MAAM,IAAI,CAACzD,WAAW,CAAC0D,yBAAyB,CAACC,6BAAK,CAACC,KAAK;QAE9E,IAAI7B,aAAauB,iBAAiB,CAACE,aAAaK,QAAQ,CAACJ,UAAUjC,EAAE,KAAK,CAAC+B,QAAQtB,UAAU,EAAE;YAC7F,MAAM,IAAID,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAE8B,OAAO,EAAE,GAAG,MAAMnC,IAAAA,yBAAa,EAACjB,IAAIqC,IAAI,EAAE;YAChDe,SAAS;YACT,aAAa;QACf;QAEA,IAAI/B,aAAauB,iBAAiB,CAACQ,QAAQD,QAAQ,CAACJ,UAAUjC,EAAE,GAAG;YACjE,IAAI+B,QAAQtB,UAAU,EAAE;gBACtB,MAAM,IAAI8B,sCAAmB,CAAC;YAChC,OAAO;gBACL,MAAM,IAAIA,sCAAmB,CAAC;YAChC;QACF;QAEA,MAAM,IAAI,CAAChE,WAAW,CAACiE,cAAc,CAACV,eAAeQ;QACrDnD,IAAIG,IAAI;IACV;IAEA,MAGMmD,YAAYvD,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEa,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAE3E,MAAM0B,YAAYrB,IAAIa,IAAI,EAAEC;QAC5B,IAAIO,aAAaP,IAAI;YACnB,MAAM,IAAIQ,iCAAc,CAAC;QAC3B;QAEA,MAAMC,aAAa,MAAM,IAAI,CAAClC,WAAW,CAACmC,cAAc,CAACV;QACzD,IAAIS,YAAY;YACd,MAAM,IAAID,iCAAc,CAAC;QAC3B;QAEA,MAAM,EAAEkC,UAAU,EAAE,GAAG,MAAMvC,IAAAA,yBAAa,EAACjB,IAAIqC,IAAI,EAAE;YACnDmB,YAAY;QACd;QACA,MAAM,IAAI,CAACnE,WAAW,CAACoE,eAAe,CAAC3C,IAAI0C;QAE3CvD,IAAIG,IAAI;IACV;IAEA,MAGMsD,YAAY1D,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEa,EAAE,EAAE,GAAG,MAAMG,IAAAA,yBAAa,EAACjB,IAAIkB,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACxB,aAAa;QAE3E,MAAMgE,SAAS3D,IAAIa,IAAI,EAAEC;QACzB,IAAId,IAAIa,IAAI,EAAEC,IAAI;YAChB,MAAMS,aAAa,MAAM,IAAI,CAAClC,WAAW,CAACmC,cAAc,CAACmC;YACzD,IAAI,CAACpC,YAAY;gBACf,MAAM,IAAID,iCAAc,CAAC;YAC3B;QACF;QACA,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMN,IAAAA,yBAAa,EAACjB,IAAIqC,IAAI,EAAE;YACnDd,YAAY;QACd;QACA,MAAM,IAAI,CAAClC,WAAW,CAACuE,iBAAiB,CAAC9C,IAAIS;QAC7CtB,IAAIG,IAAI;IACV;IAEAwB,kBAAkB;QAChB,MAAMH,aAAa,IAAI,CAAClC,aAAa,CAACkC,UAAU;QAChD,IAAIA,YAAY;YACd,MAAM,IAAIH,iCAAc,CAAC;QAC3B;IACF;AACF;;;;;QAzLWuC,IAAAA,4BAAc,EAAC;YAACZ,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA2B5BW,IAAAA,4BAAc,EAAC;YAACZ,6BAAK,CAACC,KAAK;SAAC;;;;;;;;;;;;;QAS5BW,IAAAA,4BAAc,EAAC;YAACZ,6BAAK,CAACC,KAAK;SAAC;QAAGY,kCAAkB;;;;;;;;;;;;;QAkCjDA,kCAAkB;;;;;;;;;;;;;QAiBlBA,kCAAkB;;;;;;;;;;;;;QAkBlBD,IAAAA,4BAAc,EAAC;YAACZ,6BAAK,CAACC,KAAK;SAAC;QAAGY,kCAAkB;;;;;;;;;;;;;QAgCjDD,IAAAA,4BAAc,EAAC;YAACZ,6BAAK,CAACC,KAAK;SAAC;QAAGY,kCAAkB;;;;;;;;;;;;;QAwBjDA,kCAAkB;;;;;;;;;;8BAxMtBC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY"}

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

@@ -44,7 +44,7 @@ const feedRateRules = {
 };
 const testPrinterApiRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
     printerURL: "required|httpurl"
 };
 const updatePrinterDisabledReasonRules = {
@@ -56,7 +56,7 @@ const updatePrinterEnabledRule = {
 const updatePrinterConnectionSettingRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
     printerURL: "required|httpurl",
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`
 };
 const createOctoPrintBackupRules = {
     exclude: "array",

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["createOctoPrintBackupRules","feedRateRules","flowRateRules","getOctoPrintBackupRules","testPrinterApiRules","updatePrinterConnectionSettingRules","updatePrinterDisabledReasonRules","updatePrinterEnabledRule","flowRate","feedRate","printerType","OctoprintType","MoonrakerType","apiKey","UUID_LENGTH","printerURL","disabledReason","enabled","exclude","fileName"],"mappings":";;;;;;;;;;;IA+BaA,0BAA0B;eAA1BA;;IAxBAC,aAAa;eAAbA;;IAJAC,aAAa;eAAbA;;IAiCAC,uBAAuB;eAAvBA;;IAzBAC,mBAAmB;eAAnBA;;IAcAC,mCAAmC;eAAnCA;;IARAC,gCAAgC;eAAhCA;;IAIAC,wBAAwB;eAAxBA;;;kCArBe;qCACiB;AAEtC,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,YAAY;AACd;AAEO,MAAMT,mCAAmC;IAC9CU,gBAAgB;AAClB;AAEO,MAAMT,2BAA2B;IACtCU,SAAS;AACX;AAEO,MAAMZ,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEG,YAAY;IACZF,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;AACrG;AAEO,MAAMd,6BAA6B;IACxCkB,SAAS;IACT,aAAa;AACf;AAEO,MAAMf,0BAA0B;IACrCgB,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["createOctoPrintBackupRules","feedRateRules","flowRateRules","getOctoPrintBackupRules","testPrinterApiRules","updatePrinterConnectionSettingRules","updatePrinterDisabledReasonRules","updatePrinterEnabledRule","flowRate","feedRate","printerType","OctoprintType","MoonrakerType","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","printerURL","disabledReason","enabled","exclude","fileName"],"mappings":";;;;;;;;;;;IA+BaA,0BAA0B;eAA1BA;;IAxBAC,aAAa;eAAbA;;IAJAC,aAAa;eAAbA;;IAiCAC,uBAAuB;eAAvBA;;IAzBAC,mBAAmB;eAAnBA;;IAcAC,mCAAmC;eAAnCA;;IARAC,gCAAgC;eAAhCA;;IAIAC,wBAAwB;eAAxBA;;;kCArBkD;qCAClB;AAEtC,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,YAAY;AACd;AAEO,MAAMV,mCAAmC;IAC9CW,gBAAgB;AAClB;AAEO,MAAMV,2BAA2B;IACtCW,SAAS;AACX;AAEO,MAAMb,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEI,YAAY;IACZH,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;AACxH;AAEO,MAAMf,6BAA6B;IACxCmB,SAAS;IACT,aAAa;AACf;AAEO,MAAMhB,0BAA0B;IACrCiB,UAAU;AACZ"}

package/dist/models/Printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","default","printerURL","required","printerType","Number","OctoprintType","enabled","Boolean","disabledReason","assignee","name","currentUser","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoEaA,OAAO;eAAPA;;IAlDAC,aAAa;eAAbA;;;0BAlBiB;qCACe;AAiBtC,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,SAAS;IACX;IACAC,YAAY;QACVH,MAAMC;QACNG,UAAU;IACZ;IACAC,aAAa;QACXL,MAAMM;QACNF,UAAU;QACVF,SAASK,kCAAa;IACxB;IACAC,SAAS;QACPR,MAAMS;QACNL,UAAU;QACVF,SAAS;IACX;IACAQ,gBAAgB;QACdV,MAAMC;QACNG,UAAU;IACZ;IACAO,UAAU;QACRX,MAAMC;QACNG,UAAU;IACZ;IACAQ,MAAM;QACJZ,MAAMC;QACNG,UAAU;IACZ;IAEAS,aAAa;QACXb,MAAMC;QACNG,UAAU;IACZ;IACAU,WAAW;QACTd,MAAMM;QACNF,UAAU;IACZ;IACAW,UAAU;QACRf,MAAMM;QACNF,UAAU;IACZ;IACAY,UAAU;QACRhB,MAAMM;QACNF,UAAU;IACZ;AACF;AAEO,MAAMR,UAAUqB,IAAAA,eAAK,EAAC,WAAWpB"}
+{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","default","printerURL","required","printerType","Number","OctoprintType","enabled","Boolean","disabledReason","assignee","name","currentUser","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoEaA,OAAO;eAAPA;;IAlDAC,aAAa;eAAbA;;;0BAlBiB;qCACA;AAiBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,SAAS;IACX;IACAC,YAAY;QACVH,MAAMC;QACNG,UAAU;IACZ;IACAC,aAAa;QACXL,MAAMM;QACNF,UAAU;QACVF,SAASK,kCAAa;IACxB;IACAC,SAAS;QACPR,MAAMS;QACNL,UAAU;QACVF,SAAS;IACX;IACAQ,gBAAgB;QACdV,MAAMC;QACNG,UAAU;IACZ;IACAO,UAAU;QACRX,MAAMC;QACNG,UAAU;IACZ;IACAQ,MAAM;QACJZ,MAAMC;QACNG,UAAU;IACZ;IAEAS,aAAa;QACXb,MAAMC;QACNG,UAAU;IACZ;IACAU,WAAW;QACTd,MAAMM;QACNF,UAAU;IACZ;IACAW,UAAU;QACRf,MAAMM;QACNF,UAAU;IACZ;IACAY,UAAU;QACRhB,MAAMM;QACNF,UAAU;IACZ;AACF;AAEO,MAAMR,UAAUqB,IAAAA,eAAK,EAAC,WAAWpB"}

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.7",
+    defaultClientMinimum: "1.6.10",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

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

@@ -22,6 +22,9 @@ function BaseService(entity, dto, createDTO, updateDto) {
         }
         async get(id, throwIfNotFound = true, options) {
             try {
+                if (id === null || id === undefined) {
+                    throw new _typeorm.EntityNotFoundError(entity, "Id was not provided");
+                }
                 return this.repository.findOneOrFail({
                     ...options,
                     where: {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","options","findOneOrFail","where","e","EntityNotFoundError","NotFoundException","undefined","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yBAPT;gCACkB;mCAGS;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAEC,OAA2B,EAAE;YAC/E,IAAI;gBACF,OAAO,IAAI,CAACP,UAAU,CAACQ,aAAa,CAAC;oBAAE,GAAGD,OAAO;oBAAEE,OAAO;wBAAEJ;oBAAG;gBAAE;YACnE,EAAE,OAAOK,GAAG;gBACV,IAAIJ,mBAAmBI,aAAaC,4BAAmB,EAAE;oBACvD,MAAM,IAAIC,oCAAiB,CAAC,CAAC,WAAW,EAAElB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,OAAOmB;YACT;QACF;QAEA,MAAMC,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOjB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMkB,IAAAA,wBAAQ,EAAC1B;YACf,MAAM0B,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC/B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACsB,MAAM,CAAC5B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMqB,OAAO/B,GAAc,EAAE;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMkB,IAAAA,wBAAQ,EAAC5B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAAC0B,MAAM,CAAC/B;YACtC,MAAM4B,IAAAA,wBAAQ,EAAC7B;YAEf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC2B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC4B,MAAM,CAAClC,OAAOW,EAAE;QAC/C;QAEA,MAAMwB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC/B,UAAU,CAAC4B,MAAM,CAACE;QACtC;IACF;IAEA,OAAOhC;AACT"}
+{"version":3,"sources":["../../../src/services/orm/base.service.ts"],"names":["BaseService","entity","dto","createDTO","updateDto","BaseServiceHost","typeormService","repository","constructor","getDataSource","getRepository","get","id","throwIfNotFound","options","undefined","EntityNotFoundError","findOneOrFail","where","e","NotFoundException","list","find","listPaged","page","DEFAULT_PAGE","take","pageSize","skip","update","validate","Object","assign","create","save","delete","deleteMany","ids","emitEvent"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yBAPT;gCACkB;mCAGS;+BACQ;AAEnC,SAASA,YAKdC,MAAuB,EAAEC,GAAc,EAAEC,SAA2B,EAAEC,SAA2B;IACjG,MAAeC;QACbC,eAA+B;QAC/BC,WAA0B;QAE1BC,YAAY,EAAEF,cAAc,EAAsC,CAAE;YAClE,IAAI,CAACA,cAAc,GAAGA;YACtB,IAAI,CAACC,UAAU,GAAGD,eAAeG,aAAa,GAAGC,aAAa,CAACT;QACjE;QAIA,MAAMU,IAAIC,EAAgB,EAAEC,kBAAkB,IAAI,EAAEC,OAA2B,EAAE;YAC/E,IAAI;gBACF,IAAIF,OAAO,QAAQA,OAAOG,WAAW;oBACnC,MAAM,IAAIC,4BAAmB,CAACf,QAAQ;gBACxC;gBACA,OAAO,IAAI,CAACM,UAAU,CAACU,aAAa,CAAC;oBAAE,GAAGH,OAAO;oBAAEI,OAAO;wBAAEN;oBAAG;gBAAE;YACnE,EAAE,OAAOO,GAAG;gBACV,IAAIN,mBAAmBM,aAAaH,4BAAmB,EAAE;oBACvD,MAAM,IAAII,oCAAiB,CAAC,CAAC,WAAW,EAAEnB,OAAO,mCAAmC,CAAC;gBACvF;gBACA,OAAOc;YACT;QACF;QAEA,MAAMM,KAAKP,OAA4B,EAAE;YACvC,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAACR;QAC9B;QAEA,MAAMS,UAAUC,OAAoBC,2BAAY,EAAEX,OAA4B,EAAE;YAC9E,OAAO,IAAI,CAACP,UAAU,CAACe,IAAI,CAAC;gBAAEI,MAAMF,KAAKG,QAAQ;gBAAEC,MAAMJ,KAAKG,QAAQ,GAAGH,KAAKA,IAAI;gBAAE,GAAGV,OAAO;YAAC;QACjG;QAEA,MAAMe,OAAOjB,EAAgB,EAAER,SAAoB,EAAE;YACnD,MAAMH,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC;YAC9B,MAAMkB,IAAAA,wBAAQ,EAAC1B;YACf,MAAM0B,IAAAA,wBAAQ,EAACC,OAAOC,MAAM,CAAC/B,QAAQG;YACrC,MAAM,IAAI,CAACG,UAAU,CAACsB,MAAM,CAAC5B,OAAOW,EAAE,EAAER;YACxC,OAAO,MAAM,IAAI,CAACO,GAAG,CAACC;QACxB;QAEA,MAAMqB,OAAO/B,GAAc,EAAE;YAE3B,IAAIA,IAAIU,EAAE,EAAE;gBACV,OAAOV,IAAIU,EAAE;YACf;YACA,MAAMkB,IAAAA,wBAAQ,EAAC5B;YACf,MAAMD,SAAS,IAAI,CAACM,UAAU,CAAC0B,MAAM,CAAC/B;YACtC,MAAM4B,IAAAA,wBAAQ,EAAC7B;YAEf,OAAO,MAAM,IAAI,CAACM,UAAU,CAAC2B,IAAI,CAACjC;QACpC;QAEA,MAAMkC,OAAOvB,EAAgB,EAAEC,kBAAkB,IAAI,EAAE;YACrD,MAAMZ,SAAS,MAAM,IAAI,CAACU,GAAG,CAACC,IAAIC;YAClC,OAAO,MAAM,IAAI,CAACN,UAAU,CAAC4B,MAAM,CAAClC,OAAOW,EAAE;QAC/C;QAEA,MAAMwB,WAAWC,GAAmB,EAAEC,YAAY,IAAI,EAAyB;YAC7E,OAAO,MAAM,IAAI,CAAC/B,UAAU,CAAC4B,MAAM,CAACE;QACtC;IACF;IAEA,OAAOhC;AACT"}

package/dist/services/validators/printer-service.validation.js

@@ -28,14 +28,14 @@ const createMongoPrinterRules = {
     _id: "not",
     printerURL: "required|httpurl",
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
     enabled: "boolean",
     name: "string"
 };
 const createPrinterRules = {
     printerURL: "required|httpurl",
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
     enabled: "boolean",
     name: "required|string"
 };

package/dist/services/validators/printer-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","printerURL","printerType","OctoprintType","MoonrakerType","apiKey","UUID_LENGTH","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAGaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAYAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCApBe;qCACiB;AAEtC,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMX,qBAAqB;IAChCI,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMT,2BAA2B;IACtCQ,SAAS;AACX;AAEO,MAAMT,kCAAkC;IAC7CW,gBAAgB;IAChBF,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","printerURL","printerType","OctoprintType","MoonrakerType","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAGaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAYAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCApBkD;qCAClB;AAEtC,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMZ,qBAAqB;IAChCI,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMV,2BAA2B;IACtCS,SAAS;AACX;AAEO,MAAMV,kCAAkC;IAC7CY,gBAAgB;IAChBF,SAAS;AACX"}

package/dist/services/validators/yaml-service.validation.js

@@ -44,7 +44,7 @@ const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFl
         "config.floorComparisonStrategiesByPriority": "required|string|in:name,floor,id",
         printers: `${!!importPrinters ? "array|minLength:0" : "not"}`,
         "printers.*.id": "required",
-        "printers.*.apiKey": `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+        "printers.*.apiKey": `required|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaNumeric`,
         "printers.*.printerURL": "required|httpurl",
         "printers.*.enabled": "boolean",
         "printers.*.printerType": `integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,

package/dist/services/validators/yaml-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","UUID_LENGTH","OctoprintType","MoonrakerType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBe;qCACiB;AAEtC,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAEO,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;QACxE,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACR,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBS,QAAQ,GAAG,CAAC,CAACR,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACqB,gBAA4B,CAAA;QACtEN,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","OctoprintType","MoonrakerType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBkD;qCAClB;AAEtC,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAEO,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,aAAa,CAAC;QACvG,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;QACxE,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBU,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACsB,gBAA4B,CAAA;QACtEP,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}

package/dist/state/validation/create-test-printer.validation.js

@@ -13,7 +13,7 @@ const _printerapiinterface = require("../../services/printer-api.interface");
 const createTestPrinterRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
     correlationToken: "required|string",
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
     printerURL: "required|httpurl"
 };
 

package/dist/state/validation/create-test-printer.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","printerType","OctoprintType","MoonrakerType","correlationToken","apiKey","UUID_LENGTH","printerURL"],"mappings":";;;;+BAGaA;;;eAAAA;;;kCAHe;qCACiB;AAEtC,MAAMA,yBAAyB;IACpCC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,kBAAkB;IAClBC,QAAQ,CAAC,uBAAuB,EAAEH,kCAAa,CAAC,QAAQ,EAAEI,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,YAAY;AACd"}
+{"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","printerType","OctoprintType","MoonrakerType","correlationToken","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","printerURL"],"mappings":";;;;+BAGaA;;;eAAAA;;;kCAHkD;qCAClB;AAEtC,MAAMA,yBAAyB;IACpCC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,kBAAkB;IAClBC,QAAQ,CAAC,uBAAuB,EAAEH,kCAAa,CAAC,QAAQ,EAAEI,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,YAAY;AACd"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -53,18 +53,18 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.6.7",
-    "@fdm-monster/client-next": "0.0.4",
+    "@fdm-monster/client": "1.6.10",
+    "@fdm-monster/client-next": "0.0.7",
     "@influxdata/influxdb-client": "1.35.0",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "8.36.0",
+    "@sentry/node": "8.37.1",
     "adm-zip": "0.5.16",
     "awilix": "12.0.3",
     "awilix-express": "9.0.1",
     "axios": "1.7.7",
     "bcryptjs": "2.4.3",
     "better-sqlite3": "11.5.0",
-    "cache-manager": "6.1.2",
+    "cache-manager": "6.1.3",
     "class-validator": "0.14.1",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.7",
@@ -95,15 +95,15 @@
     "socket.io": "4.8.1",
     "toad-scheduler": "3.0.1",
     "typeorm": "0.3.20",
-    "uuid": "11.0.2",
-    "winston": "3.16.0",
+    "uuid": "11.0.3",
+    "winston": "3.17.0",
     "ws": "8.18.0"
   },
   "devDependencies": {
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
     "@swc/cli": "0.5.0",
-    "@swc/core": "1.8.0",
+    "@swc/core": "1.9.2",
     "@swc/jest": "0.2.37",
     "@types/adm-zip": "0.5.6",
     "@types/bcryptjs": "2.4.6",
@@ -118,7 +118,7 @@
     "@types/luxon": "3.4.2",
     "@types/migrate-mongo": "10.0.5",
     "@types/multer": "1.4.12",
-    "@types/node": "22.8.7",
+    "@types/node": "22.9.0",
     "@types/passport-anonymous": "1.0.5",
     "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.5.8",
@@ -132,14 +132,14 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-n": "17.12.0",
+    "eslint-plugin-n": "17.13.1",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-promise": "7.1.0",
     "express-list-routes": "1.2.4",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
     "mongodb-memory-server": "10.1.2",
-    "nock": "13.5.5",
+    "nock": "13.5.6",
     "prettier": "2.8.8",
     "supertest": "7.0.0",
     "ts-node": "10.9.2",