@fdm-monster/server 1.7.4 → 1.7.6

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"}

package/dist/services/mongoose/permission.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/mongoose/permission.service.ts"],"names":["PermissionService","logger","constructor","loggerFactory","name","_permissions","permissions","toDto","permission","id","authorizePermission","requiredPermission","assignedPermissions","find","assignedPermission","normalizePermission","getPermissionByName","permissionName","r","NotFoundException","getPermission","permissionId","syncPermissions","permissionDefinition","flattenPermissionDefinition","storedPermission","Permission","findOne","newPermission","create","push","permissionInstance","warn"],"mappings":";;;;+BASaA;;;eAAAA;;;wBATc;wCACiB;mCACV;AAO3B,MAAMA;IACHC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,kBAAkBI,IAAI;IACpD;IAEQC,eAA8B,EAAE,CAAC;IAEzC,IAAIC,cAAc;QAChB,OAAO,IAAI,CAACD,YAAY;IAC1B;IAEAE,MAAMC,UAAuB,EAAE;QAC7B,OAAO;YACLC,IAAID,WAAWC,EAAE;YACjBL,MAAMI,WAAWJ,IAAI;QACvB;IACF;IAEAM,oBAAoBC,kBAA0B,EAAEC,mBAA6B,EAAE;QAC7E,OAAO,CAAC,CAACA,oBAAoBC,IAAI,CAAC,CAACC;YACjC,MAAMC,sBAAsB,IAAI,CAACA,mBAAmB,CAACD;YACrD,IAAI,CAACC,qBAAqB,OAAO;YACjC,OAAOA,wBAAwBJ;QACjC;IACF;IAEA,MAAMK,oBAAoBC,cAAsB,EAAE;QAChD,MAAMT,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAEd,IAAI,KAAKa;QAC3D,IAAI,CAACT,YAAY,MAAM,IAAIW,oCAAiB,CAAC;QAC7C,OAAOX;IACT;IAEA,MAAMY,cAAcC,YAAyB,EAAE;QAC7C,MAAMb,aAAa,IAAI,CAACF,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKY;QACzD,IAAI,CAACb,YAAY,MAAM,IAAIW,oCAAiB,CAAC,CAAC,mCAAmC,CAAC;QAElF,OAAOX;IACT;IAEA,MAAMc,kBAAkB;QACtB,IAAI,CAACjB,YAAY,GAAG,EAAE;QAEtB,MAAMkB,uBAAuBC,IAAAA,mDAA2B;QACxD,KAAK,IAAIhB,cAAce,qBAAsB;YAC3C,MAAME,mBAAmB,MAAMC,kBAAU,CAACC,OAAO,CAAC;gBAAEvB,MAAMI;YAAW;YACrE,IAAI,CAACiB,kBAAkB;gBACrB,MAAMG,gBAAgB,MAAMF,kBAAU,CAACG,MAAM,CAAC;oBAC5CzB,MAAMI;gBACR;gBACA,IAAI,CAACH,YAAY,CAACyB,IAAI,CAACF;YACzB,OAAO;gBACL,IAAI,CAACvB,YAAY,CAACyB,IAAI,CAACL;YACzB;QACF;IACF;IAEAV,oBAAoBD,kBAA0B,EAAE;QAC9C,MAAMiB,qBAAqB,IAAI,CAACzB,WAAW,CAACO,IAAI,CAAC,CAACK,IAAMA,EAAET,EAAE,KAAKK,sBAAsBI,EAAEd,IAAI,KAAKU;QAClG,IAAI,CAACiB,oBAAoB;YACvB,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CAAC;YACjB;QACF;QACA,OAAOD,mBAAmB3B,IAAI;IAChC;AACF"}

package/dist/services/mongoose/refresh-token.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/mongoose/refresh-token.service.ts"],"names":["RefreshTokenService","settingsStore","logger","constructor","loggerFactory","name","toDto","entity","id","userId","toString","expiresAt","refreshAttemptsUsed","getRefreshToken","refreshToken","throwNotFoundError","userRefreshToken","RefreshToken","findOne","AuthenticationError","AUTH_ERROR_REASON","InvalidOrExpiredRefreshToken","createRefreshTokenForUserId","refreshTokenExpiry","getCredentialSettings","uuidv4","timespan","AppConstants","DEFAULT_REFRESH_TOKEN_EXPIRY","warn","create","Date","now","updateRefreshTokenAttempts","updateOne","new","purgeOutdatedRefreshTokensByUserId","result","deleteMany","$lt","deletedCount","debug","purgeAllOutdatedRefreshTokens","deleteRefreshTokenByUserId","deleteRefreshToken","deleteOne"],"mappings":"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"}

package/dist/services/mongoose/role.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/mongoose/role.service.ts"],"names":["RoleService","settingsStore","appDefaultRole","appDefaultRoleNoLogin","constructor","_roles","roles","toDto","role","id","name","getAppDefaultRole","getLoginRequired","getRolesPermissions","permissions","length","normalizedRole","normalizeRoleIdOrName","rolePermissions","getRolePermissions","union","ROLE_PERMS","getAppDefaultRoleIds","syncRoles","guestRole","getRoleByName","getSynchronizedRoleByName","roleName","authorizeRole","requiredRole","assignedRoles","find","ar","authorizeRoles","requiredRoles","subset","isAuthorized","forEach","rr","result","r","NotFoundException","getManyRoles","roleIds","map","roleId","getRole","Object","values","ROLES","storedRole","Role","findOne","newRole","create","push","assignedRole","roleInstance","console","warn"],"mappings":"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"}

package/dist/services/mongoose/settings.service.js

@@ -12,8 +12,6 @@ const _models = require("../../models");
 const _serversettingsconstants = require("../../constants/server-settings.constants");
 const _validators = require("../../handlers/validators");
 const _settingsservicevalidation = require("../validators/settings-service.validation");
-const _serverconstants = require("../../server.constants");
-const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 class SettingsService {
     configService;
     constructor({ configService }){
@@ -65,16 +63,19 @@ class SettingsService {
         }
         if (!doc[_serversettingsconstants.serverSettingsKey]) {
             doc[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
+        } else {
+            doc[_serversettingsconstants.serverSettingsKey] = {
+                debugSettings: doc[_serversettingsconstants.serverSettingsKey].debugSettings,
+                loginRequired: doc[_serversettingsconstants.serverSettingsKey].loginRequired,
+                registration: doc[_serversettingsconstants.serverSettingsKey].registration,
+                experimentalClientSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
+                experimentalMoonrakerSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
+                sentryDiagnosticsEnabled: doc[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
+            };
         }
         if (!doc[_serversettingsconstants.credentialSettingsKey]) {
             doc[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
         }
-        if (!this.isWhiteListSettingEnabled()) {
-            doc.server.whitelistEnabled = false;
-            doc.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
-        } else if (!doc.server.whitelistedIpAddresses?.length) {
-            doc.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
-        }
         if (!doc[_serversettingsconstants.frontendSettingKey]) {
             doc[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
         }
@@ -100,24 +101,6 @@ class SettingsService {
             new: true
         });
     }
-    async setWhitelist(enabled, ipAddresses) {
-        if (!this.isWhiteListSettingEnabled()) {
-            throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
-        }
-        await (0, _validators.validateInput)({
-            whitelistEnabled: enabled,
-            whitelistedIpAddresses: ipAddresses
-        }, _settingsservicevalidation.whitelistSettingUpdateRules);
-        const settingsDoc = await this.getOrCreate();
-        const settings = settingsDoc[_serversettingsconstants.serverSettingsKey];
-        settings.whitelistEnabled = enabled;
-        settings.whitelistedIpAddresses = ipAddresses;
-        return _models.Settings.findOneAndUpdate({
-            _id: settingsDoc.id
-        }, settingsDoc, {
-            new: true
-        });
-    }
     async updateFrontendSettings(patchUpdate) {
         const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.frontendSettingsUpdateRules);
         const settingsDoc = await this.getOrCreate();
@@ -141,7 +124,7 @@ class SettingsService {
         });
     }
     async patchServerSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, (0, _settingsservicevalidation.serverSettingsUpdateRules)(this.isWhiteListSettingEnabled()));
+        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.serverSettingsUpdateRules);
         const settingsDoc = await this.getOrCreate();
         const serverSettings = settingsDoc[_serversettingsconstants.serverSettingsKey];
         Object.assign(serverSettings, validatedInput);
@@ -162,9 +145,6 @@ class SettingsService {
             new: true
         });
     }
-    isWhiteListSettingEnabled() {
-        return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
-    }
 }
 
 //# sourceMappingURL=settings.service.js.map

package/dist/services/mongoose/settings.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","experimentalTypeormSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","length","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","setWhitelist","enabled","ipAddresses","BadRequestException","whitelistSettingUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","experimentalTypeormSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","credentialSettingsKey","getDefaultCredentialSettings","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings"],"mappings":"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"}

package/dist/services/{authentication → mongoose}/user.service.js

@@ -91,7 +91,7 @@ class UserService {
         const role = this.roleService.getRoleByName(_authorizationconstants.ROLES.ADMIN);
         if (user.roles.includes(role.id)) {
             const administrators = await this.findUsersByRoleId(role.id);
-            if (administrators?.length === 1) {
+            if (administrators?.length === 1 && administrators[0].id === userId) {
                 throw new _runtimeexceptions.InternalServerException("Cannot delete the last user with ADMIN role");
             }
         }
@@ -132,7 +132,7 @@ class UserService {
         if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
         if (!isRootUser) {
             const rootUsers = await this.findRootUsers();
-            if (rootUsers.length === 1) {
+            if (rootUsers.length === 1 && rootUsers[0].id === userId) {
                 throw new _runtimeexceptions.InternalServerException("Cannot set the last root user to non-root user");
             }
         }

package/dist/services/mongoose/user.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/mongoose/user.service.ts"],"names":["UserService","roleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUsersByRoleId","roleId","$in","findVerifiedUsers","isUserRootUser","userId","findById","findRootUsers","getDemoUserId","findOne","findRawByUsername","getUser","throwNotFoundError","NotFoundException","getUserRoleIds","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafeByUsername","setIsRootUserById","rootUsers","setVerifiedById","verifiedUsers","register","input","registerUserRules","create"],"mappings":"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"}

package/dist/services/octoprint/octoprint-websocket.adapter.js

@@ -190,7 +190,8 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
     async updateCurrentStateSafely() {
         try {
             const current = await this.octoprintClient.getPrinterCurrent(this.login, true);
-            const job = await this.octoprintClient.getJob(this.login);
+            const isOperational = current.data?.state?.flags?.operational;
+            const job = isOperational ? await this.octoprintClient.getJob(this.login) : {};
             this.setApiState(_apistatetype.API_STATE.responding);
             return await this.emitEvent("current", {
                 ...current.data,

package/dist/services/octoprint/octoprint-websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WebsocketAdapter","printerType","octoprintClient","printerId","stateUpdated","stateUpdateTimestamp","socketState","SOCKET_STATE","unopened","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","logger","eventEmitter","configService","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","getPrinterCurrent","job","getJob","emitEvent","progress","isAxiosError","castError","state","flags","operational","text","noResponse","setReauthRequired","Date","now","emitEventSync","payload","emit","OctoprintType","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","afterClosed","onError","length","emitAsync","authenticating","auth","session","globalKey"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WebsocketAdapter","printerType","octoprintClient","printerId","stateUpdated","stateUpdateTimestamp","socketState","SOCKET_STATE","unopened","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","logger","eventEmitter","configService","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","getPrinterCurrent","isOperational","state","flags","operational","job","getJob","emitEvent","progress","isAxiosError","castError","text","noResponse","setReauthRequired","Date","now","emitEventSync","payload","emit","OctoprintType","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","afterClosed","onError","length","emitAsync","authenticating","auth","session","globalKey"],"mappings":"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"}

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

@@ -12,10 +12,6 @@ const _entities = require("../../entities");
 const _serversettingsconstants = require("../../constants/server-settings.constants");
 const _baseservice = require("./base.service");
 const _settingsdto = require("../interfaces/settings.dto");
-const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
-const _serverconstants = require("../../server.constants");
-const _validators = require("../../handlers/validators");
-const _settingsservicevalidation = require("../validators/settings-service.validation");
 class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
     configService;
     constructor({ configService, typeormService }){
@@ -140,16 +136,19 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
         }
         if (!entity[_serversettingsconstants.serverSettingsKey]) {
             entity[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
+        } else {
+            entity[_serversettingsconstants.serverSettingsKey] = {
+                debugSettings: entity[_serversettingsconstants.serverSettingsKey].debugSettings,
+                loginRequired: entity[_serversettingsconstants.serverSettingsKey].loginRequired,
+                registration: entity[_serversettingsconstants.serverSettingsKey].registration,
+                experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
+                experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
+                sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
+            };
         }
         if (!entity[_serversettingsconstants.credentialSettingsKey]) {
             entity[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
         }
-        if (!this.isWhiteListSettingEnabled()) {
-            entity.server.whitelistEnabled = false;
-            entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
-        } else if (!entity.server.whitelistedIpAddresses?.length) {
-            entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
-        }
         if (!entity[_serversettingsconstants.frontendSettingKey]) {
             entity[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
         }
@@ -195,23 +194,6 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
         await this.update(entity.id, entity);
         return entity;
     }
-    async setWhitelist(enabled, ipAddresses) {
-        if (!this.isWhiteListSettingEnabled()) {
-            throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
-        }
-        await (0, _validators.validateInput)({
-            whitelistEnabled: enabled,
-            whitelistedIpAddresses: ipAddresses
-        }, _settingsservicevalidation.whitelistSettingUpdateRules);
-        const entity = await this.getOrCreate();
-        entity[_serversettingsconstants.serverSettingsKey].whitelistEnabled = enabled;
-        entity[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses = ipAddresses;
-        await this.update(entity.id, entity);
-        return entity;
-    }
-    isWhiteListSettingEnabled() {
-        return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
-    }
 }
 
 //# sourceMappingURL=settings.service.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","loginRequired","setRegistrationEnabled","registration","setSentryDiagnosticsEnabled","sentryDiagnosticsEnabled","setWhitelist","ipAddresses","BadRequestException","validateInput","whitelistSettingUpdateRules","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","setRegistrationEnabled","setSentryDiagnosticsEnabled"],"mappings":"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"}

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

@@ -16,14 +16,17 @@ const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
 const _validators = require("../../handlers/validators");
 const _userservicevalidation = require("../validators/user-service.validation");
 const _cryptoutils = require("../../utils/crypto.utils");
+const _authorizationconstants = require("../../constants/authorization.constants");
 class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto.UserDto) {
     typeormService;
     userRoleService;
-    constructor({ typeormService, userRoleService }){
+    roleService;
+    constructor({ typeormService, userRoleService, roleService }){
         super({
             typeormService
         });
         this.userRoleService = userRoleService;
+        this.roleService = roleService;
     }
     toDto(user) {
         return {
@@ -70,8 +73,19 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         const entity = await this.get(userId);
         return entity.isRootUser;
     }
-    deleteUser(userId) {
-        return this.delete(userId);
+    async deleteUser(userId) {
+        const user = await this.getUser(userId);
+        if (user.isRootUser) {
+            throw new _runtimeexceptions.InternalServerException("Cannot delete a root user");
+        }
+        const role = this.roleService.getRoleByName(_authorizationconstants.ROLES.ADMIN);
+        if (user.roles.find((r)=>r.roleId == role.id)) {
+            const administrators = await this.findUsersByRoleId(role.id);
+            if (administrators?.length === 1 && administrators[0].id === userId) {
+                throw new _runtimeexceptions.InternalServerException("Cannot delete the last user with ADMIN role");
+            }
+        }
+        return await this.delete(userId);
     }
     findRawByUsername(username) {
         return this.repository.findOneBy({
@@ -84,6 +98,14 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         }))?.id;
     }
     async setIsRootUserById(userId, isRootUser) {
+        const user = await this.getUser(userId);
+        if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
+        if (!isRootUser) {
+            const rootUsers = await this.findRootUsers();
+            if (rootUsers.length === 1 && rootUsers[0].id === userId) {
+                throw new _runtimeexceptions.InternalServerException("Cannot set the last root user to non-root user");
+            }
+        }
         await this.update(userId, {
             isRootUser
         });
@@ -93,12 +115,24 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         return await this.get(userId, true);
     }
     async setVerifiedById(userId, isVerified) {
+        const user = await this.getUser(userId);
+        if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
+        if (!isVerified) {
+            if (user.isRootUser) {
+                throw new _runtimeexceptions.InternalServerException("Cannot set a owner (root user) to unverified");
+            }
+            const verifiedUsers = await this.findVerifiedUsers();
+            if (verifiedUsers.length === 1) {
+                throw new _runtimeexceptions.InternalServerException("Cannot set the last user to unverified");
+            }
+        }
         await this.update(userId, {
             isVerified
         });
     }
     async updatePasswordById(userId, oldPassword, newPassword) {
         const user = await this.getUser(userId);
+        if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
         if (!(0, _cryptoutils.comparePasswordHash)(oldPassword, user.passwordHash)) {
             throw new _runtimeexceptions.NotFoundException("User old password incorrect");
         }
@@ -117,6 +151,7 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
         }, _userservicevalidation.newPasswordRules);
         const passwordHash = (0, _cryptoutils.hashPassword)(password);
         const user = await this.findRawByUsername(username);
+        if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
         return await this.update(user.id, {
             passwordHash,
             needsPasswordChange: false

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","NotFoundException","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserRules","result","create"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","roleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","find","administrators","length","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","NotFoundException","rootUsers","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","verifiedUsers","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserRules","result","create"],"mappings":";;;;+BAeaA;;;eAAAA;;;6BAfe;yBACa;0BACpB;yBAGY;mCAC0B;4BAC7B;uCACsB;6BACF;wCAG5B;AAGf,MAAMA,oBAAoBC,IAAAA,wBAAW,EAACC,cAAI,EAAEC,gBAAO;IACxDC,eAA+B;IAC/BC,gBAAiC;IACjCC,YAAyB;IAEzBC,YAAY,EACVH,cAAc,EACdC,eAAe,EACfC,WAAW,EAKZ,CAAE;QACD,KAAK,CAAC;YAAEF;QAAe;QAEvB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,WAAW,GAAGA;IACrB;IAEAE,MAAMC,IAAU,EAAyB;QACvC,OAAO;YACLC,IAAID,KAAKC,EAAE;YACXC,WAAWF,KAAKE,SAAS;YACzBC,YAAYH,KAAKG,UAAU;YAC3BC,YAAYJ,KAAKI,UAAU;YAC3BC,YAAYL,KAAKK,UAAU;YAC3BC,UAAUN,KAAKM,QAAQ;YACvBC,qBAAqBP,KAAKO,mBAAmB;YAC7CC,OAAOR,KAAKQ,KAAK,EAAEC,IAAI,CAACC,IAAMA,EAAEC,MAAM;QACxC;IACF;IAEAC,UAAUC,KAAc,EAAmB;QACzC,OAAO,IAAI,CAACC,IAAI,CAAC;YAAEC,MAAMF;QAAM;IACjC;IAEAG,QAAQC,MAAoB,EAAiB;QAC3C,OAAO,IAAI,CAACC,GAAG,CAACD,QAAQ;IAC1B;IAEA,MAAME,eAAeF,MAAoB,EAA2B;QAClE,MAAMG,YAAY,MAAM,IAAI,CAACxB,eAAe,CAACyB,aAAa,CAACJ;QAC3D,OAAOG,UAAUX,GAAG,CAAC,CAACa,KAAOA,GAAGX,MAAM;IACxC;IAEAY,gBAAiC;QAC/B,OAAO,IAAI,CAACC,UAAU,CAACC,MAAM,CAAC;YAAEpB,YAAY;QAAK;IACnD;IAEA,MAAMqB,kBAAkBf,MAAoB,EAAmB;QAC7D,MAAMS,YAAY,MAAM,IAAI,CAACxB,eAAe,CAAC+B,YAAY,CAAChB;QAC1D,MAAMiB,MAAMR,UAAUX,GAAG,CAAC,CAACoB,IAAMA,EAAE5B,EAAE;QACrC,OAAO,IAAI,CAACuB,UAAU,CAACC,MAAM,CAAC;YAAExB,IAAI6B,IAAAA,WAAE,EAACF;QAAK;IAC9C;IAEAG,oBAAqC;QACnC,OAAO,IAAI,CAACP,UAAU,CAACC,MAAM,CAAC;YAAEtB,YAAY;QAAK;IACnD;IAEA,MAAM6B,eAAef,MAAoB,EAAoB;QAC3D,MAAMgB,SAAS,MAAM,IAAI,CAACf,GAAG,CAACD;QAC9B,OAAOgB,OAAO5B,UAAU;IAC1B;IAEA,MAAM6B,WAAWjB,MAAoB,EAAyB;QAE5D,MAAMjB,OAAO,MAAM,IAAI,CAACgB,OAAO,CAACC;QAEhC,IAAIjB,KAAKK,UAAU,EAAE;YACnB,MAAM,IAAI8B,0CAAuB,CAAC;QACpC;QAGA,MAAMC,OAAO,IAAI,CAACvC,WAAW,CAACwC,aAAa,CAACC,6BAAK,CAACC,KAAK;QACvD,IAAIvC,KAAKQ,KAAK,CAACgC,IAAI,CAAC,CAAC9B,IAAMA,EAAEC,MAAM,IAAIyB,KAAKnC,EAAE,GAAG;YAC/C,MAAMwC,iBAAiB,MAAM,IAAI,CAACf,iBAAiB,CAACU,KAAKnC,EAAE;YAC3D,IAAIwC,gBAAgBC,WAAW,KAAKD,cAAc,CAAC,EAAE,CAACxC,EAAE,KAAKgB,QAAQ;gBACnE,MAAM,IAAIkB,0CAAuB,CAAC;YACpC;QACF;QAEA,OAAO,MAAM,IAAI,CAACQ,MAAM,CAAC1B;IAC3B;IAEA2B,kBAAkBtC,QAAgB,EAAiB;QACjD,OAAO,IAAI,CAACkB,UAAU,CAACqB,SAAS,CAAC;YAAEvC;QAAS;IAC9C;IAEA,MAAMwC,gBAAuC;QAC3C,OAAQ,CAAA,MAAM,IAAI,CAACtB,UAAU,CAACqB,SAAS,CAAC;YAAEzC,YAAY;QAAK,EAAC,GAAIH;IAClE;IAEA,MAAM8C,kBAAkB9B,MAAoB,EAAEZ,UAAmB,EAAiB;QAChF,MAAML,OAAO,MAAM,IAAI,CAACgB,OAAO,CAACC;QAChC,IAAI,CAACjB,MAAM,MAAM,IAAIgD,oCAAiB,CAAC;QAEvC,IAAI,CAAC3C,YAAY;YAEf,MAAM4C,YAAY,MAAM,IAAI,CAAC1B,aAAa;YAC1C,IAAI0B,UAAUP,MAAM,KAAK,KAAKO,SAAS,CAAC,EAAE,CAAChD,EAAE,KAAKgB,QAAQ;gBACxD,MAAM,IAAIkB,0CAAuB,CAAC;YACpC;QACF;QAEA,MAAM,IAAI,CAACe,MAAM,CAACjC,QAAQ;YAAEZ;QAAW;IACzC;IAEA,MAAM8C,eAAelC,MAAoB,EAAEmC,OAAuB,EAAiB;QACjF,MAAM,IAAI,CAACxD,eAAe,CAACyD,YAAY,CAACpC,QAAQmC;QAChD,OAAO,MAAM,IAAI,CAAClC,GAAG,CAACD,QAAQ;IAChC;IAEA,MAAMqC,gBAAgBrC,MAAoB,EAAEd,UAAmB,EAAiB;QAC9E,MAAMH,OAAO,MAAM,IAAI,CAACgB,OAAO,CAACC;QAChC,IAAI,CAACjB,MAAM,MAAM,IAAIgD,oCAAiB,CAAC;QAEvC,IAAI,CAAC7C,YAAY;YACf,IAAIH,KAAKK,UAAU,EAAE;gBACnB,MAAM,IAAI8B,0CAAuB,CAAC;YACpC;YAGA,MAAMoB,gBAAgB,MAAM,IAAI,CAACxB,iBAAiB;YAClD,IAAIwB,cAAcb,MAAM,KAAK,GAAG;gBAC9B,MAAM,IAAIP,0CAAuB,CAAC;YACpC;QACF;QAEA,MAAM,IAAI,CAACe,MAAM,CAACjC,QAAQ;YAAEd;QAAW;IACzC;IAEA,MAAMqD,mBAAmBvC,MAAoB,EAAEwC,WAAmB,EAAEC,WAAmB,EAAiB;QACtG,MAAM1D,OAAO,MAAM,IAAI,CAACgB,OAAO,CAACC;QAChC,IAAI,CAACjB,MAAM,MAAM,IAAIgD,oCAAiB,CAAC;QAEvC,IAAI,CAACW,IAAAA,gCAAmB,EAACF,aAAazD,KAAK4D,YAAY,GAAG;YACxD,MAAM,IAAIZ,oCAAiB,CAAC;QAC9B;QAEA,MAAM,EAAEa,QAAQ,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAAC;YAAED,UAAUH;QAAY,GAAGK,uCAAgB;QACpF,MAAMH,eAAeI,IAAAA,yBAAY,EAACH;QAClC,OAAO,MAAM,IAAI,CAACX,MAAM,CAACjC,QAAQ;YAAE2C;YAAcrD,qBAAqB;QAAM;IAC9E;IAEA,MAAM0D,+BAA+B3D,QAAgB,EAAEoD,WAAmB,EAAiB;QACzF,MAAM,EAAEG,QAAQ,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAAC;YAAED,UAAUH;QAAY,GAAGK,uCAAgB;QACpF,MAAMH,eAAeI,IAAAA,yBAAY,EAACH;QAClC,MAAM7D,OAAO,MAAM,IAAI,CAAC4C,iBAAiB,CAACtC;QAC1C,IAAI,CAACN,MAAM,MAAM,IAAIgD,oCAAiB,CAAC;QAEvC,OAAO,MAAM,IAAI,CAACE,MAAM,CAAClD,KAAKC,EAAE,EAAE;YAAE2D;YAAcrD,qBAAqB;QAAM;IAC/E;IAEA2D,mBAAmBjD,MAAoB,EAAEkD,WAAmB,EAAiB;QAC3E,OAAO,IAAI,CAACjB,MAAM,CAACjC,QAAQ;YAAEX,UAAU6D;QAAY;IACrD;IAEA,MAAMC,SAASC,KAAoC,EAAiB;QAClE,MAAM,EAAE/D,QAAQ,EAAEuD,QAAQ,EAAErD,KAAK,EAAEJ,UAAU,EAAEC,UAAU,EAAEE,mBAAmB,EAAEJ,UAAU,EAAE,GAAI,MAAM2D,IAAAA,yBAAa,EACjHO,OACAC,IAAAA,wCAAiB,EAAC;QAGpB,MAAMV,eAAeI,IAAAA,yBAAY,EAACH;QAClC,MAAMU,SAAS,MAAM,IAAI,CAACC,MAAM,CAAC;YAC/BlE;YACAsD;YACAzD,YAAYA,cAAc;YAC1BC,YAAYA,cAAc;YAC1BC,YAAYA,cAAc;YAC1BE,qBAAqBA,uBAAuB;QAC9C;QACA,MAAM,IAAI,CAACX,eAAe,CAACyD,YAAY,CAACkB,OAAOtE,EAAE,EAAEO;QAEnD,OAAO,IAAI,CAACU,GAAG,CAACqD,OAAOtE,EAAE;IAC3B;AACF"}

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

@@ -33,25 +33,19 @@ _export(exports, {
     timeoutSettingsUpdateRules: function() {
         return timeoutSettingsUpdateRules;
     },
-    whitelistSettingUpdateRules: function() {
-        return whitelistSettingUpdateRules;
-    },
     wizardUpdateRules: function() {
         return wizardUpdateRules;
     }
 });
 const _envutils = require("../../utils/env.utils");
-const serverSettingsUpdateRules = (whitelistFeatureEnabled)=>({
-        registration: "boolean",
-        loginRequired: "boolean",
-        debugSettings: "object",
-        "debugSettings.debugSocketEvents": "boolean",
-        "debugSettings.debugSocketReconnect": "boolean",
-        whitelistEnabled: whitelistFeatureEnabled ? "boolean" : "not",
-        whitelistedIpAddresses: whitelistFeatureEnabled ? "array|minLength:1" : "not",
-        "whitelistedIpAddresses.*": whitelistFeatureEnabled ? "required|string" : "not",
-        experimentalMoonrakerSupport: "boolean"
-    });
+const serverSettingsUpdateRules = {
+    registration: "boolean",
+    loginRequired: "boolean",
+    debugSettings: "object",
+    "debugSettings.debugSocketEvents": "boolean",
+    "debugSettings.debugSocketReconnect": "boolean",
+    experimentalMoonrakerSupport: "boolean"
+};
 const timeoutSettingsUpdateRules = {
     apiTimeout: "integer|min:1000"
 };
@@ -66,11 +60,6 @@ const credentialSettingPatchRules = {
     refreshTokenAttempts: "integer|min:-1",
     refreshTokenExpiry: (0, _envutils.isProductionEnvironment)() ? "integer|min:240" : "integer|min:0"
 };
-const whitelistSettingUpdateRules = {
-    whitelistedIpAddresses: "required|array|minLength:1",
-    "whitelistedIpAddresses.*": "required|string",
-    whitelistEnabled: "required|boolean"
-};
 const wizardUpdateRules = {
     wizardCompleted: "required|boolean",
     wizardCompletedAt: "required|date|nullable",

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextRules","credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","moonrakerSupportRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","whitelistSettingUpdateRules","wizardUpdateRules","whitelistFeatureEnabled","registration","loginRequired","debugSettings","whitelistEnabled","whitelistedIpAddresses","experimentalMoonrakerSupport","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAyDaA,eAAe;eAAfA;;IAjCAC,2BAA2B;eAA3BA;;IAmBAC,4BAA4B;eAA5BA;;IAzBAC,2BAA2B;eAA3BA;;IAmCAC,qBAAqB;eAArBA;;IAJAC,6BAA6B;eAA7BA;;IA/CAC,yBAAyB;eAAzBA;;IAYAC,0BAA0B;eAA1BA;;IAiBAC,2BAA2B;eAA3BA;;IAMAC,iBAAiB;eAAjBA;;;0BArC2B;AAEjC,MAAMH,4BAA4B,CAACI,0BAAsC,CAAA;QAC9EC,cAAc;QACdC,eAAe;QACfC,eAAe;QACf,mCAAmC;QACnC,sCAAsC;QACtCC,kBAAkBJ,0BAA0B,YAAY;QACxDK,wBAAwBL,0BAA0B,sBAAsB;QACxE,4BAA4BA,0BAA0B,oBAAoB;QAC1EM,8BAA8B;IAChC,CAAA;AAEO,MAAMT,6BAA6B;IACxCU,YAAY;AACd;AAEO,MAAMd,8BAA8B;IACzCe,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMnB,8BAA8B;IACzCoB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMf,8BAA8B;IACzCO,wBAAwB;IACxB,4BAA4B;IAC5BD,kBAAkB;AACpB;AAEO,MAAML,oBAAoB;IAC/BiB,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAM1B,+BAA+B;IAC1C2B,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAM1B,gCAAgC;IAC3C2B,SAAS;AACX;AAEO,MAAM5B,wBAAwB;IACnC4B,SAAS;AACX;AAEO,MAAMhC,kBAAkB;IAC7BgC,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextRules","credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","moonrakerSupportRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","wizardUpdateRules","registration","loginRequired","debugSettings","experimentalMoonrakerSupport","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAgDaA,eAAe;eAAfA;;IA3BAC,2BAA2B;eAA3BA;;IAaAC,4BAA4B;eAA5BA;;IAnBAC,2BAA2B;eAA3BA;;IA6BAC,qBAAqB;eAArBA;;IAJAC,6BAA6B;eAA7BA;;IAtCAC,yBAAyB;eAAzBA;;IASAC,0BAA0B;eAA1BA;;IAiBAC,iBAAiB;eAAjBA;;;0BA5B2B;AAEjC,MAAMF,4BAA4B;IACvCG,cAAc;IACdC,eAAe;IACfC,eAAe;IACf,mCAAmC;IACnC,sCAAsC;IACtCC,8BAA8B;AAChC;AAEO,MAAML,6BAA6B;IACxCM,YAAY;AACd;AAEO,MAAMV,8BAA8B;IACzCW,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMf,8BAA8B;IACzCgB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMX,oBAAoB;IAC/Bc,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAMtB,+BAA+B;IAC1CuB,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAMtB,gCAAgC;IAC3CuB,SAAS;AACX;AAEO,MAAMxB,wBAAwB;IACnCwB,SAAS;AACX;AAEO,MAAM5B,kBAAkB;IAC7B4B,SAAS;AACX"}

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

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

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

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

package/dist/state/settings.store.js

@@ -52,8 +52,6 @@ class SettingsStore {
             },
             [_serversettingsconstants.serverSettingsKey]: {
                 debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
-                whitelistEnabled: settings[_serversettingsconstants.serverSettingsKey].whitelistEnabled,
-                whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses,
                 experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
                 experimentalTypeormSupport: this.isTypeOrmMode,
                 experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
@@ -137,13 +135,6 @@ class SettingsStore {
         });
         return this.getSettings();
     }
-    async setWhitelist(whitelistEnabled = true, whitelistedIpAddresses) {
-        this.settings = await this.settingsService.patchServerSettings({
-            whitelistEnabled,
-            whitelistedIpAddresses
-        });
-        return this.getSettings();
-    }
     async updateServerSettings(serverSettings) {
         this.settings = await this.settingsService.patchServerSettings(serverSettings);
         return this.getSettings();