@fdm-monster/server 1.9.4 → 2.0.0

package/dist/middleware/database.js

@@ -18,7 +18,7 @@ async function interceptDatabaseError(req, res, next) {
         res.status(500);
         res.send({
             databaseReadyState: serverHost.hasConnected(),
-            state: "Retrying mongo connection. Please contact the developer if this persists."
+            state: "Retrying database connection. Please contact the developer if this persists."
         });
     }
 }

package/dist/middleware/exception.filter.js

@@ -2,9 +2,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "exceptionFilter", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get ExceptionFilter () {
+        return ExceptionFilter;
+    },
+    get exceptionFilter () {
         return exceptionFilter;
     }
 });
@@ -12,95 +20,111 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _serverconstants = require("../server.constants");
 const _typeorm = require("typeorm");
 const _faileddependencyexception = require("../exceptions/failed-dependency.exception");
-function exceptionFilter(err, _req, res, next) {
-    const isTest = process.env.NODE_ENV === _serverconstants.AppConstants.defaultTestEnv;
-    if (!isTest) {
-        console.error("[API Exception Handler]", err.stack || err?.response?.data);
-    }
-    if (err.isAxiosError) {
-        const code = err.response?.status || 500;
-        res.status(code).send({
-            error: "External API call failed",
-            type: "axios-error",
-            data: err.response?.data?._readableState ? null : err.response?.data
-        });
-        return;
-    }
-    if (err instanceof _runtimeexceptions.AuthenticationError) {
-        res.status(401).send({
-            error: err.message,
-            reasonCode: err.reasonCode
-        });
-        return;
-    }
-    if (err instanceof _runtimeexceptions.AuthorizationError) {
-        const permissions = err.permissions;
-        const roles = err.roles;
-        const error = err.message || "You lack permission to this resource";
-        const reason = err.reason;
-        res.status(403).send({
-            error,
-            reason,
-            permissions,
-            roles
-        });
-        return;
-    }
-    if (err instanceof _runtimeexceptions.ForbiddenError) {
-        res.status(403).send({
-            error: err.message
-        });
-        return;
-    }
-    if (err instanceof _runtimeexceptions.NotFoundException || err instanceof _typeorm.EntityNotFoundError) {
-        res.status(404).send({
-            error: err.message
-        });
-        return;
+class ExceptionFilter {
+    logger;
+    constructor(loggerFactory){
+        this.logger = loggerFactory(ExceptionFilter.name);
     }
-    if (err instanceof _runtimeexceptions.BadRequestException) {
-        res.status(400).send({
-            error: err.message
-        });
-        return;
+    handle(err, _req, res, next) {
+        const isTest = process.env.NODE_ENV === _serverconstants.AppConstants.defaultTestEnv;
+        if (!isTest) {
+            this.logger.error("API Exception occurred", {
+                message: err.message,
+                stack: err.stack || err?.response?.data,
+                url: _req?.url,
+                method: _req?.method,
+                userAgent: _req?.headers?.['user-agent'],
+                errorType: err.constructor.name
+            });
+        }
+        if (err.isAxiosError) {
+            const code = err.response?.status || 500;
+            res.status(code).send({
+                error: "External API call failed",
+                type: "axios-error",
+                data: err.response?.data?._readableState ? null : err.response?.data
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.AuthenticationError) {
+            res.status(401).send({
+                error: err.message,
+                reasonCode: err.reasonCode
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.AuthorizationError) {
+            const permissions = err.permissions;
+            const roles = err.roles;
+            const error = err.message || "You lack permission to this resource";
+            const reason = err.reason;
+            res.status(403).send({
+                error,
+                reason,
+                permissions,
+                roles
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.ForbiddenError) {
+            res.status(403).send({
+                error: err.message
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.NotFoundException || err instanceof _typeorm.EntityNotFoundError) {
+            res.status(404).send({
+                error: err.message
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.BadRequestException) {
+            res.status(400).send({
+                error: err.message
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.ValidationException) {
+            res.status(400).send({
+                error: "API could not accept this input",
+                type: err.name,
+                errors: err.errors
+            });
+            return;
+        }
+        if (err instanceof _faileddependencyexception.FailedDependencyException) {
+            res.status(424).send({
+                error: err.message,
+                serviceCode: err.serviceCode,
+                type: err.name
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.InternalServerException) {
+            res.status(500).send({
+                error: err.message,
+                type: err.name,
+                stack: err.stack
+            });
+            return;
+        }
+        if (err instanceof _runtimeexceptions.ExternalServiceError) {
+            res.status(500).send(err.error);
+            return;
+        }
+        if (err) {
+            res.status(500).send({
+                error: "Server experienced an internal error",
+                type: err.name,
+                stack: err.stack
+            });
+            return;
+        }
+        next();
     }
-    if (err instanceof _runtimeexceptions.ValidationException) {
-        res.status(400).send({
-            error: "API could not accept this input",
-            type: err.name,
-            errors: err.errors
-        });
-        return;
-    }
-    if (err instanceof _faileddependencyexception.FailedDependencyException) {
-        res.status(424).send({
-            error: err.message,
-            serviceCode: err.serviceCode,
-            type: err.name
-        });
-        return;
-    }
-    if (err instanceof _runtimeexceptions.InternalServerException) {
-        res.status(500).send({
-            error: err.message,
-            type: err.name,
-            stack: err.stack
-        });
-        return;
-    }
-    if (err instanceof _runtimeexceptions.ExternalServiceError) {
-        res.status(500).send(err.error);
-        return;
-    }
-    if (!!err) {
-        res.status(500).send({
-            error: "Server experienced an internal error",
-            type: err.name,
-            stack: err.stack
-        });
-        return;
-    }
-    next();
+}
+function exceptionFilter(_err, _req, _res, _next) {
+    throw new Error("Use ExceptionFilter class instead of exceptionFilter function. Please inject ExceptionFilter and use .handle method.");
 }
 
 //# sourceMappingURL=exception.filter.js.map

package/dist/middleware/exception.filter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/exception.filter.ts"],"names":["exceptionFilter","err","_req","res","next","isTest","process","env","NODE_ENV","AppConstants","defaultTestEnv","console","error","stack","response","data","isAxiosError","code","status","send","type","_readableState","AuthenticationError","message","reasonCode","AuthorizationError","permissions","roles","reason","ForbiddenError","NotFoundException","EntityNotFoundError","BadRequestException","ValidationException","name","errors","FailedDependencyException","serviceCode","InternalServerException","ExternalServiceError"],"mappings":";;;;+BAgBgBA;;;eAAAA;;;mCAPT;iCACsB;yBAGO;2CACM;AAEnC,SAASA,gBAAgBC,GAAqB,EAAEC,IAAmB,EAAEC,GAAa,EAAEC,IAAkB;IAC3G,MAAMC,SAASC,QAAQC,GAAG,CAACC,QAAQ,KAAKC,6BAAY,CAACC,cAAc;IACnE,IAAI,CAACL,QAAQ;QACXM,QAAQC,KAAK,CAAC,2BAA2BX,IAAIY,KAAK,IAAIZ,KAAKa,UAAUC;IACvE;IACA,IAAId,IAAIe,YAAY,EAAE;QACpB,MAAMC,OAAOhB,IAAIa,QAAQ,EAAEI,UAAU;QACrCf,IAAIe,MAAM,CAACD,MAAME,IAAI,CAAC;YACpBP,OAAO;YACPQ,MAAM;YACNL,MAAMd,IAAIa,QAAQ,EAAEC,MAAMM,iBAAiB,OAAOpB,IAAIa,QAAQ,EAAEC;QAClE;QACA;IACF;IACA,IAAId,eAAeqB,sCAAmB,EAAE;QACtCnB,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEP,OAAOX,IAAIsB,OAAO;YAAEC,YAAYvB,IAAIuB,UAAU;QAAC;QACtE;IACF;IACA,IAAIvB,eAAewB,qCAAkB,EAAE;QACrC,MAAMC,cAAczB,IAAIyB,WAAW;QACnC,MAAMC,QAAQ1B,IAAI0B,KAAK;QACvB,MAAMf,QAAQX,IAAIsB,OAAO,IAAI;QAC7B,MAAMK,SAAS3B,IAAI2B,MAAM;QACzBzB,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEP;YAAOgB;YAAQF;YAAaC;QAAM;QACzD;IACF;IACA,IAAI1B,eAAe4B,iCAAc,EAAE;QACjC1B,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEP,OAAOX,IAAIsB,OAAO;QAAC;QAC1C;IACF;IACA,IAAItB,eAAe6B,oCAAiB,IAAI7B,eAAe8B,4BAAmB,EAAE;QAC1E5B,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEP,OAAOX,IAAIsB,OAAO;QAAC;QAC1C;IACF;IACA,IAAItB,eAAe+B,sCAAmB,EAAE;QACtC7B,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YAAEP,OAAOX,IAAIsB,OAAO;QAAC;QAC1C;IACF;IACA,IAAItB,eAAegC,sCAAmB,EAAE;QACtC9B,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YACnBP,OAAO;YACPQ,MAAMnB,IAAIiC,IAAI;YACdC,QAAQlC,IAAIkC,MAAM;QACpB;QACA;IACF;IACA,IAAIlC,eAAemC,oDAAyB,EAAE;QAC5CjC,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YACnBP,OAAOX,IAAIsB,OAAO;YAClBc,aAAapC,IAAIoC,WAAW;YAC5BjB,MAAMnB,IAAIiC,IAAI;QAChB;QACA;IACF;IACA,IAAIjC,eAAeqC,0CAAuB,EAAE;QAC1CnC,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YACnBP,OAAOX,IAAIsB,OAAO;YAClBH,MAAMnB,IAAIiC,IAAI;YACdrB,OAAOZ,IAAIY,KAAK;QAClB;QACA;IACF;IACA,IAAIZ,eAAesC,uCAAoB,EAAE;QACvCpC,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAClB,IAAIW,KAAK;QAC9B;IACF;IACA,IAAI,CAAC,CAACX,KAAK;QACTE,IAAIe,MAAM,CAAC,KAAKC,IAAI,CAAC;YACnBP,OAAO;YACPQ,MAAMnB,IAAIiC,IAAI;YACdrB,OAAOZ,IAAIY,KAAK;QAClB;QACA;IACF;IAGAT;AACF"}
+{"version":3,"sources":["../../src/middleware/exception.filter.ts"],"names":["ExceptionFilter","exceptionFilter","logger","loggerFactory","name","handle","err","_req","res","next","isTest","process","env","NODE_ENV","AppConstants","defaultTestEnv","error","message","stack","response","data","url","method","userAgent","headers","errorType","isAxiosError","code","status","send","type","_readableState","AuthenticationError","reasonCode","AuthorizationError","permissions","roles","reason","ForbiddenError","NotFoundException","EntityNotFoundError","BadRequestException","ValidationException","errors","FailedDependencyException","serviceCode","InternalServerException","ExternalServiceError","_err","_res","_next","Error"],"mappings":"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"}

package/dist/middleware/global.middleware.js

@@ -18,7 +18,7 @@ _export(exports, {
 });
 const _awilixexpress = require("awilix-express");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
-const validateWizardCompleted = (0, _awilixexpress.inject)((configService, settingsStore, loggerFactory)=>async (req, res, next)=>{
+const validateWizardCompleted = (0, _awilixexpress.inject)((configService, settingsStore, loggerFactory)=>async (req, _res, next)=>{
         const logger = loggerFactory(validateWizardCompleted.name);
         const isDemoMode = configService.isDemoMode();
         if (isDemoMode || !!settingsStore.getWizardSettings()?.wizardCompleted) {
@@ -26,32 +26,24 @@ const validateWizardCompleted = (0, _awilixexpress.inject)((configService, setti
             return;
         }
         const allowedPaths = [
-            "/api/first-time-setup/complete",
-            "/api/first-time-setup/validate",
-            "/api/first-time-setup/yaml-import",
-            "/api/test",
-            "/api/auth/login-required"
+            "/api/v2/first-time-setup/complete",
+            "/api/v2/first-time-setup/validate",
+            "/api/v2/first-time-setup/yaml-import",
+            "/api/v2/test",
+            "/api/v2/auth/login-required"
         ];
-        if (allowedPaths.includes(req.path) || !req.path.startsWith("/api")) {
+        if (allowedPaths.includes(req.path) || !req.path.startsWith("/api/v2") || req.path.startsWith("/api-docs")) {
             next();
-            return;
         } else {
             logger.error("Wizard not completed", req.path);
             throw new _runtimeexceptions.ForbiddenError(`First-time-setup not completed, these api paths are enabled: ${allowedPaths.join(", ")}`);
         }
     });
-const interceptRoles = (0, _awilixexpress.inject)((settingsStore, roleService, isTypeormMode)=>async (req, res, next)=>{
+const interceptRoles = (0, _awilixexpress.inject)((settingsStore, roleService)=>async (req, _res, next)=>{
         const serverSettings = settingsStore.getSettings();
-        if (isTypeormMode) {
-            req.roles = (req.user?.roles ?? []).map((r)=>r.roleId);
-        } else {
-            req.roles = req.user?.roles;
-        }
+        req.roles = req.user?.roles ?? [];
         if (serverSettings && !req.user) {
-            const roleName = await roleService.getAppDefaultRole();
-            req.roles = [
-                roleName
-            ];
+            req.roles = await roleService.getAppDefaultRoleNames();
         }
         next();
     });

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWizardCompleted","inject","configService","settingsStore","loggerFactory","req","res","next","logger","name","isDemoMode","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","roleService","isTypeormMode","serverSettings","getSettings","roles","user","map","r","roleId","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;QAuCaA;eAAAA;;QA7BAC;eAAAA;;;+BAVU;mCACQ;AASxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAACC,eAA+BC,eAA8BC,gBAC5D,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcJ,wBAAwBS,IAAI;QACzD,MAAMC,aAAaR,cAAcQ,UAAU;QAC3C,IAAIA,cAAc,CAAC,CAACP,cAAcQ,iBAAiB,IAAIC,iBAAiB;YACtEL;YACA;QACF;QAEA,MAAMM,eAAe;YACnB;YACA;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACT,IAAIU,IAAI,KAAK,CAACV,IAAIU,IAAI,CAACC,UAAU,CAAC,SAAS;YACnET;YACA;QACF,OAAO;YACLC,OAAOS,KAAK,CAAC,wBAAwBZ,IAAIU,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CACtB,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,OAAO;QAE7F;IACF;AAGG,MAAMpB,iBAAiBE,IAAAA,qBAAM,EAClC,CAACE,eAA8BiB,aAA2BC,gBACxD,OAAOhB,KAAcC,KAAeC;QAClC,MAAMe,iBAAiBnB,cAAcoB,WAAW;QAEhD,IAAIF,eAAe;YACjBhB,IAAImB,KAAK,GAAG,AAACnB,CAAAA,IAAIoB,IAAI,EAAED,SAAuB,EAAE,AAAD,EAAGE,GAAG,CAAC,CAACC,IAAgBA,EAAEC,MAAM;QACjF,OAAO;YACLvB,IAAImB,KAAK,GAAGnB,IAAIoB,IAAI,EAAED;QACxB;QAGA,IAAIF,kBAAkB,CAACjB,IAAIoB,IAAI,EAAE;YAC/B,MAAMI,WAAW,MAAMT,YAAYU,iBAAiB;YACpDzB,IAAImB,KAAK,GAAG;gBAACK;aAAS;QACxB;QAEAtB;IACF"}
+{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWizardCompleted","inject","configService","settingsStore","loggerFactory","req","_res","next","logger","name","isDemoMode","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","roleService","serverSettings","getSettings","roles","user","getAppDefaultRoleNames"],"mappings":";;;;;;;;;;;QAoCaA;eAAAA;;QA5BAC;eAAAA;;;+BARU;mCACQ;AAOxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAACC,eAA+BC,eAA8BC,gBAC5D,OAAOC,KAAcC,MAAgBC;QACnC,MAAMC,SAASJ,cAAcJ,wBAAwBS,IAAI;QACzD,MAAMC,aAAaR,cAAcQ,UAAU;QAC3C,IAAIA,cAAc,CAAC,CAACP,cAAcQ,iBAAiB,IAAIC,iBAAiB;YACtEL;YACA;QACF;QAEA,MAAMM,eAAe;YACnB;YACA;YACA;YACA;YACA;SACD;QACD,IAAIA,aAAaC,QAAQ,CAACT,IAAIU,IAAI,KAAK,CAACV,IAAIU,IAAI,CAACC,UAAU,CAAC,cAAcX,IAAIU,IAAI,CAACC,UAAU,CAAC,cAAc;YAC1GT;QACF,OAAO;YACLC,OAAOS,KAAK,CAAC,wBAAwBZ,IAAIU,IAAI;YAC7C,MAAM,IAAIG,iCAAc,CACtB,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,OAAO;QAE7F;IACF;AAGG,MAAMpB,iBAAiBE,IAAAA,qBAAM,EAClC,CAACE,eAA8BiB,cAC7B,OAAOf,KAAcC,MAAgBC;QACnC,MAAMc,iBAAiBlB,cAAcmB,WAAW;QAEhDjB,IAAIkB,KAAK,GAAGlB,IAAImB,IAAI,EAAED,SAAS,EAAE;QAGjC,IAAIF,kBAAkB,CAAChB,IAAImB,IAAI,EAAE;YAC/BnB,IAAIkB,KAAK,GAAG,MAAMH,YAAYK,sBAAsB;QACtD;QAEAlB;IACF"}

package/dist/middleware/param-converter.middleware.js

@@ -22,10 +22,8 @@ _export(exports, {
         return ParamString;
     }
 });
-const _containertokens = require("../container.tokens");
 const _validators = require("../handlers/validators");
 const _genericvalidation = require("../controllers/validation/generic.validation");
-const _lodash = require("lodash");
 const ParamInt = (paramName)=>createParamDecorator(paramName, Number);
 const ParamBool = (paramName)=>createParamDecorator(paramName, Boolean);
 const ParamString = (paramName)=>createParamDecorator(paramName, String);
@@ -37,10 +35,9 @@ function createParamDecorator(paramName, type) {
             return res.status(400).send(`Missing parameter: ${paramName}`);
         }
         let convertedValue;
-        const isTypeormMode = req.container?.resolve(_containertokens.DITokens.isTypeormMode);
         let validateIdAsType = null;
         if (type === "id") {
-            validateIdAsType = isTypeormMode ? Number : String;
+            validateIdAsType = Number;
         }
         if (type === Boolean) {
             if (paramValue.toLowerCase() === "true") {
@@ -51,23 +48,18 @@ function createParamDecorator(paramName, type) {
                 return res.status(400).send(`Invalid boolean: ${paramName}`);
             }
         } else if (type === Number || validateIdAsType === Number) {
-            convertedValue = parseInt(paramValue, 10);
-            if (isNaN(convertedValue)) {
+            convertedValue = Number.parseInt(paramValue, 10);
+            if (Number.isNaN(convertedValue)) {
                 return res.status(400).send(`Invalid number: ${paramName}`);
             }
-        } else if (type === String || validateIdAsType === String) {
-            convertedValue = paramValue;
-            if (!(0, _lodash.isString)(convertedValue)) {
-                return res.status(400).send(`Invalid string: ${paramName}`);
-            }
         } else {
             return res.status(400).send(`Unknown type of: ${paramName}`);
         }
-        if (validateIdAsType === String || validateIdAsType === Number) {
+        if (validateIdAsType === Number) {
             try {
                 await (0, _validators.validateInput)({
                     id: convertedValue
-                }, (0, _genericvalidation.idRulesV2)(isTypeormMode));
+                }, _genericvalidation.idRulesV2);
             } catch (e) {
                 return next(e);
             }

package/dist/middleware/param-converter.middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/param-converter.middleware.ts"],"names":["ParamBool","ParamId","ParamInt","ParamString","paramName","createParamDecorator","Number","Boolean","String","type","req","res","next","paramValue","params","undefined","status","send","convertedValue","isTypeormMode","container","resolve","DITokens","validateIdAsType","toLowerCase","parseInt","isNaN","isString","validateInput","id","idRulesV2","e","local"],"mappings":";;;;;;;;;;;QAOaA;eAAAA;;QAEAC;eAAAA;;QAHAC;eAAAA;;QAEAC;eAAAA;;;iCAPY;4BACK;mCACJ;wBACD;AAElB,MAAMD,WAAW,CAACE,YAAsBC,qBAAqBD,WAAWE;AACxE,MAAMN,YAAY,CAACI,YAAsBC,qBAAqBD,WAAWG;AACzE,MAAMJ,cAAc,CAACC,YAAsBC,qBAAqBD,WAAWI;AAC3E,MAAMP,UAAU,CAACG,YAAsBC,qBAAqBD,WAAW;AAE9E,SAASC,qBACPD,SAAiB,EACjBK,IAAuE;IAEvE,OAAO,OAAOC,KAAgDC,KAAeC;QAC3E,MAAMC,aAAaH,IAAII,MAAM,CAACV,UAAU;QAExC,IAAIS,eAAeE,WAAW;YAC5B,OAAOJ,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,mBAAmB,EAAEb,WAAW;QAC/D;QAEA,IAAIc;QAGJ,MAAMC,gBAAgBT,IAAIU,SAAS,EAAEC,QAAQC,yBAAQ,CAACH,aAAa;QACnE,IAAII,mBAAmB;QACvB,IAAId,SAAS,MAAM;YACjBc,mBAAmBJ,gBAAgBb,SAASE;QAC9C;QAEA,IAAIC,SAASF,SAAS;YACpB,IAAIM,WAAWW,WAAW,OAAO,QAAQ;gBACvCN,iBAAiB;YACnB,OAAO,IAAIL,WAAWW,WAAW,OAAO,SAAS;gBAC/CN,iBAAiB;YACnB,OAAO;gBACL,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;YAC7D;QACF,OAAO,IAAIK,SAASH,UAAUiB,qBAAqBjB,QAAQ;YACzDY,iBAAiBO,SAASZ,YAAY;YACtC,IAAIa,MAAMR,iBAAiB;gBACzB,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO,IAAIK,SAASD,UAAUe,qBAAqBf,QAAQ;YACzDU,iBAAiBL;YACjB,IAAI,CAACc,IAAAA,gBAAQ,EAACT,iBAAiB;gBAC7B,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO;YAEL,OAAOO,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;QAC7D;QAGA,IAAImB,qBAAqBf,UAAUe,qBAAqBjB,QAAQ;YAC9D,IAAI;gBACF,MAAMsB,IAAAA,yBAAa,EAAC;oBAAEC,IAAIX;gBAAe,GAAGY,IAAAA,4BAAS,EAACX;YACxD,EAAE,OAAOY,GAAG;gBACV,OAAOnB,KAAKmB;YACd;QACF;QAEArB,IAAIsB,KAAK,GAAGtB,IAAIsB,KAAK,IAAI,CAAC;QAC1BtB,IAAIsB,KAAK,CAAC5B,UAAU,GAAGc;QAEvBN;IACF;AACF"}
+{"version":3,"sources":["../../src/middleware/param-converter.middleware.ts"],"names":["ParamBool","ParamId","ParamInt","ParamString","paramName","createParamDecorator","Number","Boolean","String","type","req","res","next","paramValue","params","undefined","status","send","convertedValue","validateIdAsType","toLowerCase","parseInt","isNaN","validateInput","id","idRulesV2","e","local"],"mappings":";;;;;;;;;;;QAKaA;eAAAA;;QAEAC;eAAAA;;QAHAC;eAAAA;;QAEAC;eAAAA;;;4BALiB;mCACJ;AAEnB,MAAMD,WAAW,CAACE,YAAsBC,qBAAqBD,WAAWE;AACxE,MAAMN,YAAY,CAACI,YAAsBC,qBAAqBD,WAAWG;AACzE,MAAMJ,cAAc,CAACC,YAAsBC,qBAAqBD,WAAWI;AAC3E,MAAMP,UAAU,CAACG,YAAsBC,qBAAqBD,WAAW;AAE9E,SAASC,qBACPD,SAAiB,EACjBK,IAAuE;IAEvE,OAAO,OAAOC,KAAgDC,KAAeC;QAC3E,MAAMC,aAAaH,IAAII,MAAM,CAACV,UAAU;QAExC,IAAIS,eAAeE,WAAW;YAC5B,OAAOJ,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,mBAAmB,EAAEb,WAAW;QAC/D;QAEA,IAAIc;QAEJ,IAAIC,mBAAmB;QACvB,IAAIV,SAAS,MAAM;YACjBU,mBAAmBb;QACrB;QAEA,IAAIG,SAASF,SAAS;YACpB,IAAIM,WAAWO,WAAW,OAAO,QAAQ;gBACvCF,iBAAiB;YACnB,OAAO,IAAIL,WAAWO,WAAW,OAAO,SAAS;gBAC/CF,iBAAiB;YACnB,OAAO;gBACL,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;YAC7D;QACF,OAAO,IAAIK,SAASH,UAAUa,qBAAqBb,QAAQ;YACzDY,iBAAiBZ,OAAOe,QAAQ,CAACR,YAAY;YAC7C,IAAIP,OAAOgB,KAAK,CAACJ,iBAAiB;gBAChC,OAAOP,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,gBAAgB,EAAEb,WAAW;YAC5D;QACF,OAAO;YAEL,OAAOO,IAAIK,MAAM,CAAC,KAAKC,IAAI,CAAC,CAAC,iBAAiB,EAAEb,WAAW;QAC7D;QAGA,IAAIe,qBAAqBb,QAAQ;YAC/B,IAAI;gBACF,MAAMiB,IAAAA,yBAAa,EAAC;oBAAEC,IAAIN;gBAAe,GAAGO,4BAAS;YACvD,EAAE,OAAOC,GAAG;gBACV,OAAOd,KAAKc;YACd;QACF;QAEAhB,IAAIiB,KAAK,GAAGjB,IAAIiB,KAAK,IAAI,CAAC;QAC1BjB,IAAIiB,KAAK,CAACvB,UAAU,GAAGc;QAEvBN;IACF;AACF"}

package/dist/middleware/passport.js

@@ -39,8 +39,8 @@ function getPassportJwtOptions(settingsStore, configService, jwtFromRequest = _p
 function verifyUserCallback(userService) {
     return function(jwt_payload, done) {
         userService.getUser(jwt_payload.userId).then((user)=>{
-            if (user && user.isVerified && !user.needsPasswordChange) {
-                return done(null, user);
+            if (user?.isVerified && !user.needsPasswordChange) {
+                return done(null, userService.toDto(user));
             }
             if (user?.needsPasswordChange) {
                 return done(new _runtimeexceptions.AuthenticationError("Password change required", _authorizationconstants.AUTH_ERROR_REASON.PasswordChangeRequired), false);

package/dist/middleware/passport.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/passport.ts"],"names":["getPassportJwtOptions","initializePassportStrategies","verifyUserCallback","settingsStore","configService","jwtFromRequest","ExtractJwt","fromAuthHeaderAsBearerToken","secretOrKeyProvider","_req","_token","done","jwtSecret","getCredentialSettings","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","userService","jwt_payload","getUser","userId","then","user","isVerified","needsPasswordChange","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","AccountNotVerified","catch","err","passport","container","resolve","DITokens","opts","use","JwtStrategy","AnonymousStrategy"],"mappings":";;;;;;;;;;;QAuBgBA;eAAAA;;QA4CAC;eAAAA;;QA5BAC;eAAAA;;;6BAjCT;mCACuC;iCACrB;iCACI;mCAQO;wCACF;AAK3B,SAASF,sBACdG,aAA4B,EAC5BC,aAA4B,EAC5BC,iBAAiEC,uBAAU,CAACC,2BAA2B,EAAE;IAEzG,OAAO;QACLF,gBAAgBA;QAChBG,qBAAqB,OAAOC,MAAMC,QAAgBC;YAChD,MAAM,EAAEC,SAAS,EAAE,GAAG,MAAMT,cAAcU,qBAAqB;YAC/D,OAAOF,KAAK,MAAMC;QACpB;QACAE,UAAUV,cAAcW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;QACjGC,QAAQf,cAAcW,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;IAC7F;AACF;AAEO,SAASnB,mBAAmBoB,WAAyB;IAC1D,OAAO,SAAUC,WAAgB,EAAEZ,IAAsB;QACvDW,YACGE,OAAO,CAACD,YAAYE,MAAM,EAC1BC,IAAI,CAAC,CAACC;YACL,IAAIA,QAAQA,KAAKC,UAAU,IAAI,CAACD,KAAKE,mBAAmB,EAAE;gBACxD,OAAOlB,KAAK,MAAMgB;YACpB;YACA,IAAIA,MAAME,qBAAqB;gBAC7B,OAAOlB,KACL,IAAImB,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB,GAC5F;YAEJ;YACA,IAAI,CAACL,MAAMC,YAAY;gBACrB,OAAOjB,KAAK,IAAImB,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACE,kBAAkB,GAAG;YAClG;YAEA,OAAOtB,KAAK,MAAM;QACpB,GACCuB,KAAK,CAAC,CAACC;YACN,IAAIA,KAAK;gBACP,OAAOxB,KAAKwB,KAAK;YACnB;QACF;IACJ;AACF;AAEO,SAASlC,6BAA6BmC,QAAwB,EAAEC,SAA0B;IAC/F,MAAMlC,gBAAgBkC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACpC,aAAa;IAC7E,MAAMC,gBAAgBiC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACnC,aAAa;IAC7E,MAAMkB,cAAce,UAAUC,OAAO,CAAeC,yBAAQ,CAACjB,WAAW;IAExE,MAAMkB,OAAOxC,sBAAsBG,eAAeC,eAAeE,uBAAU,CAACC,2BAA2B;IAEvG6B,SAASK,GAAG,CACV,IAAIC,qBAAW,CAACF,MAAM,SAAUjB,WAAgB,EAAEZ,IAAsB;QACtET,mBAAmBoB,aAAaC,aAAaZ;IAC/C;IAEFyB,SAASK,GAAG,CAAC,IAAIE,2BAAiB;IAClC,OAAOP;AACT"}
+{"version":3,"sources":["../../src/middleware/passport.ts"],"names":["getPassportJwtOptions","initializePassportStrategies","verifyUserCallback","settingsStore","configService","jwtFromRequest","ExtractJwt","fromAuthHeaderAsBearerToken","secretOrKeyProvider","_req","_token","done","jwtSecret","getCredentialSettings","audience","get","AppConstants","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","issuer","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","userService","jwt_payload","getUser","userId","then","user","isVerified","needsPasswordChange","toDto","AuthenticationError","AUTH_ERROR_REASON","PasswordChangeRequired","AccountNotVerified","catch","err","passport","container","resolve","DITokens","opts","use","JwtStrategy","AnonymousStrategy"],"mappings":";;;;;;;;;;;QAsBgBA;eAAAA;;QA4CAC;eAAAA;;QA5BAC;eAAAA;;;6BAhCT;mCACuC;iCACrB;iCACI;mCAOO;wCACF;AAK3B,SAASF,sBACdG,aAA4B,EAC5BC,aAA4B,EAC5BC,iBAAiEC,uBAAU,CAACC,2BAA2B,EAAE;IAEzG,OAAO;QACLF,gBAAgBA;QAChBG,qBAAqB,OAAOC,MAAMC,QAAgBC;YAChD,MAAM,EAAEC,SAAS,EAAE,GAAG,MAAMT,cAAcU,qBAAqB;YAC/D,OAAOF,KAAK,MAAMC;QACpB;QACAE,UAAUV,cAAcW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,EAAED,6BAAY,CAACE,oBAAoB;QACjGC,QAAQf,cAAcW,GAAG,CAACC,6BAAY,CAACI,mBAAmB,EAAEJ,6BAAY,CAACK,kBAAkB;IAC7F;AACF;AAEO,SAASnB,mBAAmBoB,WAAyB;IAC1D,OAAO,SAAUC,WAAgB,EAAEZ,IAAsB;QACvDW,YACGE,OAAO,CAACD,YAAYE,MAAM,EAC1BC,IAAI,CAAC,CAACC;YACL,IAAIA,MAAMC,cAAc,CAACD,KAAKE,mBAAmB,EAAE;gBACjD,OAAOlB,KAAK,MAAMW,YAAYQ,KAAK,CAACH;YACtC;YACA,IAAIA,MAAME,qBAAqB;gBAC7B,OAAOlB,KACL,IAAIoB,sCAAmB,CAAC,4BAA4BC,yCAAiB,CAACC,sBAAsB,GAC5F;YAEJ;YACA,IAAI,CAACN,MAAMC,YAAY;gBACrB,OAAOjB,KAAK,IAAIoB,sCAAmB,CAAC,qBAAqBC,yCAAiB,CAACE,kBAAkB,GAAG;YAClG;YAEA,OAAOvB,KAAK,MAAM;QACpB,GACCwB,KAAK,CAAC,CAACC;YACN,IAAIA,KAAK;gBACP,OAAOzB,KAAKyB,KAAK;YACnB;QACF;IACJ;AACF;AAEO,SAASnC,6BAA6BoC,QAAwB,EAAEC,SAA0B;IAC/F,MAAMnC,gBAAgBmC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACrC,aAAa;IAC7E,MAAMC,gBAAgBkC,UAAUC,OAAO,CAAgBC,yBAAQ,CAACpC,aAAa;IAC7E,MAAMkB,cAAcgB,UAAUC,OAAO,CAAeC,yBAAQ,CAAClB,WAAW;IAExE,MAAMmB,OAAOzC,sBAAsBG,eAAeC,eAAeE,uBAAU,CAACC,2BAA2B;IAEvG8B,SAASK,GAAG,CACV,IAAIC,qBAAW,CAACF,MAAM,SAAUlB,WAAgB,EAAEZ,IAAsB;QACtET,mBAAmBoB,aAAaC,aAAaZ;IAC/C;IAEF0B,SAASK,GAAG,CAAC,IAAIE,2BAAiB;IAClC,OAAOP;AACT"}

package/dist/middleware/printer-resolver.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/printer-resolver.ts"],"names":["getScopedPrinter","req","errors","resolve","token","dep","container","push","InternalServerException","printerApi","printerApiToken","loginDto","printerLoginToken","printerDto","currentPrinterToken","printerId","printerIdToken","length","ValidationException"],"mappings":";;;;+BASgBA;;;eAAAA;;;yBARwE;mCAI3B;AAItD,SAASA,iBAAiBC,GAAY;IAC3C,MAAMC,SAAmB,EAAE;IAE3B,MAAMC,UAAU,CAAIC;QAClB,IAAI;YACF,MAAMC,MAAMJ,IAAIK,SAAS,CAACH,OAAO,CAAIC;YACrC,IAAI,CAACC,KAAKH,OAAOK,IAAI,CAAC,CAAC,mBAAmB,EAAEH,MAAM,mBAAmB,CAAC;YACtE,OAAOC;QACT,EAAE,OAAM;YACN,MAAM,IAAIG,0CAAuB,CAAC,CAAC,WAAW,EAAEJ,MAAM,wCAAwC,CAAC;QACjG;IACF;IAEA,MAAMK,aAAaN,QAAqBO,wBAAe;IACvD,MAAMC,WAAWR,QAAkBS,0BAAiB;IACpD,MAAMC,aAAaV,QAA4BW,4BAAmB;IAClE,MAAMC,YAAYZ,QAAgBa,uBAAc;IAEhD,IAAId,OAAOe,MAAM,EAAE,MAAM,IAAIC,sCAAmB,CAAChB;IAEjD,OAAO;QACL,CAACQ,wBAAe,CAAC,EAAED;QACnB,CAACG,0BAAiB,CAAC,EAAED;QACrB,CAACG,4BAAmB,CAAC,EAAED;QACvB,CAACG,uBAAc,CAAC,EAAED;IACpB;AACF"}
+{"version":3,"sources":["../../src/middleware/printer-resolver.ts"],"names":["getScopedPrinter","req","errors","resolve","token","dep","container","push","InternalServerException","printerApi","printerApiToken","loginDto","printerLoginToken","printerDto","currentPrinterToken","printerId","printerIdToken","length","ValidationException"],"mappings":";;;;+BAOgBA;;;eAAAA;;;yBANwE;mCAG3B;AAGtD,SAASA,iBAAiBC,GAAY;IAC3C,MAAMC,SAAmB,EAAE;IAE3B,MAAMC,UAAU,CAAIC;QAClB,IAAI;YACF,MAAMC,MAAMJ,IAAIK,SAAS,CAACH,OAAO,CAAIC;YACrC,IAAI,CAACC,KAAKH,OAAOK,IAAI,CAAC,CAAC,mBAAmB,EAAEH,MAAM,mBAAmB,CAAC;YACtE,OAAOC;QACT,EAAE,OAAM;YACN,MAAM,IAAIG,0CAAuB,CAAC,CAAC,WAAW,EAAEJ,MAAM,wCAAwC,CAAC;QACjG;IACF;IAEA,MAAMK,aAAaN,QAAqBO,wBAAe;IACvD,MAAMC,WAAWR,QAAkBS,0BAAiB;IACpD,MAAMC,aAAaV,QAAoBW,4BAAmB;IAC1D,MAAMC,YAAYZ,QAAgBa,uBAAc;IAEhD,IAAId,OAAOe,MAAM,EAAE,MAAM,IAAIC,sCAAmB,CAAChB;IAEjD,OAAO;QACL,CAACQ,wBAAe,CAAC,EAAED;QACnB,CAACG,0BAAiB,CAAC,EAAED;QACrB,CAACG,4BAAmB,CAAC,EAAED;QACvB,CAACG,uBAAc,CAAC,EAAED;IACpB;AACF"}

package/dist/middleware/printer.js

@@ -41,8 +41,9 @@ const printerResolveMiddleware = (key = "id")=>{
         const bambuEnabled = settingsService.getServerSettings().experimentalBambuSupport;
         let scopedPrinter = undefined;
         let loginDto = undefined;
-        const printerId = req.params[key];
-        if (printerId) {
+        const printerIdParam = req.params[key];
+        if (printerIdParam) {
+            const printerId = Number.parseInt(printerIdParam, 10);
             scopedPrinter = printerCache.getCachedPrinterOrThrow(printerId);
             loginDto = printerCache.getLoginDto(printerId);
             req.container.register({

package/dist/middleware/printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","bambuEnabled","experimentalBambuSupport","scopedPrinter","undefined","loginDto","printerId","params","getCachedPrinterOrThrow","getLoginDto","register","asValue","printerType","OctoprintType","octoprintApiInstance","octoprintApi","MoonrakerType","moonrakerInstance","moonrakerApi","PrusaLinkType","prusaLinkInstance","prusaLinkApi","BambuType","bambuInstance","bambuApi","setPrinterId"],"mappings":";;;;;;;;;;;QAaaA;eAAAA;;QADAC;eAAAA;;QADAC;eAAAA;;QAGAC;eAAAA;;QAEAC;eAAAA;;;wBAhBW;iCACC;qCAI8C;AAMhE,MAAMF,iBAAiB;AACvB,MAAMD,kBAAkB;AACxB,MAAMD,sBAAsB;AAC5B,MAAMG,oBAAoB;AAE1B,MAAMC,2BAA2B,CAACC,MAAM,IAAI;IACjD,OAAO,CAACC,KAAcC,KAAeC;QACnC,MAAMC,eAAeH,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACH,YAAY;QAC9E,MAAMI,kBAAkBP,IAAII,SAAS,CAACC,OAAO,CAAMC,yBAAQ,CAACE,aAAa;QACzE,MAAMC,mBAAmBF,gBAAgBG,iBAAiB,GAAGC,4BAA4B;QACzF,MAAMC,mBAAmBL,gBAAgBG,iBAAiB,GAAGG,4BAA4B;QACzF,MAAMC,eAAeP,gBAAgBG,iBAAiB,GAAGK,wBAAwB;QAEjF,IAAIC,gBAAgBC;QACpB,IAAIC,WAAWD;QAEf,MAAME,YAAYnB,IAAIoB,MAAM,CAACrB,IAAI;QACjC,IAAIoB,WAAW;YACbH,gBAAgBb,aAAakB,uBAAuB,CAACF;YACrDD,WAAWf,aAAamB,WAAW,CAACH;YAEpCnB,IAAII,SAAS,CAACmB,QAAQ,CAAC;gBACrB,CAAC7B,oBAAoB,EAAE8B,IAAAA,eAAO,EAACR;gBAC/B,CAACnB,kBAAkB,EAAE2B,IAAAA,eAAO,EAACN;gBAC7B,CAACtB,eAAe,EAAE4B,IAAAA,eAAO,EAACL;YAC5B;YAEA,OAAQH,cAAcS,WAAW;gBAC/B,KAAKC,kCAAa;oBAAE;wBAClB,MAAMC,uBAAuB3B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACsB,YAAY;wBACtF5B,IAAII,SAAS,CAACmB,QAAQ,CAAC;4BACrB,CAAC5B,gBAAgB,EAAE6B,IAAAA,eAAO,EAACG;wBAC7B;wBACA;oBACF;gBACA,KAAKE,kCAAa;oBAAE;wBAClB,MAAMC,oBAAoB9B,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAACyB,YAAY;wBACnF/B,IAAII,SAAS,CAACmB,QAAQ,CAAC;4BACrB,CAAC5B,gBAAgB,EAAEc,mBAAmBe,IAAAA,eAAO,EAACM,qBAAqBN,IAAAA,eAAO,EAACP;wBAC7E;wBACA;oBACF;gBACA,KAAKe,kCAAa;oBAAE;wBAClB,MAAMC,oBAAoBjC,IAAII,SAAS,CAACC,OAAO,CAAeC,yBAAQ,CAAC4B,YAAY;wBACnFlC,IAAII,SAAS,CAACmB,QAAQ,CAAC;4BACrB,CAAC5B,gBAAgB,EAAEiB,mBAAmBY,IAAAA,eAAO,EAACS,qBAAqBT,IAAAA,eAAO,EAACP;wBAC7E;wBACA;oBACF;gBACA,KAAKkB,8BAAS;oBAAE;wBACd,MAAMC,gBAAgBpC,IAAII,SAAS,CAACC,OAAO,CAAWC,yBAAQ,CAAC+B,QAAQ;wBAEvED,cAAcE,YAAY,CAACnB;wBAC3BnB,IAAII,SAAS,CAACmB,QAAQ,CAAC;4BACrB,CAAC5B,gBAAgB,EAAEmB,eAAeU,IAAAA,eAAO,EAACY,iBAAiBZ,IAAAA,eAAO,EAACP;wBACrE;wBACA;oBACF;YACF;QACF,OAAO;YACLjB,IAAII,SAAS,CAACmB,QAAQ,CAAC;gBACrB,CAAC7B,oBAAoB,EAAE8B,IAAAA,eAAO,EAACP;gBAC/B,CAACpB,kBAAkB,EAAE2B,IAAAA,eAAO,EAACP;gBAC7B,CAACrB,eAAe,EAAE4B,IAAAA,eAAO,EAACP;gBAC1B,CAACtB,gBAAgB,EAAE6B,IAAAA,eAAO,EAACP;YAC7B;QACF;QAEAf;IACF;AACF"}
+{"version":3,"sources":["../../src/middleware/printer.ts"],"names":["currentPrinterToken","printerApiToken","printerIdToken","printerLoginToken","printerResolveMiddleware","key","req","res","next","printerCache","container","resolve","DITokens","settingsService","settingsStore","moonrakerEnabled","getServerSettings","experimentalMoonrakerSupport","prusaLinkEnabled","experimentalPrusaLinkSupport","bambuEnabled","experimentalBambuSupport","scopedPrinter","undefined","loginDto","printerIdParam","params","printerId","Number","parseInt","getCachedPrinterOrThrow","getLoginDto","register","asValue","printerType","OctoprintType","octoprintApiInstance","octoprintApi","MoonrakerType","moonrakerInstance","moonrakerApi","PrusaLinkType","prusaLinkInstance","prusaLinkApi","BambuType","bambuInstance","bambuApi","setPrinterId"],"mappings":"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"}

package/dist/middleware/socketio.middleware.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/socketio.middleware.ts"],"names":["authorize","settingsStore","options","logger","verify","strategy","PassportJwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","_user","fail","info","warn","reason","Error","error","authenticate"],"mappings":";;;;+BAQaA;;;eAAAA;;;6BAPkF;AAOxF,MAAMA,YAAY,CACvBC,eACAC,SACAC,QACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAmB,CAACJ,SAASE;IAElD,OAAO,eAAeG,kBACpBC,MAAkD,EAClDC,IAAmC;QAEnC,IAAI,CAAE,MAAMR,cAAcS,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,KAAY;YAG9CH;QACF;QACAJ,SAASQ,IAAI,GAAG,CAACC;YACfX,OAAOY,IAAI,CAAC,CAAC,+CAA+C,EAAED,KAAK,CAAC,CAAC,EAAE;gBAAEE,QAAQF;YAAK;YACtFL,KAAK,IAAIQ,MAAMH;QACjB;QACAT,SAASa,KAAK,GAAG,CAACA;YAChBf,OAAOY,IAAI,CAAC;YACZN,KAAKS;QACP;QAEAb,SAASc,YAAY,CAACX,QAAe,CAAC;IACxC;AACF"}
+{"version":3,"sources":["../../src/middleware/socketio.middleware.ts"],"names":["authorize","settingsStore","options","logger","verify","strategy","PassportJwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","_user","fail","info","warn","reason","Error","error","authenticate"],"mappings":";;;;+BAQaA;;;eAAAA;;;6BAPkF;AAOxF,MAAMA,YAAY,CACvBC,eACAC,SACAC,QACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAmB,CAACJ,SAASE;IAElD,OAAO,eAAeG,kBACpBC,MAAkD,EAClDC,IAAmC;QAEnC,IAAI,CAAE,MAAMR,cAAcS,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,KAAW;YAG7CH;QACF;QACAJ,SAASQ,IAAI,GAAG,CAACC;YACfX,OAAOY,IAAI,CAAC,CAAC,+CAA+C,EAAED,KAAK,CAAC,CAAC,EAAE;gBAAEE,QAAQF;YAAK;YACtFL,KAAK,IAAIQ,MAAMH;QACjB;QACAT,SAASa,KAAK,GAAG,CAACA;YAChBf,OAAOY,IAAI,CAAC;YACZN,KAAKS;QACP;QAEAb,SAASc,YAAY,CAACX,QAAe,CAAC;IACxC;AACF"}

package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "AddPrinterUsernamePassword1745141688926", {
     }
 });
 class AddPrinterUsernamePassword1745141688926 {
-    name = 'AddPrinterUsernamePassword1745141688926';
+    name = "AddPrinterUsernamePassword1745141688926";
     async up(queryRunner) {
         await queryRunner.query(`
       CREATE TABLE "temporary_printer" (

package/dist/migrations/1745141688926-AddPrinterUsernamePassword.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/migrations/1745141688926-AddPrinterUsernamePassword.ts"],"names":["AddPrinterUsernamePassword1745141688926","name","up","queryRunner","query","down"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAO,0CAAyC;IAEhD,MAAaC,GAAGC,WAAwB,EAAiB;QACvD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;IAgBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;IAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;IAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;IAgBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAErB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGrB,CAAC;IACP;IAEA,MAAaC,KAAKF,WAAwB,EAAiB;QACzD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;IAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;IAgBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;IAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGrB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;QAcrB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;QA0BrB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAErB,CAAC;IACP;AAEF"}
+{"version":3,"sources":["../../src/migrations/1745141688926-AddPrinterUsernamePassword.ts"],"names":["AddPrinterUsernamePassword1745141688926","name","up","queryRunner","query","down"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAO,0CAA0C;IAEjD,MAAaC,GAAGC,WAAwB,EAAiB;QACvD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;IAgBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;IAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;IAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;IAgBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAErB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGrB,CAAC;IACP;IAEA,MAAaC,KAAKF,WAAwB,EAAiB;QACzD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;IAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;IAgBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;IAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGrB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;QAcrB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;QA0BrB,CAAC;QACL,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAErB,CAAC;IACP;AACF"}

package/dist/migrations/1766576698569-DropPermissions.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "DropPermissions1766576698569", {
+    enumerable: true,
+    get: function() {
+        return DropPermissions1766576698569;
+    }
+});
+class DropPermissions1766576698569 {
+    async up(queryRunner) {
+        await queryRunner.query(`
+      DROP TABLE permission
+    `);
+    }
+    async down(queryRunner) {
+        await queryRunner.query(`
+      CREATE TABLE "permission"
+      (
+        "id"   integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+        "name" varchar NOT NULL
+      )
+    `);
+    }
+}
+
+//# sourceMappingURL=1766576698569-DropPermissions.js.map

package/dist/migrations/1766576698569-DropPermissions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/migrations/1766576698569-DropPermissions.ts"],"names":["DropPermissions1766576698569","up","queryRunner","query","down"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACX,MAAaC,GAAGC,WAAwB,EAAiB;QACvD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;IAEzB,CAAC;IACH;IAEA,MAAaC,KAAKF,WAAwB,EAAiB;QACzD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;;;;IAMzB,CAAC;IACH;AACF"}