cclohmar/NextNVR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: move auth collection after config fetch — lexical scope bug

Browse source
This commit is contained in:
Claus Lohmar 2026-08-06 17:20:15 +01:00
parent 4a9266e249
commit ef41c29981
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
public/app.js
View file

@ -383,6 +383,12 @@ document.getElementById('btn-save').addEventListener('click', async () => {
}); });
try { try {
// Fetch current config.
const cr = await fetch(API + '/config');
const cj = await cr.json();
const cfg = cj.data || {};
cfg.cameras = updatedCameras;
// Include auth settings from the management card. // Include auth settings from the management card.
const authEnabled = document.querySelector('[data-auth="auth-enabled"]')?.checked || false; const authEnabled = document.querySelector('[data-auth="auth-enabled"]')?.checked || false;
const masterUser = document.querySelector('[data-auth="master-user"]')?.value || ''; const masterUser = document.querySelector('[data-auth="master-user"]')?.value || '';
@ -390,23 +396,15 @@ document.getElementById('btn-save').addEventListener('click', async () => {
const viewerUser = document.querySelector('[data-auth="viewer-user"]')?.value || ''; const viewerUser = document.querySelector('[data-auth="viewer-user"]')?.value || '';
const viewerPass = document.querySelector('[data-auth="viewer-pass"]')?.value || ''; const viewerPass = document.querySelector('[data-auth="viewer-pass"]')?.value || '';
const viewerEnabled = document.querySelector('[data-auth="viewer-enabled"]')?.checked || false; const viewerEnabled = document.querySelector('[data-auth="viewer-enabled"]')?.checked || false;
cfg.auth = cfg.auth || {}; cfg.auth = cfg.auth || {};
cfg.auth.enabled = authEnabled; cfg.auth.enabled = authEnabled;
cfg.auth.master = cfg.auth.master || {};
cfg.auth.master.username = masterUser; cfg.auth.master.username = masterUser;
cfg.auth.viewer = cfg.auth.viewer || {};
cfg.auth.viewer.username = viewerUser; cfg.auth.viewer.username = viewerUser;
cfg.auth.viewer.enabled = viewerEnabled || false; cfg.auth.viewer.enabled = viewerEnabled || false;
if (masterPass) { cfg.auth.master.password = masterPass; cfg.auth.master.enabled = true; } if (masterPass) { cfg.auth.master.password = masterPass; cfg.auth.master.enabled = true; }
if (viewerPass) { cfg.auth.viewer.password = viewerPass; } if (viewerPass) { cfg.auth.viewer.password = viewerPass; }
// Fetch current config, then post updated version.
const cr = await fetch(API + '/config');
const cj = await cr.json();
const cfg = cj.data || {};
cfg.cameras = updatedCameras;
const r = await fetch(API + '/config', { const r = await fetch(API + '/config', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },