@fdm-monster/server 1.7.3 → 1.7.5

package/.yarnrc.yml

@@ -1,4 +1,4 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.2.cjs
 httpTimeout: 1000000

package/RELEASE_NOTES.MD

@@ -1,12 +1,33 @@
 # Develop
 
+# FDM Monster 23/11/2024 1.7.5
+
+## Fixes
+
+- Demo mode should never show first-time-setup. It would always return "first time setup completed: false". Now this will return true.
+- Incorrect UI state "No USB" shown, when OctoPrint USB is disconnected.
+
+## Features
+
+- Remove whitelist settings from database, API, validation and remove IP package (CVE)
+
+# FDM Monster 13/11/2024 1.7.4
+
+## Features:
+
+- User API: new endpoint which registers user directly with roles and without verification step
+
+## Fixes: 
+
+- PrinterEventsCache: when printers and test printers are deleted, the printer events cache should not be allowed to be filled by late update events
+
 # FDM Monster 11/11/2024 1.7.3
 
 ## Fixes:
 
 - BaseService: catch null or undefined id before querying database
 - Add set user roles API to avoid users staying in limbo with GUEST role after verification.
-- User API apply consistent string number coercion in user API to avoid unexpected ID comparison
+- User API: apply consistent string number coercion in user API to avoid unexpected ID comparison
 
 # FDM Monster 11/11/2024 1.7.2
 

package/dist/constants/server-settings.constants.js

@@ -33,9 +33,6 @@ _export(exports, {
     getDefaultTimeout: function() {
         return getDefaultTimeout;
     },
-    getDefaultWhitelistIpAddresses: function() {
-        return getDefaultWhitelistIpAddresses;
-    },
     getDefaultWizardSettings: function() {
         return getDefaultWizardSettings;
     },
@@ -54,10 +51,6 @@ _export(exports, {
 });
 const _serverconstants = require("../server.constants");
 const _uuid = require("uuid");
-const getDefaultWhitelistIpAddresses = ()=>[
-        "::12",
-        "127.0.0.1"
-    ];
 const wizardSettingKey = "wizard";
 const getDefaultWizardSettings = ()=>({
         wizardCompleted: false,
@@ -77,8 +70,6 @@ const getDefaultServerSettings = ()=>({
         sentryDiagnosticsEnabled: false,
         loginRequired: true,
         registration: false,
-        whitelistEnabled: false,
-        whitelistedIpAddresses: getDefaultWhitelistIpAddresses(),
         experimentalMoonrakerSupport: false,
         experimentalTypeormSupport: false,
         experimentalClientSupport: false

package/dist/constants/server-settings.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWhitelistIpAddresses","getDefaultWizardSettings","printerFileCleanSettingKey","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","sentryDiagnosticsEnabled","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","jwtSecret","uuidv4","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","gridCols","gridRows","largeTiles","apiTimeout","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays"],"mappings":";;;;;;;;;;;IAwCaA,qBAAqB;eAArBA;;IAYAC,kBAAkB;eAAlBA;;IAXAC,4BAA4B;eAA5BA;;IAwBAC,2BAA2B;eAA3BA;;IAZAC,0BAA0B;eAA1BA;;IAhCAC,wBAAwB;eAAxBA;;IAkDAC,kBAAkB;eAAlBA;;IAXAC,iBAAiB;eAAjBA;;IAjDAC,8BAA8B;eAA9BA;;IAGAC,wBAAwB;eAAxBA;;IAkDAC,0BAA0B;eAA1BA;;IA5CAC,iBAAiB;eAAjBA;;IAuCAC,iBAAiB;eAAjBA;;IA9CAC,gBAAgB;eAAhBA;;;iCAbgB;sBACA;AAUtB,MAAML,iCAAiC,IAAM;QAAC;QAAQ;KAAY;AAElE,MAAMK,mBAAmB;AACzB,MAAMJ,2BAA2B,IAA0B,CAAA;QAChEK,iBAAiB;QACjBC,mBAAmB;QACnBC,eAAe;IACjB,CAAA;AAEO,MAAML,oBAAoB;AAC1B,MAAMN,2BAA2B,IAA0B,CAAA;QAChEY,eAAe;YACbC,qBAAqB;YACrBC,sBAAsB;YACtBC,oBAAoB;YACpBC,kBAAkB;YAClBC,qBAAqB;YACrBC,wBAAwB;QAC1B;QACAC,0BAA0B;QAC1BC,eAAe;QACfC,cAAc;QACdC,kBAAkB;QAClBC,wBAAwBpB;QACxBqB,8BAA8B;QAC9BC,4BAA4B;QAC5BC,2BAA2B;IAC7B,CAAA;AAEO,MAAM/B,wBAAwB;AAC9B,MAAME,+BAA+B,IAA8B,CAAA;QAExE8B,WAAWC,IAAAA,QAAM;QAEjBC,cAAcC,6BAAY,CAACC,sBAAsB;QAEjDC,sBAAsBF,6BAAY,CAACG,8BAA8B;QAEjEC,oBAAoBJ,6BAAY,CAACK,4BAA4B;IAC/D,CAAA;AAEO,MAAMvC,qBAAqB;AAC3B,MAAMG,6BAA6B,IAA4B,CAAA;QACpEqC,UAAU;QACVC,UAAU;QACVC,YAAY;IACd,CAAA;AAEO,MAAM/B,oBAAoB;AAC1B,MAAML,oBAAoB,IAA2B,CAAA;QAC1DqC,YAAY;IACd,CAAA;AAEO,MAAMlC,6BAA6B;AACnC,MAAMP,8BAA8B,IAA6B,CAAA;QACtE0C,gCAAgC;QAChCC,0BAA0B;QAC1BC,iCAAiC;IACnC,CAAA;AAEO,MAAMzC,qBAAqB,IAAO,CAAA;QACvC,CAACK,kBAAkB,EAAEN;QACrB,CAACQ,iBAAiB,EAAEJ;QACpB,CAACT,sBAAsB,EAAEE;QACzB,CAACQ,2BAA2B,EAAEP;QAC9B,CAACF,mBAAmB,EAAEG;QACtB,CAACQ,kBAAkB,EAAEL;IACvB,CAAA"}
+{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWizardSettings","printerFileCleanSettingKey","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","sentryDiagnosticsEnabled","loginRequired","registration","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","jwtSecret","uuidv4","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","gridCols","gridRows","largeTiles","apiTimeout","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays"],"mappings":";;;;;;;;;;;IAoCaA,qBAAqB;eAArBA;;IAYAC,kBAAkB;eAAlBA;;IAXAC,4BAA4B;eAA5BA;;IAwBAC,2BAA2B;eAA3BA;;IAZAC,0BAA0B;eAA1BA;;IA9BAC,wBAAwB;eAAxBA;;IAgDAC,kBAAkB;eAAlBA;;IAXAC,iBAAiB;eAAjBA;;IA5CAC,wBAAwB;eAAxBA;;IAgDAC,0BAA0B;eAA1BA;;IA1CAC,iBAAiB;eAAjBA;;IAqCAC,iBAAiB;eAAjBA;;IA5CAC,gBAAgB;eAAhBA;;;iCAXgB;sBACA;AAUtB,MAAMA,mBAAmB;AACzB,MAAMJ,2BAA2B,IAA0B,CAAA;QAChEK,iBAAiB;QACjBC,mBAAmB;QACnBC,eAAe;IACjB,CAAA;AAEO,MAAML,oBAAoB;AAC1B,MAAML,2BAA2B,IAA0B,CAAA;QAChEW,eAAe;YACbC,qBAAqB;YACrBC,sBAAsB;YACtBC,oBAAoB;YACpBC,kBAAkB;YAClBC,qBAAqB;YACrBC,wBAAwB;QAC1B;QACAC,0BAA0B;QAC1BC,eAAe;QACfC,cAAc;QACdC,8BAA8B;QAC9BC,4BAA4B;QAC5BC,2BAA2B;IAC7B,CAAA;AAEO,MAAM5B,wBAAwB;AAC9B,MAAME,+BAA+B,IAA8B,CAAA;QAExE2B,WAAWC,IAAAA,QAAM;QAEjBC,cAAcC,6BAAY,CAACC,sBAAsB;QAEjDC,sBAAsBF,6BAAY,CAACG,8BAA8B;QAEjEC,oBAAoBJ,6BAAY,CAACK,4BAA4B;IAC/D,CAAA;AAEO,MAAMpC,qBAAqB;AAC3B,MAAMG,6BAA6B,IAA4B,CAAA;QACpEkC,UAAU;QACVC,UAAU;QACVC,YAAY;IACd,CAAA;AAEO,MAAM7B,oBAAoB;AAC1B,MAAMJ,oBAAoB,IAA2B,CAAA;QAC1DkC,YAAY;IACd,CAAA;AAEO,MAAMhC,6BAA6B;AACnC,MAAMN,8BAA8B,IAA6B,CAAA;QACtEuC,gCAAgC;QAChCC,0BAA0B;QAC1BC,iCAAiC;IACnC,CAAA;AAEO,MAAMtC,qBAAqB,IAAO,CAAA;QACvC,CAACI,kBAAkB,EAAEL;QACrB,CAACO,iBAAiB,EAAEJ;QACpB,CAACR,sBAAsB,EAAEE;QACzB,CAACO,2BAA2B,EAAEN;QAC9B,CAACF,mBAAmB,EAAEG;QACtB,CAACO,kBAAkB,EAAEJ;IACvB,CAAA"}

package/dist/controllers/auth.controller.js

@@ -51,7 +51,7 @@ class AuthController {
         const isDemoMode = this.configService.isDemoMode();
         wizardState = {
             ...wizardState,
-            wizardCompleted: isDemoMode ? false : wizardState.wizardCompleted
+            wizardCompleted: isDemoMode ? true : wizardState.wizardCompleted
         };
         res.send({
             loginRequired,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","authService","settingsStore","userService","roleService","logger","configService","constructor","loggerFactory","name","login","req","res","debug","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","wizardCompleted","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenRules","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserRules","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","createController","prefix","AppConstants","apiRoute","post","demoUserNotAllowedInterceptor","get","before","authenticate"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","authService","settingsStore","userService","roleService","logger","configService","constructor","loggerFactory","name","login","req","res","debug","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","wizardCompleted","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenRules","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserRules","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","createController","prefix","AppConstants","apiRoute","post","demoUserNotAllowedInterceptor","get","before","authenticate"],"mappings":"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"}

package/dist/controllers/settings.controller.js

@@ -22,7 +22,6 @@ const _serverconstants = require("../server.constants");
 const _authorizationconstants = require("../constants/authorization.constants");
 const _validators = require("../handlers/validators");
 const _settingsservicevalidation = require("../services/validators/settings-service.validation");
-const _ip = require("ip");
 const _demomiddleware = require("../middleware/demo.middleware");
 const _printerapiinterface = require("../services/printer-api.interface");
 class SettingsController {
@@ -43,10 +42,8 @@ class SettingsController {
     getSettings(req, res) {
         let connection;
         try {
-            const serverIp = (0, _ip.address)();
             connection = {
                 clientIp: req.socket?.remoteAddress,
-                ip: serverIp,
                 version: this.serverVersion
             };
         } catch (e) {
@@ -84,22 +81,13 @@ class SettingsController {
         const result = await this.settingsStore.setExperimentalClientSupport(enabled);
         res.send(result);
     }
-    async updateWhitelistSettings(req, res) {
-        const { whitelistEnabled, whitelistedIpAddresses } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.whitelistSettingUpdateRules);
-        if (!whitelistedIpAddresses.includes("127.0.0.1")) {
-            whitelistedIpAddresses.push("127.0.0.1");
-        }
-        await this.settingsStore.setWhitelist(whitelistEnabled, whitelistedIpAddresses);
-        res.send();
-    }
     async updateFrontendSettings(req, res) {
         const validatedInput = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.frontendSettingsUpdateRules);
         const result = await this.settingsStore.updateFrontendSettings(validatedInput);
         res.send(result);
     }
     async updateServerSettings(req, res) {
-        const isWhitelistFeatureEnabled = this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
-        const validatedInput = await (0, _validators.validateInput)(req.body, (0, _settingsservicevalidation.serverSettingsUpdateRules)(isWhitelistFeatureEnabled));
+        const validatedInput = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.serverSettingsUpdateRules);
         const result = await this.settingsStore.updateServerSettings(validatedInput);
         res.send(result);
     }
@@ -191,13 +179,6 @@ const _default = (0, _awilixexpress.createController)(SettingsController).prefix
         ]),
         _demomiddleware.demoUserNotAllowed
     ]
-}).put("/whitelist", "updateWhitelistSettings", {
-    before: [
-        (0, _authenticate.authorizeRoles)([
-            _authorizationconstants.ROLES.ADMIN
-        ]),
-        _demomiddleware.demoUserNotAllowed
-    ]
 }).put("/frontend", "updateFrontendSettings", {
     before: [
         (0, _authenticate.authorizeRoles)([

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","printerCache","printerService","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportRules","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updateClientSupport","clientNextRules","setExperimentalClientSupport","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","isWhitelistFeatureEnabled","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","printerCache","printerService","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportRules","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updateClientSupport","clientNextRules","setExperimentalClientSupport","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","AppConstants","apiRoute","before","authenticate","get","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":"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"}

package/dist/controllers/user.controller.js

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","isSqlite","id"],"mappings":";;;;;;;;;;;IAAaA,QAAQ;eAARA;;IAEAC,SAAS;eAATA;;;AAFN,MAAMD,WAAW,CAACE,WAAsB,CAAC,SAAS,EAAEA,WAAW,kBAAkB,oBAAoB;AAErG,MAAMD,YAAY,CAACC,WAAuB,CAAA;QAC/CC,IAAIH,SAASE;IACf,CAAA"}
+{"version":3,"sources":["../../../src/controllers/validation/generic.validation.ts"],"names":["idRuleV2","idRulesV2","isSqlite","id"],"mappings":";;;;;;;;;;;IAAaA,QAAQ;eAARA;;IAEAC,SAAS;eAATA;;;AAFN,MAAMD,WAAW,CAACE,WAAsB,CAAC,SAAS,EAAEA,WAAW,kBAAkB,WAAW;AAE5F,MAAMD,YAAY,CAACC,WAAuB,CAAA;QAC/CC,IAAIH,SAASE;IACf,CAAA"}

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

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

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

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

package/dist/entities/settings.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,MAmBA,OAQA,OAOA,OAOA,OAOA;AAhDA,OAACC,0CAAiB;AAmBlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAOnB,QAACC,0CAAiB;AArDb,MAAMN,iBAAiBO,sBAAU;IAEtCC,GAAY;IAGZ,CAAA,KAAmB,CAgBjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAIlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;;;;;;QApDYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAkBUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC"}
+{"version":3,"sources":["../../src/entities/settings.entity.ts"],"names":["Settings","serverSettingsKey","credentialSettingsKey","wizardSettingKey","printerFileCleanSettingKey","frontendSettingKey","timeoutSettingKey","BaseEntity","id","type","nullable"],"mappings":";;;;+BAYaA;;;eAAAA;;;yCALN;yBACgD;4BAC5B;;;;;;;;;;IAQzB,MAiBA,OAQA,OAOA,OAOA,OAOA;AA9CA,OAACC,0CAAiB;AAiBlB,QAACC,8CAAqB;AAQtB,QAACC,yCAAgB;AAOjB,QAACC,mDAA0B;AAO3B,QAACC,2CAAkB;AAOnB,QAACC,0CAAiB;AAnDb,MAAMN,iBAAiBO,sBAAU;IAEtCC,GAAY;IAGZ,CAAA,KAAmB,CAcjB;IAGF,CAAA,MAAuB,CAKrB;IAGF,CAAA,MAAkB,CAIhB;IAGF,CAAA,MAA4B,CAI1B;IAGF,CAAA,MAAoB,CAIlB;IAGF,CAAA,MAAmB,CAEjB;AACJ;;;;;;;QAlDYC,MAAM;QAAeC,UAAU;;;uBACzC;;;QAgBUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAOUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC;;;QAMUD,MAAM;QAAeC,UAAU;;;uBACzC"}

package/dist/middleware/global.middleware.js

@@ -12,18 +12,14 @@ _export(exports, {
     interceptRoles: function() {
         return interceptRoles;
     },
-    validateWhitelistedIp: function() {
-        return validateWhitelistedIp;
-    },
     validateWizardCompleted: function() {
         return validateWizardCompleted;
     }
 });
 const _awilixexpress = require("awilix-express");
-const _serversettingsconstants = require("../constants/server-settings.constants");
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const validateWizardCompleted = (0, _awilixexpress.inject)(({ configService, settingsStore, loggerFactory })=>async (req, res, next)=>{
-        const logger = loggerFactory(validateWhitelistedIp.name);
+        const logger = loggerFactory(validateWizardCompleted.name);
         const isDemoMode = configService.isDemoMode();
         if (isDemoMode || !!settingsStore.getWizardSettings()?.wizardCompleted) {
             next();
@@ -43,26 +39,6 @@ const validateWizardCompleted = (0, _awilixexpress.inject)(({ configService, set
             throw new _runtimeexceptions.ForbiddenError(`First-time-setup not completed, these api paths are enabled: ${allowedPaths.join(", ")}`);
         }
     });
-const validateWhitelistedIp = (0, _awilixexpress.inject)(({ settingsStore, loggerFactory })=>async (req, res, next)=>{
-        const logger = loggerFactory(validateWhitelistedIp.name);
-        const serverSettings = settingsStore.getSettings();
-        if (!serverSettings && !settingsStore.getServerSettings() || !settingsStore.getServerSettings()?.whitelistEnabled) {
-            next();
-            return;
-        }
-        const whitelist = serverSettings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses;
-        const ipAddress = req.socket.remoteAddress;
-        if (whitelist?.length && !whitelist.includes(ipAddress) && ipAddress !== "::ffff:127.0.0.1") {
-            const subnextMatched = whitelist.find((w)=>{
-                return ipAddress.startsWith(w);
-            });
-            if (!subnextMatched) {
-                logger.error("IP did not match whitelist filters", req.socket.remoteAddress);
-                throw new _runtimeexceptions.ForbiddenError("Bad IP: " + req.socket.remoteAddress);
-            }
-        }
-        next();
-    });
 const interceptRoles = (0, _awilixexpress.inject)(({ settingsStore, roleService, isTypeormMode })=>async (req, res, next)=>{
         const serverSettings = await settingsStore.getSettings();
         if (isTypeormMode) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/middleware/global.middleware.ts"],"names":["interceptRoles","validateWhitelistedIp","validateWizardCompleted","inject","configService","settingsStore","loggerFactory","req","res","next","logger","name","isDemoMode","getWizardSettings","wizardCompleted","allowedPaths","includes","path","startsWith","error","ForbiddenError","join","serverSettings","getSettings","getServerSettings","whitelistEnabled","whitelist","serverSettingsKey","whitelistedIpAddresses","ipAddress","socket","remoteAddress","length","subnextMatched","find","w","roleService","isTypeormMode","roles","user","map","r","roleId","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IAwEaA,cAAc;eAAdA;;IA9BAC,qBAAqB;eAArBA;;IAlCAC,uBAAuB;eAAvBA;;;+BARU;yCACW;mCACH;AAMxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAAC,EACGC,aAAa,EACbC,aAAa,EACbC,aAAa,EAKd,GACD,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcL,sBAAsBU,IAAI;QACvD,MAAMC,aAAaR,cAAcQ,UAAU;QAC3C,IAAIA,cAAc,CAAC,CAACP,cAAcQ,iBAAiB,IAAIC,iBAAiB;YACtEL;YACA;QACF;QAEA,MAAMM,eAAe;YACnB;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,CAAC,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,OAAO;QACpH;IACF;AAGG,MAAMpB,wBAAwBE,IAAAA,qBAAM,EACzC,CAAC,EAAEE,aAAa,EAAEC,aAAa,EAAmE,GAChG,OAAOC,KAAcC,KAAeC;QAClC,MAAMC,SAASJ,cAAcL,sBAAsBU,IAAI;QACvD,MAAMW,iBAAiBjB,cAAckB,WAAW;QAChD,IAAI,AAAC,CAACD,kBAAkB,CAACjB,cAAcmB,iBAAiB,MAAO,CAACnB,cAAcmB,iBAAiB,IAAIC,kBAAkB;YACnHhB;YACA;QACF;QAEA,MAAMiB,YAAYJ,cAAc,CAACK,0CAAiB,CAAC,CAACC,sBAAsB;QAC1E,MAAMC,YAAYtB,IAAIuB,MAAM,CAACC,aAAa;QAG1C,IAAIL,WAAWM,UAAU,CAACN,UAAUV,QAAQ,CAACa,cAAcA,cAAc,oBAAoB;YAE3F,MAAMI,iBAAiBP,UAAUQ,IAAI,CAAC,CAACC;gBACrC,OAAON,UAAUX,UAAU,CAACiB;YAC9B;YAEA,IAAI,CAACF,gBAAgB;gBACnBvB,OAAOS,KAAK,CAAC,sCAAsCZ,IAAIuB,MAAM,CAACC,aAAa;gBAC3E,MAAM,IAAIX,iCAAc,CAAC,aAAab,IAAIuB,MAAM,CAACC,aAAa;YAChE;QACF;QAEAtB;IACF;AAGG,MAAMT,iBAAiBG,IAAAA,qBAAM,EAClC,CAAC,EAAEE,aAAa,EAAE+B,WAAW,EAAEC,aAAa,EAAE,GAC5C,OAAO9B,KAAcC,KAAeC;QAClC,MAAMa,iBAAiB,MAAMjB,cAAckB,WAAW;QAEtD,IAAIc,eAAe;YACjB9B,IAAI+B,KAAK,GAAG/B,IAAIgC,IAAI,EAAED,MAAME,IAAI,CAACC,IAAMA,EAAEC,MAAM;QACjD,OAAO;YACLnC,IAAI+B,KAAK,GAAG/B,IAAIgC,IAAI,EAAED;QACxB;QAGA,IAAIhB,kBAAkB,CAACf,IAAIgC,IAAI,EAAE;YAC/B,MAAMI,WAAW,MAAMP,YAAYQ,iBAAiB;YACpDrC,IAAI+B,KAAK,GAAG;gBAACK;aAAS;QACxB;QAEAlC;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","isTypeormMode","serverSettings","getSettings","roles","user","map","r","roleId","roleName","getAppDefaultRole"],"mappings":";;;;;;;;;;;IA0CaA,cAAc;eAAdA;;IAlCAC,uBAAuB;eAAvBA;;;+BARU;mCAEQ;AAMxB,MAAMA,0BAA0BC,IAAAA,qBAAM,EAC3C,CAAC,EACGC,aAAa,EACbC,aAAa,EACbC,aAAa,EAKd,GACD,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;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,CAAC,CAAC,6DAA6D,EAAEL,aAAaM,IAAI,CAAC,OAAO;QACpH;IACF;AAGG,MAAMpB,iBAAiBE,IAAAA,qBAAM,EAClC,CAAC,EAAEE,aAAa,EAAEiB,WAAW,EAAEC,aAAa,EAAE,GAC5C,OAAOhB,KAAcC,KAAeC;QAClC,MAAMe,iBAAiB,MAAMnB,cAAcoB,WAAW;QAEtD,IAAIF,eAAe;YACjBhB,IAAImB,KAAK,GAAGnB,IAAIoB,IAAI,EAAED,MAAME,IAAI,CAACC,IAAMA,EAAEC,MAAM;QACjD,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"}

package/dist/models/Settings.js

@@ -126,16 +126,6 @@ const SettingsSchema = new _mongoose.Schema({
             default: false,
             required: true
         },
-        whitelistEnabled: {
-            type: Boolean,
-            default: false,
-            required: true
-        },
-        whitelistedIpAddresses: [
-            {
-                type: String
-            }
-        ],
         experimentalMoonrakerSupport: {
             type: Boolean,
             default: false,

package/dist/models/Settings.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","experimentalMoonrakerSupport","experimentalClientSupport","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA0OaA;;;eAAAA;;;0BA1OiB;yCAQvB;AA8DP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QAEA+B,kBAAkB;YAChBlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,wBAAwB;YACtB;gBACEnC,MAAMc;YACR;SACD;QACDsB,8BAA8B;YAC5BpC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAkC,2BAA2B;YACzBrC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACmC,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRvC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAqC,UAAU;YACRxC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAsC,YAAY;YACVzC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACuC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACV3C,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAWiD,IAAAA,eAAK,EAAC,kBAAkBhD"}
+{"version":3,"sources":["../../src/models/Settings.ts"],"names":["Settings","SettingsSchema","Schema","wizardSettingKey","wizardCompleted","type","Boolean","default","required","wizardCompletedAt","Date","wizardVersion","Number","printerFileCleanSettingKey","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","credentialSettingsKey","jwtSecret","String","minlength","trim","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","createdAt","now","updatedAt","serverSettingsKey","sentryDiagnosticsEnabled","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","loginRequired","registration","experimentalMoonrakerSupport","experimentalClientSupport","frontendSettingKey","gridCols","gridRows","largeTiles","timeoutSettingKey","apiTimeout","model"],"mappings":";;;;+BA6NaA;;;eAAAA;;;0BA7NiB;yCAQvB;AA4DP,MAAMC,iBAAiB,IAAIC,gBAAM,CAAY;IAC3C,CAACC,yCAAgB,CAAC,EAAE;QAClBC,iBAAiB;YACfC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAC,mBAAmB;YACjBJ,MAAMK;YACNH,SAAS;YACTC,UAAU;QACZ;QACAG,eAAe;YACbN,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACK,mDAA0B,CAAC,EAAE;QAC5BC,gCAAgC;YAC9BT,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAO,0BAA0B;YACxBV,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAQ,iCAAiC;YAC/BX,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACS,8CAAqB,CAAC,EAAE;QACvBZ,MAAM;YACJa,WAAW;gBACTb,MAAMc;gBACNC,WAAW;gBACXC,MAAM;gBACNb,UAAU;YACZ;YACAc,cAAc;gBACZjB,MAAMO;gBACNJ,UAAU;YACZ;YACAe,sBAAsB;gBACpBlB,MAAMO;gBACNJ,UAAU;YACZ;YACAgB,oBAAoB;gBAClBnB,MAAMO;gBACNJ,UAAU;YACZ;YACAiB,WAAW;gBACTpB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;YACAmB,WAAW;gBACTtB,MAAMK;gBACNH,SAASG,KAAKgB,GAAG;gBACjBlB,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IACA,CAACoB,0CAAiB,CAAC,EAAE;QACnBC,0BAA0B;YACxBxB,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAsB,eAAe;YACbC,qBAAqB;gBACnB1B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAwB,sBAAsB;gBACpB3B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACAyB,oBAAoB;gBAClB5B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA0B,kBAAkB;gBAChB7B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA2B,qBAAqB;gBACnB9B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;YACA4B,wBAAwB;gBACtB/B,MAAMC;gBACNC,SAAS;gBACTC,UAAU;YACZ;QACF;QACA6B,eAAe;YACbhC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA8B,cAAc;YACZjC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACA+B,8BAA8B;YAC5BlC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;QACAgC,2BAA2B;YACzBnC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACiC,2CAAkB,CAAC,EAAE;QACpBC,UAAU;YACRrC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAmC,UAAU;YACRtC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;QACAoC,YAAY;YACVvC,MAAMC;YACNC,SAAS;YACTC,UAAU;QACZ;IACF;IACA,CAACqC,0CAAiB,CAAC,EAAE;QACnBC,YAAY;YACVzC,MAAMO;YACNL,SAAS;YACTC,UAAU;QACZ;IACF;AACF;AAEO,MAAMR,WAAW+C,IAAAA,eAAK,EAAC,kBAAkB9C"}

package/dist/server.constants.js

@@ -27,7 +27,6 @@ const AppConstants = {
     defaultMongoStringUnauthenticated: "mongodb://127.0.0.1:27017/fdm-monster",
     apiRoute: "/api",
     enableClientDistAutoUpdateKey: "ENABLE_CLIENT_DIST_AUTO_UPDATE",
-    ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS: "ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS",
     OVERRIDE_LOGIN_REQUIRED: "OVERRIDE_LOGIN_REQUIRED",
     OVERRIDE_REGISTRATION_ENABLED: "OVERRIDE_REGISTRATION_ENABLED",
     DEFAULT_USERNAME_MINLEN: 3,
@@ -66,7 +65,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.6.10",
+    defaultClientMinimum: "1.7.2",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}

package/dist/server.core.js

@@ -91,7 +91,7 @@ async function setupServer() {
         "anonymous"
     ], {
         session: false
-    })).use((0, _awilixexpress.scopePerRequest)(container)).use(_database.interceptDatabaseError).use(_globalmiddleware.validateWhitelistedIp).use(_globalmiddleware.validateWizardCompleted).use(_globalmiddleware.interceptRoles);
+    })).use((0, _awilixexpress.scopePerRequest)(container)).use(_database.interceptDatabaseError).use(_globalmiddleware.validateWizardCompleted).use(_globalmiddleware.interceptRoles);
     return {
         httpServer,
         container

package/dist/server.core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;iEAfoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;iCAChB;sBACR;yBAC0B;0BACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLpC;QACAc;IACF;AACF"}
+{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;iEAfoB;qEACjB;iEACJ;6DACJ;+DACE;+BACa;2BACG;0BACI;kCACiB;2BACX;iCAChB;sBACR;yBAC0B;0BACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,yCAAuB,EAC3BhB,GAAG,CAACiB,gCAAc;IAErB,OAAO;QACLnC;QACAc;IACF;AACF"}

package/dist/services/interfaces/settings.dto.js

@@ -2,25 +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, {
-    IpWhitelistSettingsDto: function() {
-        return IpWhitelistSettingsDto;
-    },
-    SettingsDto: function() {
+Object.defineProperty(exports, "SettingsDto", {
+    enumerable: true,
+    get: function() {
         return SettingsDto;
     }
 });
 const _serversettingsconstants = require("../../constants/server-settings.constants");
-class IpWhitelistSettingsDto {
-    whitelistedIpAddresses;
-    whitelistEnabled;
-}
 class SettingsDto {
     [_serversettingsconstants.serverSettingsKey];
     [_serversettingsconstants.wizardSettingKey];

package/dist/services/interfaces/settings.dto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA8CAC,WAAW;eAAXA;;;yCA1DN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AA2CO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
+{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["SettingsDto","serverSettingsKey","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;+BAwDaA;;;eAAAA;;;yCAlDN;AAkDA,MAAMA;IACX,CAACC,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,mDAA0B,CAAC,CAAuB;IACnD,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}