Fix bug

Akkadius · Jan 20, 2020 · de02a94 · de02a94
1 parent 2b8f1b7
commit de02a94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/core/auth-service.js b/app/core/auth-service.js
@@ -44,7 +44,7 @@ module.exports = {
     if (!this.appKey) {
       this.appKey = uuidv4();
       eqemuConfigService.setAdminPanelConfig('application.key', this.appKey);
-      eqemuConfigService.saveServerConfig(this.getServerConfig());
+      eqemuConfigService.saveServerConfig();
     }
 
     return this;
@@ -72,7 +72,7 @@ module.exports = {
         'application.admin.password',
         this.genRandomString(30)
       );
-
+      
       eqemuConfigService.saveServerConfig();
     }
 

diff --git a/app/core/eqemu-config-service.js b/app/core/eqemu-config-service.js
@@ -69,6 +69,8 @@ module.exports = {
   getFreshServerConfig() {
     this.serverConfig = JSON.parse(fs.readFileSync(this.getServerConfigPath(), 'utf8'));
 
+    debug("[getFreshServerConfig] fetching");
+
     return this.serverConfig;
   },
 
@@ -127,7 +129,7 @@ module.exports = {
    */
   saveServerConfig(data = undefined) {
     if (!data) {
-      data = this.getFreshServerConfig()
+      data = this.getServerConfig()
     }
 
     debug('[saveServerConfig] writing config')
@@ -172,8 +174,10 @@ module.exports = {
     debug("[getAdminPanelConfig] config [%s] = [%s] default [%s]", accessor, configVar, defaultValue);
 
     if (typeof configVar === "undefined" && defaultValue !== "") {
+      debug("[getAdminPanelConfig] writing default value for [%s] default [%s]", accessor, defaultValue);
+
       this.setAdminPanelConfig(accessor, defaultValue);
-      this.saveServerConfig();
+      this.saveServerConfig(this.serverConfig);
     }
 
     return (configVar ? configVar : defaultValue)