@fdm-monster/server 1.8.3 → 1.9.0-rc1

package/dist/controllers/user.controller.js

@@ -13,12 +13,18 @@ const _serverconstants = require("../server.constants");
 const _authenticate = require("../middleware/authenticate");
 const _authorizationconstants = require("../constants/authorization.constants");
 const _validators = require("../handlers/validators");
-const _genericvalidation = require("./validation/generic.validation");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
+const _configservice = require("../services/core/config.service");
+const _userserviceinterface = require("../services/interfaces/user-service.interface");
 const _demomiddleware = require("../middleware/demo.middleware");
+const _roleserviceinterface = require("../services/interfaces/role-service.interface");
+const _authserviceinterface = require("../services/interfaces/auth.service.interface");
+const _loggerfactory = require("../handlers/logger-factory");
 const _errorutils = require("../utils/error.utils");
+const _settingsstore = require("../state/settings.store");
 const _awilixexpress = require("awilix-express");
 const _usercontrollervalidation = require("./validation/user-controller.validation");
+const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
 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);
@@ -30,13 +36,13 @@ function _ts_metadata(k, v) {
 }
 class UserController {
     userService;
-    roleService;
     configService;
+    roleService;
     authService;
     settingsStore;
-    logger;
     isTypeormMode;
-    constructor({ userService, configService, roleService, settingsStore, authService, loggerFactory, isTypeormMode }){
+    logger;
+    constructor(loggerFactory, userService, configService, roleService, authService, settingsStore, isTypeormMode){
         this.userService = userService;
         this.configService = configService;
         this.roleService = roleService;
@@ -50,7 +56,7 @@ class UserController {
         res.send(users.map((u)=>this.userService.toDto(u)));
     }
     async create(req, res) {
-        const { username, password, roleIds } = await (0, _validators.validateMiddleware)(req, (0, _usercontrollervalidation.registerUserWithRolesRules)(this.isTypeormMode));
+        const { username, password, roleIds } = await (0, _validators.validateMiddleware)(req, (0, _usercontrollervalidation.registerUserWithRolesSchema)(this.isTypeormMode));
         if (username.toLowerCase().includes("admin") || username.toLowerCase().includes("root") || username.toLowerCase() === "demo") {
             throw new _runtimeexceptions.BadRequestException("Username is not allowed");
         }
@@ -78,109 +84,100 @@ class UserController {
         res.send(this.userService.toDto(user));
     }
     async get(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
-        const user = await this.userService.getUser(id);
+        const user = await this.userService.getUser(req.local.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 deletedUserId = req.local.id;
         const ownUserId = req.user?.id;
-        if (ownUserId == id) {
+        if (ownUserId == deletedUserId) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to delete own account");
         }
-        const isRootUser = await this.userService.isUserRootUser(id);
+        const isRootUser = await this.userService.isUserRootUser(deletedUserId);
         if (isRootUser) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to delete root user");
         }
         if (this.configService.isDemoMode()) {
             const demoUserId = await this.userService.getDemoUserId();
-            if (id === demoUserId) {
+            if (deletedUserId === demoUserId) {
                 this.throwIfDemoMode();
             }
         }
-        await this.userService.deleteUser(id);
+        await this.userService.deleteUser(deletedUserId);
         try {
-            await this.authService.logoutUserId(id);
+            await this.authService.logoutUserId(deletedUserId);
         } catch (e) {
             this.logger.error((0, _errorutils.errorSummary)(e));
         }
         res.send();
     }
     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()) {
+        const changedUserId = req.local.id;
+        if (req.user?.id != changedUserId && await this.settingsStore.getLoginRequired()) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change username of other users");
         }
-        const { username } = await (0, _validators.validateInput)(req.body, {
-            username: "required|string"
-        });
-        await this.userService.updateUsernameById(id, username);
+        const { username } = await (0, _validators.validateInput)(req.body, _usercontrollervalidation.usernameSchema);
+        await this.userService.updateUsernameById(changedUserId, username);
         res.send();
     }
     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()) {
+        const changedUserId = req.local.id;
+        if (req.user?.id != changedUserId && 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, {
-            oldPassword: "required|string",
-            newPassword: "required|string"
-        });
-        await this.userService.updatePasswordById(id, oldPassword, newPassword);
+        const { oldPassword, newPassword } = await (0, _validators.validateInput)(req.body, _usercontrollervalidation.changePasswordSchema);
+        await this.userService.updatePasswordById(changedUserId, oldPassword, newPassword);
         res.send();
     }
     async setUserRoles(req, res) {
-        const { id: currentUserId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
+        const changedUserId = req.local.id;
         const ownUserId = req.user?.id;
+        if (!ownUserId) {
+            throw new _runtimeexceptions.ForbiddenError("Need to be logged in, in order to set user roles");
+        }
         const ownUser = await this.userService.getUser(ownUserId);
-        const ownUserRoles = ownUser.roles;
+        const mappedUser = this.userService.toDto(ownUser);
+        const ownUserRoles = mappedUser.roles;
         const adminRole = await this.roleService.getSynchronizedRoleByName(_authorizationconstants.ROLES.ADMIN);
-        if (ownUserId == currentUserId && !ownUserRoles.includes(adminRole.id) && !ownUser.isRootUser) {
+        if (ownUserId == changedUserId && !ownUserRoles.includes(adminRole.id) && !mappedUser.isRootUser) {
             throw new _runtimeexceptions.ForbiddenError("Only an ADMIN or OWNER user is allowed to change its own roles");
         }
-        const { roleIds } = await (0, _validators.validateInput)(req.body, {
-            roleIds: "array",
-            "roleIds.*": "alphaNumeric"
-        });
-        if (ownUserId == currentUserId && !roleIds.includes(adminRole.id)) {
-            if (ownUser.isRootUser) {
+        const { roleIds } = await (0, _validators.validateInput)(req.body, (0, _usercontrollervalidation.setUserRolesSchema)(this.isTypeormMode));
+        if (ownUserId == changedUserId && !roleIds.includes(adminRole.id)) {
+            if (mappedUser.isRootUser) {
                 throw new _runtimeexceptions.BadRequestException("It does not make sense to remove ADMIN role from an OWNER user.");
             } else {
                 throw new _runtimeexceptions.BadRequestException("An ADMIN user cannot remove its ADMIN role.");
             }
         }
-        await this.userService.setUserRoleIds(currentUserId, roleIds);
+        await this.userService.setUserRoleIds(changedUserId, roleIds);
         res.send();
     }
     async setVerified(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
+        const changedUserId = req.local.id;
         const ownUserId = req.user?.id;
-        if (ownUserId == id) {
+        if (ownUserId == changedUserId) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change own verified status");
         }
-        const isRootUser = await this.userService.isUserRootUser(id);
+        const isRootUser = await this.userService.isUserRootUser(changedUserId);
         if (isRootUser) {
             throw new _runtimeexceptions.ForbiddenError("Not allowed to change root user to unverified");
         }
-        const { isVerified } = await (0, _validators.validateInput)(req.body, {
-            isVerified: "required|boolean"
-        });
-        await this.userService.setVerifiedById(id, isVerified);
+        const { isVerified } = await (0, _validators.validateInput)(req.body, _usercontrollervalidation.isVerifiedSchema);
+        await this.userService.setVerifiedById(changedUserId, isVerified);
         res.send();
     }
     async setRootUser(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
+        const changedUserId = req.local.id;
         const userId = req.user?.id;
-        if (req.user?.id) {
+        if (userId) {
             const isRootUser = await this.userService.isUserRootUser(userId);
             if (!isRootUser) {
                 throw new _runtimeexceptions.ForbiddenError("Not allowed to change owner without being owner yourself");
             }
         }
-        const { isRootUser } = await (0, _validators.validateInput)(req.body, {
-            isRootUser: "required|boolean"
-        });
-        await this.userService.setIsRootUserById(id, isRootUser);
+        const { isRootUser } = await (0, _validators.validateInput)(req.body, _usercontrollervalidation.isRootUserSchema);
+        await this.userService.setIsRootUserById(changedUserId, isRootUser);
         res.send();
     }
     throwIfDemoMode() {
@@ -246,7 +243,8 @@ _ts_decorate([
     (0, _awilixexpress.before)([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
-        ])
+        ]),
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -262,7 +260,8 @@ _ts_decorate([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ]),
-        _demomiddleware.demoUserNotAllowed
+        _demomiddleware.demoUserNotAllowed,
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -275,7 +274,8 @@ _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/:id/change-username"),
     (0, _awilixexpress.before)([
-        _demomiddleware.demoUserNotAllowed
+        _demomiddleware.demoUserNotAllowed,
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -288,7 +288,8 @@ _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/:id/change-password"),
     (0, _awilixexpress.before)([
-        _demomiddleware.demoUserNotAllowed
+        _demomiddleware.demoUserNotAllowed,
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -304,7 +305,8 @@ _ts_decorate([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ]),
-        _demomiddleware.demoUserNotAllowed
+        _demomiddleware.demoUserNotAllowed,
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -320,7 +322,8 @@ _ts_decorate([
         (0, _authenticate.authorizeRoles)([
             _authorizationconstants.ROLES.ADMIN
         ]),
-        _demomiddleware.demoUserNotAllowed
+        _demomiddleware.demoUserNotAllowed,
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -333,7 +336,8 @@ _ts_decorate([
     (0, _awilixexpress.POST)(),
     (0, _awilixexpress.route)("/:id/set-root-user"),
     (0, _awilixexpress.before)([
-        _demomiddleware.demoUserNotAllowed
+        _demomiddleware.demoUserNotAllowed,
+        (0, _paramconvertermiddleware.ParamId)("id")
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
@@ -349,7 +353,13 @@ UserController = _ts_decorate([
     ]),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        Object
+        typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
+        typeof _userserviceinterface.IUserService === "undefined" ? Object : _userserviceinterface.IUserService,
+        typeof _configservice.IConfigService === "undefined" ? Object : _configservice.IConfigService,
+        typeof _roleserviceinterface.IRoleService === "undefined" ? Object : _roleserviceinterface.IRoleService,
+        typeof _authserviceinterface.IAuthService === "undefined" ? Object : _authserviceinterface.IAuthService,
+        typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore,
+        Boolean
     ])
 ], UserController);
 

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","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":"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"}
+{"version":3,"sources":["../../src/controllers/user.controller.ts"],"names":["UserController","logger","constructor","loggerFactory","userService","configService","roleService","authService","settingsStore","isTypeormMode","name","list","req","res","users","listUsers","send","map","u","toDto","create","username","password","roleIds","validateMiddleware","registerUserWithRolesSchema","toLowerCase","includes","BadRequestException","register","roles","needsPasswordChange","isDemoUser","isRootUser","isVerified","listRoles","roleDtos","r","profile","user","id","getUser","get","local","delete","deletedUserId","ownUserId","ForbiddenError","isUserRootUser","isDemoMode","demoUserId","getDemoUserId","throwIfDemoMode","deleteUser","logoutUserId","e","error","errorSummary","changeUsername","changedUserId","getLoginRequired","validateInput","body","usernameSchema","updateUsernameById","changePassword","oldPassword","newPassword","changePasswordSchema","updatePasswordById","setUserRoles","ownUser","mappedUser","ownUserRoles","adminRole","getSynchronizedRoleByName","ROLES","ADMIN","setUserRolesSchema","setUserRoleIds","setVerified","isVerifiedSchema","setVerifiedById","setRootUser","userId","isRootUserSchema","setIsRootUserById","authorizeRoles","ParamId","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"mappings":"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"}

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

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "refreshTokenRules", {
+Object.defineProperty(exports, "refreshTokenSchema", {
     enumerable: true,
     get: function() {
-        return refreshTokenRules;
+        return refreshTokenSchema;
     }
 });
-const refreshTokenRules = {
-    refreshToken: "required|string"
-};
+const _zod = require("zod");
+const refreshTokenSchema = _zod.z.object({
+    refreshToken: _zod.z.string().min(1)
+});
 
 //# sourceMappingURL=auth-controller.validation.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/auth-controller.validation.ts"],"names":["refreshTokenRules","refreshToken"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,oBAAoB;IAC/BC,cAAc;AAChB"}
+{"version":3,"sources":["../../../src/controllers/validation/auth-controller.validation.ts"],"names":["refreshTokenSchema","z","object","refreshToken","string","min"],"mappings":";;;;+BAEaA;;;eAAAA;;;qBAFK;AAEX,MAAMA,qBAAqBC,MAAC,CAACC,MAAM,CAAC;IACzCC,cAAcF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AAC/B"}

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

@@ -9,31 +9,30 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    batchPrinterRules: function() {
-        return batchPrinterRules;
+    batchPrinterSchema: function() {
+        return batchPrinterSchema;
     },
-    batchPrintersEnabledRules: function() {
-        return batchPrintersEnabledRules;
+    batchPrintersEnabledSchema: function() {
+        return batchPrintersEnabledSchema;
     },
-    executeBatchRePrinterRule: function() {
-        return executeBatchRePrinterRule;
+    executeBatchRePrinterSchema: function() {
+        return executeBatchRePrinterSchema;
     }
 });
+const _zod = require("zod");
 const _genericvalidation = require("./generic.validation");
-const batchPrinterRules = (isSqlite)=>({
-        printerIds: "required|array",
-        "printerIds.*": (0, _genericvalidation.idRuleV2)(isSqlite)
+const batchPrinterSchema = (isSqlite)=>_zod.z.object({
+        printerIds: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite))
     });
-const executeBatchRePrinterRule = (isSqlite)=>({
-        prints: "required|array",
-        "prints.*": "required",
-        "prints.*.printerId": (0, _genericvalidation.idRuleV2)(isSqlite),
-        "prints.*.path": "required|string"
+const executeBatchRePrinterSchema = (isSqlite)=>_zod.z.object({
+        prints: _zod.z.array(_zod.z.object({
+            printerId: (0, _genericvalidation.idRuleV2)(isSqlite),
+            path: _zod.z.string()
+        }))
     });
-const batchPrintersEnabledRules = (isSqlite)=>({
-        printerIds: "required|array",
-        "printerIds.*": (0, _genericvalidation.idRuleV2)(isSqlite),
-        enabled: "required|boolean"
+const batchPrintersEnabledSchema = (isSqlite)=>_zod.z.object({
+        printerIds: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite)),
+        enabled: _zod.z.boolean()
     });
 
 //# sourceMappingURL=batch-controller.validation.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["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"}
+{"version":3,"sources":["../../../src/controllers/validation/batch-controller.validation.ts"],"names":["batchPrinterSchema","batchPrintersEnabledSchema","executeBatchRePrinterSchema","isSqlite","z","object","printerIds","array","idRuleV2","prints","printerId","path","string","enabled","boolean"],"mappings":";;;;;;;;;;;IAGaA,kBAAkB;eAAlBA;;IAeAC,0BAA0B;eAA1BA;;IAVAC,2BAA2B;eAA3BA;;;qBARK;mCACO;AAElB,MAAMF,qBAAqB,CAACG,WACjCC,MAAC,CAACC,MAAM,CAAC;QACPC,YAAYF,MAAC,CAACG,KAAK,CAACC,IAAAA,2BAAQ,EAACL;IAC/B;AAEK,MAAMD,8BAA8B,CAACC,WAC1CC,MAAC,CAACC,MAAM,CAAC;QACPI,QAAQL,MAAC,CAACG,KAAK,CACbH,MAAC,CAACC,MAAM,CAAC;YACPK,WAAWF,IAAAA,2BAAQ,EAACL;YACpBQ,MAAMP,MAAC,CAACQ,MAAM;QAChB;IAEJ;AAEK,MAAMX,6BAA6B,CAACE,WACzCC,MAAC,CAACC,MAAM,CAAC;QACPC,YAAYF,MAAC,CAACG,KAAK,CAACC,IAAAA,2BAAQ,EAACL;QAC7BU,SAAST,MAAC,CAACU,OAAO;IACpB"}

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

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

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","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"}
+{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","isHexadecimal","str","test","isMongoId","length","isSqlite","z","number","min","string","refine","message","object","id","strict"],"mappings":";;;;;;;;;;;IAMaA,QAAQ;eAARA;;IAOAC,SAAS;eAATA;;;qBAbK;AAElB,MAAMC,gBAAgB,CAACC,MAAgB,iBAAiBC,IAAI,CAACD;AAE7D,MAAME,YAAY,CAACF,MAAgBD,cAAcC,QAAQA,IAAIG,MAAM,KAAK;AAEjE,MAAMN,WAAW,CAACO,WACvBA,WACIC,MAAC,CAACC,MAAM,GAAGC,GAAG,CAAC,KACfF,MAAC,CAACG,MAAM,GAAGC,MAAM,CAACP,WAAW;QAC3BQ,SAAS;IACX;AAEC,MAAMZ,YAAY,CAACM,WACxBC,MAAC,CACEM,MAAM,CAAC;QACNC,IAAIf,SAASO;IACf,GACCS,MAAM"}

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

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "findPrinterCompletionSchema", {
+    enumerable: true,
+    get: function() {
+        return findPrinterCompletionSchema;
+    }
+});
+const _zod = require("zod");
+const findPrinterCompletionSchema = _zod.z.object({
+    correlationId: _zod.z.string().min(1)
+});
+
+//# sourceMappingURL=printer-completion-controller.validation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/controllers/validation/printer-completion-controller.validation.ts"],"names":["findPrinterCompletionSchema","z","object","correlationId","string","min"],"mappings":";;;;+BAEaA;;;eAAAA;;;qBAFK;AAEX,MAAMA,8BAA8BC,MAAC,CAACC,MAAM,CAAC;IAClDC,eAAeF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AAChC"}

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

@@ -9,61 +9,42 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    createOctoPrintBackupRules: function() {
-        return createOctoPrintBackupRules;
+    feedRateSchema: function() {
+        return feedRateSchema;
     },
-    feedRateRules: function() {
-        return feedRateRules;
+    flowRateSchema: function() {
+        return flowRateSchema;
     },
-    flowRateRules: function() {
-        return flowRateRules;
+    testPrinterApiSchema: function() {
+        return testPrinterApiSchema;
     },
-    getOctoPrintBackupRules: function() {
-        return getOctoPrintBackupRules;
+    updatePrinterDisabledReasonSchema: function() {
+        return updatePrinterDisabledReasonSchema;
     },
-    testPrinterApiRules: function() {
-        return testPrinterApiRules;
-    },
-    updatePrinterConnectionSettingRules: function() {
-        return updatePrinterConnectionSettingRules;
-    },
-    updatePrinterDisabledReasonRules: function() {
-        return updatePrinterDisabledReasonRules;
-    },
-    updatePrinterEnabledRule: function() {
-        return updatePrinterEnabledRule;
+    updatePrinterEnabledSchema: function() {
+        return updatePrinterEnabledSchema;
     }
 });
-const _serviceconstants = require("../../constants/service.constants");
-const _printerapiinterface = require("../../services/printer-api.interface");
-const flowRateRules = {
-    flowRate: "required|between:75,125|integer"
-};
-const feedRateRules = {
-    feedRate: "required|between:10,200|integer"
-};
-const testPrinterApiRules = {
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
-    printerURL: "required|httpurl"
-};
-const updatePrinterDisabledReasonRules = {
-    disabledReason: "string"
-};
-const updatePrinterEnabledRule = {
-    enabled: "required|boolean"
-};
-const updatePrinterConnectionSettingRules = {
-    printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    printerURL: "required|httpurl",
-    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`
-};
-const createOctoPrintBackupRules = {
-    exclude: "array",
-    "exclude.*": "string"
-};
-const getOctoPrintBackupRules = {
-    fileName: "required|string"
-};
+const _zod = require("zod");
+const _printerservicevalidation = require("../../services/validators/printer-service.validation");
+const flowRateSchema = _zod.z.object({
+    flowRate: _zod.z.number().int().min(75).max(125).nonnegative()
+});
+const feedRateSchema = _zod.z.object({
+    feedRate: _zod.z.number().int().min(10).max(200).nonnegative()
+});
+const testPrinterApiSchema = _zod.z.object({
+    printerURL: _printerservicevalidation.printerUrlValidator,
+    printerType: _printerservicevalidation.printerTypeValidator,
+    apiKey: _printerservicevalidation.printerApiKeyValidator,
+    username: _printerservicevalidation.printerUsernameValidator.optional(),
+    password: _printerservicevalidation.printerPasswordValidator.optional()
+}).superRefine(_printerservicevalidation.refineApiKeyValidator);
+const updatePrinterDisabledReasonSchema = _zod.z.object({
+    disabledReason: _printerservicevalidation.printerDisabledReasonValidator
+});
+const updatePrinterEnabledSchema = _zod.z.object({
+    enabled: _printerservicevalidation.printerEnabledValidator
+});
 
 //# sourceMappingURL=printer-controller.validation.js.map

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","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"}
+{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["feedRateSchema","flowRateSchema","testPrinterApiSchema","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","z","object","flowRate","number","int","min","max","nonnegative","feedRate","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","username","printerUsernameValidator","optional","password","printerPasswordValidator","superRefine","refineApiKeyValidator","disabledReason","printerDisabledReasonValidator","enabled","printerEnabledValidator"],"mappings":";;;;;;;;;;;IAgBaA,cAAc;eAAdA;;IAJAC,cAAc;eAAdA;;IAQAC,oBAAoB;eAApBA;;IAUAC,iCAAiC;eAAjCA;;IAIAC,0BAA0B;eAA1BA;;;qBAlCK;0CAUX;AAEA,MAAMH,iBAAiBI,MAAC,CAACC,MAAM,CAAC;IACrCC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,IAAIC,GAAG,CAAC,KAAKC,WAAW;AACzD;AAEO,MAAMZ,iBAAiBK,MAAC,CAACC,MAAM,CAAC;IACrCO,UAAUR,MAAC,CAACG,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,IAAIC,GAAG,CAAC,KAAKC,WAAW;AACzD;AAEO,MAAMV,uBAAuBG,MAAC,CAClCC,MAAM,CAAC;IACNQ,YAAYC,6CAAmB;IAC/BC,aAAaC,8CAAoB;IACjCC,QAAQC,gDAAsB;IAC9BC,UAAUC,kDAAwB,CAACC,QAAQ;IAC3CC,UAAUC,kDAAwB,CAACF,QAAQ;AAC7C,GACCG,WAAW,CAACC,+CAAqB;AAE7B,MAAMvB,oCAAoCE,MAAC,CAACC,MAAM,CAAC;IACxDqB,gBAAgBC,wDAA8B;AAChD;AAEO,MAAMxB,6BAA6BC,MAAC,CAACC,MAAM,CAAC;IACjDuB,SAASC,iDAAuB;AAClC"}

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

@@ -9,24 +9,25 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    downloadFileRules: function() {
-        return downloadFileRules;
+    downloadFileSchema: function() {
+        return downloadFileSchema;
     },
-    getFileRules: function() {
-        return getFileRules;
+    getFileSchema: function() {
+        return getFileSchema;
     },
-    startPrintFileRules: function() {
-        return startPrintFileRules;
+    startPrintFileSchema: function() {
+        return startPrintFileSchema;
     }
 });
-const getFileRules = {
-    path: "required|string"
-};
-const downloadFileRules = {
-    path: "required|string"
-};
-const startPrintFileRules = {
-    filePath: "required|string"
-};
+const _zod = require("zod");
+const startPrintFileSchema = _zod.z.object({
+    filePath: _zod.z.string().min(1)
+});
+const downloadFileSchema = _zod.z.object({
+    path: _zod.z.string().min(1)
+});
+const getFileSchema = _zod.z.object({
+    path: _zod.z.string().min(1)
+});
 
 //# sourceMappingURL=printer-files-controller.validation.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/printer-files-controller.validation.ts"],"names":["downloadFileRules","getFileRules","startPrintFileRules","path","filePath"],"mappings":";;;;;;;;;;;IAIaA,iBAAiB;eAAjBA;;IAJAC,YAAY;eAAZA;;IAQAC,mBAAmB;eAAnBA;;;AARN,MAAMD,eAAe;IAC1BE,MAAM;AACR;AAEO,MAAMH,oBAAoB;IAC/BG,MAAM;AACR;AAEO,MAAMD,sBAAsB;IACjCE,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/controllers/validation/printer-files-controller.validation.ts"],"names":["downloadFileSchema","getFileSchema","startPrintFileSchema","z","object","filePath","string","min","path"],"mappings":";;;;;;;;;;;IAMaA,kBAAkB;eAAlBA;;IAIAC,aAAa;eAAbA;;IARAC,oBAAoB;eAApBA;;;qBAFK;AAEX,MAAMA,uBAAuBC,MAAC,CAACC,MAAM,CAAC;IAC3CC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AAC3B;AAEO,MAAMP,qBAAqBG,MAAC,CAACC,MAAM,CAAC;IACzCI,MAAML,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AACvB;AAEO,MAAMN,gBAAgBE,MAAC,CAACC,MAAM,CAAC;IACpCI,MAAML,MAAC,CAACG,MAAM,GAAGC,GAAG,CAAC;AACvB"}