@fdm-monster/server 1.5.0-rc1 → 1.5.0

package/dist/services/settings.service.js

@@ -12,7 +12,23 @@ 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 }){
+        this.configService = configService;
+    }
+    toDto(entity) {
+        return {
+            // Credential settings are not shared with the client
+            [_serversettingsconstants.serverSettingsKey]: entity[_serversettingsconstants.serverSettingsKey],
+            [_serversettingsconstants.wizardSettingKey]: entity[_serversettingsconstants.wizardSettingKey],
+            [_serversettingsconstants.frontendSettingKey]: entity[_serversettingsconstants.frontendSettingKey],
+            [_serversettingsconstants.fileCleanSettingKey]: entity[_serversettingsconstants.fileCleanSettingKey],
+            [_serversettingsconstants.timeoutSettingKey]: entity[_serversettingsconstants.timeoutSettingKey]
+        };
+    }
     async getOrCreate() {
         let settings = await _models.Settings.findOne();
         if (!settings) {
@@ -50,7 +66,10 @@ class SettingsService {
         if (!doc[_serversettingsconstants.credentialSettingsKey]) {
             doc[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
         }
-        if (!doc.server.whitelistedIpAddresses?.length) {
+        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]) {
@@ -58,15 +77,6 @@ class SettingsService {
         }
         return knownSettings;
     }
-    async setSentryDiagnosticsEnabled(enabled) {
-        const settingsDoc = await this.getOrCreate();
-        settingsDoc[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled = enabled;
-        return _models.Settings.findOneAndUpdate({
-            _id: settingsDoc.id
-        }, settingsDoc, {
-            new: true
-        });
-    }
     async patchFileCleanSettings(patchUpdate) {
         const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.fileCleanSettingsUpdateRules);
         const settingsDoc = await this.getOrCreate();
@@ -87,28 +97,13 @@ class SettingsService {
             new: true
         });
     }
-    async setRegistrationEnabled(enabled = true) {
-        const settingsDoc = await this.getOrCreate();
-        settingsDoc[_serversettingsconstants.serverSettingsKey].registration = enabled;
-        return _models.Settings.findOneAndUpdate({
-            _id: settingsDoc.id
-        }, settingsDoc, {
-            new: true
-        });
-    }
-    async setLoginRequired(enabled = true) {
-        const settingsDoc = await this.getOrCreate();
-        settingsDoc[_serversettingsconstants.serverSettingsKey].loginRequired = enabled;
-        return _models.Settings.findOneAndUpdate({
-            _id: settingsDoc.id
-        }, settingsDoc, {
-            new: true
-        });
-    }
     async setWhitelist(enabled, ipAddresses) {
+        if (!this.isWhiteListSettingEnabled()) {
+            throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
+        }
         await (0, _validators.validateInput)({
-            enabled,
-            ipAddresses
+            whitelistEnabled: enabled,
+            whitelistedIpAddresses: ipAddresses
         }, _settingsservicevalidation.whitelistSettingUpdateRules);
         const settingsDoc = await this.getOrCreate();
         const settings = settingsDoc[_serversettingsconstants.serverSettingsKey];
@@ -143,7 +138,7 @@ class SettingsService {
         });
     }
     async patchServerSettings(patchUpdate) {
-        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.serverSettingsUpdateRules);
+        const validatedInput = await (0, _validators.validateInput)(patchUpdate, (0, _settingsservicevalidation.serverSettingsUpdateRules)(this.isWhiteListSettingEnabled()));
         const settingsDoc = await this.getOrCreate();
         const serverSettings = settingsDoc[_serversettingsconstants.serverSettingsKey];
         Object.assign(serverSettings, validatedInput);
@@ -153,6 +148,20 @@ class SettingsService {
             new: true
         });
     }
+    async updateTimeoutSettings(patchUpdate) {
+        const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.timeoutSettingsUpdateRules);
+        const settingsDoc = await this.getOrCreate();
+        const timeoutSettings = settingsDoc[_serversettingsconstants.timeoutSettingKey];
+        Object.assign(timeoutSettings, validatedInput);
+        return _models.Settings.findOneAndUpdate({
+            _id: settingsDoc.id
+        }, settingsDoc, {
+            new: true
+        });
+    }
+    isWhiteListSettingEnabled() {
+        return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
+    }
 }
 
 //# sourceMappingURL=settings.service.js.map

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

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

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

@@ -33,7 +33,7 @@ const createMongoPrinterRules = {
 };
 const createPrinterRules = {
     apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
-    printerUrl: "required|httpurl",
+    printerURL: "required|httpurl",
     enabled: "boolean",
     name: "required|string"
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","enabled","settingsAppearance","printerUrl","name","disabledReason"],"mappings":";;;;;;;;;;;IAEaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAWAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCAlBe;AAErB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,oBAAoB;IACpB,2BAA2B;AAC7B;AAEO,MAAMR,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEI,YAAY;IACZF,SAAS;IACTG,MAAM;AACR;AAEO,MAAMR,2BAA2B;IACtCK,SAAS;AACX;AAEO,MAAMN,kCAAkC;IAC7CU,gBAAgB;IAChBJ,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","enabled","settingsAppearance","name","disabledReason"],"mappings":";;;;;;;;;;;IAEaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAWAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCAlBe;AAErB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTC,oBAAoB;IACpB,2BAA2B;AAC7B;AAEO,MAAMR,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,SAAS;IACTE,MAAM;AACR;AAEO,MAAMP,2BAA2B;IACtCK,SAAS;AACX;AAEO,MAAMN,kCAAkC;IAC7CS,gBAAgB;IAChBH,SAAS;AACX"}

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

@@ -24,6 +24,9 @@ _export(exports, {
     serverSettingsUpdateRules: function() {
         return serverSettingsUpdateRules;
     },
+    timeoutSettingsUpdateRules: function() {
+        return timeoutSettingsUpdateRules;
+    },
     whitelistSettingUpdateRules: function() {
         return whitelistSettingUpdateRules;
     },
@@ -31,12 +34,19 @@ _export(exports, {
         return wizardUpdateRules;
     }
 });
-const serverSettingsUpdateRules = {
-    registration: "boolean",
-    loginRequired: "boolean",
-    debugSettings: "object",
-    "debugSettings.debugSocketEvents": "boolean",
-    "debugSettings.debugSocketReconnect": "boolean"
+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"
+    });
+const timeoutSettingsUpdateRules = {
+    apiTimeout: "integer|min:1000"
 };
 const frontendSettingsUpdateRules = {
     gridCols: "integer|min:1",
@@ -45,9 +55,9 @@ const frontendSettingsUpdateRules = {
 };
 const credentialSettingPatchRules = {
     jwtSecret: "string",
-    jwtExpiresIn: "integer|min:120",
+    jwtExpiresIn: (0, _envutils.isProductionEnvironment)() ? "integer|min:120|max:7200" : "integer|min:0",
     refreshTokenAttempts: "integer|min:-1",
-    refreshTokenExpiry: "integer|min:0"
+    refreshTokenExpiry: (0, _envutils.isProductionEnvironment)() ? "integer|min:240" : "integer|min:0"
 };
 const whitelistSettingUpdateRules = {
     whitelistedIpAddresses: "required|array|minLength:1",

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","whitelistSettingUpdateRules","wizardUpdateRules","registration","loginRequired","debugSettings","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","whitelistedIpAddresses","whitelistEnabled","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAcaA,2BAA2B;eAA3BA;;IAmBAC,4BAA4B;eAA5BA;;IAzBAC,2BAA2B;eAA3BA;;IA+BAC,6BAA6B;eAA7BA;;IAvCAC,yBAAyB;eAAzBA;;IAqBAC,2BAA2B;eAA3BA;;IAMAC,iBAAiB;eAAjBA;;;AA3BN,MAAMF,4BAA4B;IACvCG,cAAc;IACdC,eAAe;IACfC,eAAe;IACf,mCAAmC;IACnC,sCAAsC;AACxC;AAEO,MAAMP,8BAA8B;IACzCQ,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMZ,8BAA8B;IACzCa,WAAW;IACXC,cAAc;IACdC,sBAAsB;IACtBC,oBAAoB;AACtB;AAEO,MAAMX,8BAA8B;IACzCY,wBAAwB;IACxB,4BAA4B;IAC5BC,kBAAkB;AACpB;AAEO,MAAMZ,oBAAoB;IAC/Ba,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAMpB,+BAA+B;IAC1CqB,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAMrB,gCAAgC;IAC3CsB,SAAS;AACX"}
+{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","whitelistSettingUpdateRules","wizardUpdateRules","whitelistFeatureEnabled","registration","loginRequired","debugSettings","whitelistEnabled","whitelistedIpAddresses","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAuBaA,2BAA2B;eAA3BA;;IAmBAC,4BAA4B;eAA5BA;;IAzBAC,2BAA2B;eAA3BA;;IA+BAC,6BAA6B;eAA7BA;;IA9CAC,yBAAyB;eAAzBA;;IAWAC,0BAA0B;eAA1BA;;IAiBAC,2BAA2B;eAA3BA;;IAMAC,iBAAiB;eAAjBA;;;0BApC2B;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;IAC5E,CAAA;AAEO,MAAMH,6BAA6B;IACxCS,YAAY;AACd;AAEO,MAAMZ,8BAA8B;IACzCa,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMjB,8BAA8B;IACzCkB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMd,8BAA8B;IACzCO,wBAAwB;IACxB,4BAA4B;IAC5BD,kBAAkB;AACpB;AAEO,MAAML,oBAAoB;IAC/BgB,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAMxB,+BAA+B;IAC1CyB,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAMzB,gCAAgC;IAC3C0B,SAAS;AACX"}

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

@@ -18,13 +18,14 @@ _export(exports, {
 });
 const _serverconstants = require("../../server.constants");
 const registerUserRules = {
-    username: "required|string",
+    username: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN}`,
     password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`,
     needsPasswordChange: "boolean",
     roles: "required|array",
     isDemoUser: "boolean",
     isRootUser: "boolean",
-    "roles.*": "required|mongoId"
+    "roles.*": "required|mongoId",
+    isVerified: "boolean"
 };
 const newPasswordRules = {
     password: `required|string|minLength:${_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN}`

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/user-service.validation.ts"],"names":["newPasswordRules","registerUserRules","username","password","AppConstants","DEFAULT_PASSWORD_MINLEN","needsPasswordChange","roles","isDemoUser","isRootUser"],"mappings":";;;;;;;;;;;IAYaA,gBAAgB;eAAhBA;;IAVAC,iBAAiB;eAAjBA;;;iCAFgB;AAEtB,MAAMA,oBAAoB;IAC/BC,UAAU;IACVC,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,CAAC,CAAC;IAC7EC,qBAAqB;IACrBC,OAAO;IACPC,YAAY;IACZC,YAAY;IACZ,WAAW;AACb;AAEO,MAAMT,mBAAmB;IAC9BG,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,CAAC,CAAC;AAC/E"}
+{"version":3,"sources":["../../../src/services/validators/user-service.validation.ts"],"names":["newPasswordRules","registerUserRules","username","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN","needsPasswordChange","roles","isDemoUser","isRootUser","isVerified"],"mappings":";;;;;;;;;;;IAaaA,gBAAgB;eAAhBA;;IAXAC,iBAAiB;eAAjBA;;;iCAFgB;AAEtB,MAAMA,oBAAoB;IAC/BC,UAAU,CAAC,0BAA0B,EAAEC,6BAAY,CAACC,uBAAuB,CAAC,CAAC;IAC7EC,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,CAAC,CAAC;IAC7EC,qBAAqB;IACrBC,OAAO;IACPC,YAAY;IACZC,YAAY;IACZ,WAAW;IACXC,YAAY;AACd;AAEO,MAAMX,mBAAmB;IAC9BK,UAAU,CAAC,0BAA0B,EAAEF,6BAAY,CAACG,uBAAuB,CAAC,CAAC;AAC/E"}

package/dist/state/settings.store.js

@@ -23,15 +23,36 @@ class SettingsStore {
     }
     getSettings() {
         const settings = this.settings;
+        if (!settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
         return Object.freeze({
             // Credential settings are not shared with the client
-            [_serversettingsconstants.serverSettingsKey]: settings[_serversettingsconstants.serverSettingsKey],
+            [_serversettingsconstants.serverSettingsKey]: {
+                loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
+                registration: settings[_serversettingsconstants.serverSettingsKey].registration,
+                sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
+            },
             [_serversettingsconstants.wizardSettingKey]: settings[_serversettingsconstants.wizardSettingKey],
             [_serversettingsconstants.frontendSettingKey]: settings[_serversettingsconstants.frontendSettingKey],
             [_serversettingsconstants.fileCleanSettingKey]: settings[_serversettingsconstants.fileCleanSettingKey],
             [_serversettingsconstants.timeoutSettingKey]: settings[_serversettingsconstants.timeoutSettingKey]
         });
     }
+    getSettingsSensitive() {
+        const settings = this.settings;
+        if (!settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
+        return Object.freeze({
+            [_serversettingsconstants.credentialSettingsKey]: {
+                jwtExpiresIn: settings[_serversettingsconstants.credentialSettingsKey].jwtExpiresIn,
+                refreshTokenAttempts: settings[_serversettingsconstants.credentialSettingsKey].refreshTokenAttempts,
+                refreshTokenExpiry: settings[_serversettingsconstants.credentialSettingsKey].refreshTokenExpiry
+            },
+            [_serversettingsconstants.serverSettingsKey]: {
+                debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
+                whitelistEnabled: settings[_serversettingsconstants.serverSettingsKey].whitelistEnabled,
+                whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses
+            }
+        });
+    }
     async loadSettings() {
         // Setup Settings as connection is established
         this.settings = await this.settingsService.getOrCreate();
@@ -78,9 +99,7 @@ class SettingsStore {
     getFrontendSettings() {
         return this.getSettings()[_serversettingsconstants.frontendSettingKey];
     }
-    /**
-   * Cross-cutting concern for file clean operation
-   */ getFileCleanSettings() {
+    getFileCleanSettings() {
         return this.getSettings()[_serversettingsconstants.fileCleanSettingKey];
     }
     isPreUploadFileCleanEnabled() {
@@ -120,6 +139,10 @@ class SettingsStore {
         this.settings = await this.settingsService.patchServerSettings(serverSettings);
         return this.getSettings();
     }
+    async updateTimeoutSettings(timeoutSettings) {
+        this.settings = await this.settingsService.updateTimeoutSettings(timeoutSettings);
+        return this.getSettings();
+    }
     async patchFileCleanSettings(fileClean) {
         this.settings = await this.settingsService.patchFileCleanSettings(fileClean);
         return this.getSettings();
@@ -140,13 +163,13 @@ class SettingsStore {
         return this.getSettings();
     }
     async processSentryEnabled() {
-        if ((0, _envutils.isTestEnvironment)()) return;
         const sentryEnabled = await this.getAnonymousDiagnosticsEnabled();
         if (sentryEnabled) {
             this.logger.log("Enabling Sentry for remote diagnostics");
         } else {
             this.logger.log("Disabling Sentry for remote diagnostics");
         }
+        if ((0, _envutils.isTestEnvironment)()) return;
         (0, _node.getCurrentHub)().getClient().getOptions().enabled = sentryEnabled;
     }
 }

package/dist/state/settings.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","Object","freeze","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","credentialSettingsKey","getAnonymousDiagnosticsEnabled","sentryDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","jwtExpiresIn","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","InternalServerException","registration","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","loginRequired","setLoginRequired","setWhitelist","whitelistEnabled","whitelistedIpAddresses","updateServerSettings","serverSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","isTestEnvironment","sentryEnabled","log","getCurrentHub","getClient","getOptions","enabled"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","getCurrentHub","getClient","getOptions","enabled"],"mappings":"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"}

package/dist/state/socket-io.gateway.js

@@ -18,15 +18,40 @@ _export(exports, {
 });
 const _socketio = require("socket.io");
 const _eventconstants = require("../constants/event.constants");
+const _passport = require("../middleware/passport");
+const _passportjwt = require("passport-jwt");
+const authorize = (settingsStore, options, verify)=>{
+    const strategy = new _passportjwt.Strategy(options, verify);
+    return async function authorizeCallback(socket, next) {
+        if (!await settingsStore.getLoginRequired()) {
+            // No login required, so we can skip the authentication
+            return next();
+        }
+        // --- Begin strategy augmentation ala passport
+        strategy.success = function success(user) {
+            socket.handshake.user = user;
+            next();
+        };
+        strategy.fail = (info)=>next(new Error(info));
+        strategy.error = (error)=>next(error);
+        strategy.authenticate(socket, {});
+    };
+};
 class SocketIoGateway {
     logger;
     eventEmitter2;
     io;
+    authService;
     settingsStore;
-    constructor({ loggerFactory, eventEmitter2, settingsStore }){
+    configService;
+    userService;
+    constructor({ loggerFactory, eventEmitter2, settingsStore, authService, configService, userService }){
         this.logger = loggerFactory(SocketIoGateway.name);
         this.eventEmitter2 = eventEmitter2;
         this.settingsStore = settingsStore;
+        this.authService = authService;
+        this.userService = userService;
+        this.configService = configService;
     }
     attachServer(httpServer) {
         this.io = new _socketio.Server(httpServer, {
@@ -34,8 +59,10 @@ class SocketIoGateway {
                 origin: "*"
             }
         });
-        const that = this;
-        this.io.on("connection", (socket)=>this.onConnect.bind(that)(socket));
+        const opts = (0, _passport.getPassportJwtOptions)(this.settingsStore, this.configService, (value)=>value.handshake.auth.token);
+        const verify = (0, _passport.verifyUserCallback)(this.userService);
+        this.io.use(authorize(this.settingsStore, opts, verify));
+        this.io.on("connection", (socket)=>this.onConnect.bind(this)(socket));
     }
     onConnect(socket) {
         this.logger.log("SocketIO Client connected", socket.id);

package/dist/state/socket-io.gateway.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","logger","eventEmitter2","io","settingsStore","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","that","on","socket","onConnect","bind","log","id","emit","socketIoConnectedEvent","send","event","data","debug","getServerSettings","debugSettings","debugSocketIoEvents","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IAyDaA,WAAW;eAAXA;;IAjDAC,eAAe;eAAfA;;;0BARkB;gCACQ;AAOhC,MAAMA;IACXC,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,cAA6B;IAE7BC,YAAY,EACVC,aAAa,EACbJ,aAAa,EACbE,aAAa,EAKd,CAAE;QACD,IAAI,CAACH,MAAM,GAAGK,cAAcN,gBAAgBO,IAAI;QAChD,IAAI,CAACL,aAAa,GAAGA;QACrB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAEAI,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACN,EAAE,GAAG,IAAIO,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAO,IAAI;QACjB,IAAI,CAACV,EAAE,CAACW,EAAE,CAAC,cAAc,CAACC,SAAW,IAAI,CAACC,SAAS,CAACC,IAAI,CAACJ,MAAME;IACjE;IAEAC,UAAUD,MAAc,EAAE;QACxB,IAAI,CAACd,MAAM,CAACiB,GAAG,CAAC,6BAA6BH,OAAOI,EAAE;QACtD,IAAI,CAACjB,aAAa,CAACkB,IAAI,CAACC,sCAAsB,EAAEN,OAAOI,EAAE;QAEzDJ,OAAOD,EAAE,CAAC,cAAc;YACtB,IAAI,CAACb,MAAM,CAACiB,GAAG,CAAC,gCAAgCH,OAAOI,EAAE;QAC3D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAACrB,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAACwB,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAACrB,aAAa,CAACsB,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAAC3B,MAAM,CAACiB,GAAG,CAAC,CAAC,cAAc,EAAEK,MAAM,CAAC;QAC1C;QACA,IAAI,CAACpB,EAAE,CAACiB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMzB,cAAc;IACzB8B,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}
+{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","log","id","emit","socketIoConnectedEvent","send","event","data","debug","getServerSettings","debugSettings","debugSocketIoEvents","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAC7C,uDAAuD;YACvD,OAAOD;QACT;QACA,+CAA+C;QAC/CJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,GAAG,CAAC,6BAA6BnC,OAAOoC,EAAE;QAEtD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,GAAG,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC3D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAAC+B,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAAChD,aAAa,CAACiD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAAClC,MAAM,CAACwB,GAAG,CAAC,CAAC,cAAc,EAAEK,MAAM,CAAC;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}

package/dist/state/test-printer-socket.store.js

@@ -70,6 +70,9 @@ class TestPrinterSocketStore {
         const promise = new Promise(async (resolve, reject)=>{
             this.testSocket.open();
             for await (const startTime of (0, _promises.setInterval)(100)){
+                if (!this.testSocket) {
+                    return;
+                }
                 if (this.testSocket.socketState === _octoprintsockioadapter.SOCKET_STATE.authenticated) {
                     resolve();
                     break;

package/dist/state/test-printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAEA;;;;GAIC,GACD,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAExB,0CAA0C;QAC1C,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAEnD,sDAAsD;QACtD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,IAAI,CAAC1C,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAEA;;;;GAIC,GACD,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAExB,0CAA0C;QAC1C,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAEnD,sDAAsD;QACtD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,CAAC,IAAI,CAAC1C,UAAU,EAAE;oBACpB;gBACF;gBACA,IAAI,IAAI,CAACA,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}

package/dist/tasks/boot.task.js

@@ -33,7 +33,9 @@ function _interop_require_wildcard(obj, nodeInterop) {
     if (cache && cache.has(obj)) {
         return cache.get(obj);
     }
-    var newObj = {};
+    var newObj = {
+        __proto__: null
+    };
     var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
     for(var key in obj){
         if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
@@ -116,22 +118,23 @@ class BootTask {
         this.logger.log("Synchronizing user permission and roles definition");
         await this.permissionService.syncPermissions();
         await this.roleService.syncRoles();
-        const isDemoMode = this.configService.get(_serverconstants.AppConstants.OVERRIDE_IS_DEMO_MODE, null) === "true";
+        const isDemoMode = this.configService.isDemoMode();
         if (isDemoMode) {
             this.logger.warn(`Starting in demo mode due to ${_serverconstants.AppConstants.OVERRIDE_IS_DEMO_MODE}`);
             await this.createOrUpdateDemoAccount();
-        }
-        const loginRequired = this.configService.get(_serverconstants.AppConstants.OVERRIDE_LOGIN_REQUIRED, null);
-        if (loginRequired !== null) {
-            this.logger.warn(`Setting login required due to ${_serverconstants.AppConstants.OVERRIDE_LOGIN_REQUIRED}`);
-            await this.settingsStore.setLoginRequired(loginRequired);
-        }
-        // If we are in demo mode, do not allow registration
-        if (!isDemoMode) {
+            this.logger.warn(`Setting loginRequired=true and registration=false due to ${_serverconstants.AppConstants.OVERRIDE_IS_DEMO_MODE}`);
+            await this.settingsStore.setLoginRequired(true);
+            await this.settingsStore.setRegistrationEnabled(false);
+        } else {
+            const loginRequired = this.configService.get(_serverconstants.AppConstants.OVERRIDE_LOGIN_REQUIRED, null);
+            if (loginRequired !== null) {
+                this.logger.warn(`Setting login required due to ${_serverconstants.AppConstants.OVERRIDE_LOGIN_REQUIRED}`);
+                await this.settingsStore.setLoginRequired(loginRequired === "true");
+            }
             const registrationEnabled = this.configService.get(_serverconstants.AppConstants.OVERRIDE_REGISTRATION_ENABLED, null);
             if (registrationEnabled !== null) {
                 this.logger.warn(`Setting registration enabled due to ${_serverconstants.AppConstants.OVERRIDE_REGISTRATION_ENABLED}`);
-                await this.settingsStore.setRegistrationEnabled(registrationEnabled);
+                await this.settingsStore.setRegistrationEnabled(registrationEnabled === "true");
             }
         }
         const overrideJwtSecret = this.configService.get(_serverconstants.AppConstants.OVERRIDE_JWT_SECRET, undefined);
@@ -167,7 +170,7 @@ class BootTask {
                 password: demoPassword,
                 isDemoUser: true,
                 isVerified: true,
-                isRootUser: true,
+                isRootUser: false,
                 needsPasswordChange: false,
                 roles: [
                     adminRole.id
@@ -176,8 +179,8 @@ class BootTask {
             this.logger.log("Created demo account");
         } else {
             await this.userService.setVerifiedById(demoUserId, true);
-            await this.userService.setIsRootUserById(demoUserId, true);
-            await this.userService.updatePasswordUnsafe(demoUsername, demoPassword);
+            await this.userService.setIsRootUserById(demoUserId, false);
+            await this.userService.updatePasswordUnsafeByUsername(demoUsername, demoPassword);
             await this.userService.setUserRoleIds(demoUserId, [
                 adminRole.id
             ]);
@@ -189,6 +192,7 @@ class BootTask {
         await (0, _mongoose.connect)((0, _serverenv.fetchMongoDBConnectionString)(), {
             serverSelectionTimeoutMS: 1500
         });
+        await (0, _mongoose.syncIndexes)();
     }
     async migrateDatabase() {
         await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());