This commit is contained in:
Koenkk
2019-10-28 18:05:50 +01:00
parent cb3ec45294
commit 646cd34715
2 changed files with 13 additions and 0 deletions
+8
View File
@@ -247,6 +247,10 @@ function write() {
toWrite.mqtt.password = actual.mqtt.password;
}
if (actual.advanced && actual.advanced.network_key) {
toWrite.advanced.network_key = actual.advanced.network_key;
}
if (typeof actual.devices === 'string') {
yaml.writeIfChanged(data.joinPath(actual.devices), settings.devices);
toWrite.devices = actual.devices;
@@ -300,6 +304,10 @@ function read() {
s.mqtt.password = interpetValue(s.mqtt.password);
}
if (s.advanced && s.advanced.network_key) {
s.advanced.network_key = interpetValue(s.advanced.network_key);
}
// Read devices/groups configuration from separate file.
if (typeof s.devices === 'string') {
const file = data.joinPath(s.devices);
+5
View File
@@ -99,11 +99,15 @@ describe('Settings', () => {
user: '!secret username',
password: '!secret password',
},
advanced: {
network_key: '!secret network_key'
}
};
const contentSecret = {
username: 'mysecretusername',
password: 'mysecretpassword',
network_key: [1,2,3],
};
write(secretFile, contentSecret, false);
@@ -117,6 +121,7 @@ describe('Settings', () => {
};
expect(settings.get().mqtt).toStrictEqual(expected);
expect(settings.get().advanced.network_key).toStrictEqual([1,2,3]);
settings._write();
expect(read(configurationFile)).toStrictEqual(contentConfiguration);