Finish #2201.

Koenkk · Oct 25, 2019 · 78531a0 · 78531a0
1 parent 505be31
commit 78531a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/util/settings.js b/lib/util/settings.js
@@ -242,6 +242,11 @@ function write() {
 
     // Read settings to check if we have to split devices/groups into separate file.
     const actual = yaml.read(file);
+    if (actual.mqtt && actual.mqtt.password && actual.mqtt.user) {
+        toWrite.mqtt.user = actual.mqtt.user;
+        toWrite.mqtt.password = actual.mqtt.password;
+    }
+
     if (typeof actual.devices === 'string') {
         yaml.writeIfChanged(data.joinPath(actual.devices), settings.devices);
         toWrite.devices = actual.devices;
@@ -581,6 +586,7 @@ module.exports = {
     changeFriendlyName,
 
     // For tests only
+    _write: write,
     _reRead: () => {
         _settings = read();
         _settingsWithDefaults = objectAssignDeep.noMutate(defaults, get());

diff --git a/test/settings.test.js b/test/settings.test.js
@@ -117,6 +117,9 @@ describe('Settings', () => {
         };
 
         expect(settings.get().mqtt).toStrictEqual(expected);
+
+        settings._write();
+        expect(read(configurationFile)).toStrictEqual(contentConfiguration);
     });
 
     it('Should read devices form a separate file', () => {