dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-25 12:09:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add specifying auth_token in a different file (#5537)

Browse Source 
* Add specifying auth_token in a different file

* Update settings.js

* Update settings.js

* Update settings.js

Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
This commit is contained in:
Igor Listopad
2021-01-04 19:32:03 +01:00
committed by GitHub
co-authored by Koen Kanters
parent 5336ed9d9d
commit 660796a1e4
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/util/settings.js
+10 -1
View File
@@ -314,7 +314,12 @@ function write() {
const actual = yaml.read(file);
// In case the setting is defined in a separte file (e.g. !secret network_key) update it there.
for (const path of [['mqtt', 'user'], ['mqtt', 'password'], ['advanced', 'network_key']]) {
for (const path of [
['mqtt', 'user'],
['mqtt', 'password'],
['advanced', 'network_key'],
['frontend', 'auth_token'],
]) {
if (actual[path[0]] && actual[path[0]][path[1]]) {
const match = /!(.*) (.*)/g.exec(actual[path[0]][path[1]]);
if (match) {
@@ -439,6 +444,10 @@ function read() {
s.advanced.network_key = interpetValue(s.advanced.network_key);
}
if (s.frontend && s.frontend.auth_token) {
s.frontend.auth_token = interpetValue(s.frontend.auth_token);
}
// Read devices/groups configuration from separate file if specified.
const readDevicesOrGroups = (type) => {
if (typeof s[type] === 'string' || Array.isArray(s[type])) {