Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

✨ Allows enableAuthProxyCompat in OIDC mode

Alicia Sykes31d7204b89a3
diff --git a/services/auth-oidc.js b/services/auth-oidc.js
index 46b314c2..54783109 100644
--- a/services/auth-oidc.js
+++ b/services/auth-oidc.js
@@ -156,6 +156,7 @@ function maybeBootstrapConfig(filePath, opts) {
appConfig: {
auth: full.appConfig?.auth || {},
enableServiceWorker: full.appConfig?.enableServiceWorker,
+ enableAuthProxyCompat: full.appConfig?.enableAuthProxyCompat,
},
pageInfo: { title: `Login | ${full.pageInfo?.title || 'Dashy'}` },
});
diff --git a/src/utils/InitServiceWorker.js b/src/utils/InitServiceWorker.js
index eeb3f673..c3872e56 100644
--- a/src/utils/InitServiceWorker.js
+++ b/src/utils/InitServiceWorker.js
@@ -55,13 +55,13 @@ const setReloadGuard = (on) => {
*/
const recoverFromAuthProxy = async () => {
try { if (localStorage.getItem(AUTH_PROXY_COMPAT_KEY) !== '1') return false; } catch { return false; }
- if (!navigator.serviceWorker.controller) { setReloadGuard(false); return false; }
- if (isReloadGuardSet()) return false;
let res;
try {
res = await fetch(serviceEndpoints.getUser, { cache: 'no-store', redirect: 'manual' });
} catch { return false; } // network error / offline - keep SW for offline use
- if (res.type !== 'opaqueredirect') { setReloadGuard(false); return false; } // valid session - reset
+ if (res.type !== 'opaqueredirect') { setReloadGuard(false); return false; } // valid session - re-arm
+ if (!navigator.serviceWorker.controller) return false; // no cached SW blocking the redirect
+ if (isReloadGuardSet()) return false; // already reloaded once - avoid repeat on false positives
setReloadGuard(true);
statusMsg(SW_LABEL, 'Auth proxy redirect detected - unregistering SW and reloading.');
await unregisterAll();