diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 44ee7b26..832783b4 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -224,39 +224,45 @@ if (!$ae_loc?.last_cache_refresh) { // Default is null, currently... console.log(`ROOT: Last diff: ${Date.now() - $ae_loc?.last_cache_refresh}`); } - if ($ae_loc?.manager_access && (Date.now() - $ae_loc?.last_cache_refresh) > manager_refresh_time) { - console.log(`ROOT: Last (manager) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`); + if ($ae_loc?.manager_access) { + if ((Date.now() - $ae_loc?.last_cache_refresh) > manager_refresh_time) { + console.log(`ROOT: Last (manager) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`); - flag_clear_idb = true; - flag_clear_local = true; - flag_clear_sess = true; - flag_reload = true; - flag_expired = true; + flag_clear_idb = true; + flag_clear_local = true; + flag_clear_sess = true; + flag_reload = true; + flag_expired = true; - $ae_loc.cache_expired = true; - $ae_loc.allow_access = false; - } else if ($ae_loc?.trusted_access && (Date.now() - $ae_loc?.last_cache_refresh) > trusted_refresh_time) { - console.log(`ROOT: Last (trusted) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`); + $ae_loc.cache_expired = true; + $ae_loc.allow_access = false; + } + } else if ($ae_loc?.trusted_access) { + if ((Date.now() - $ae_loc?.last_cache_refresh) > trusted_refresh_time) { + console.log(`ROOT: Last (trusted) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`); - flag_clear_idb = true; - flag_clear_local = true; - flag_clear_sess = true; - flag_reload = true; - flag_expired = true; + flag_clear_idb = true; + flag_clear_local = true; + flag_clear_sess = true; + flag_reload = true; + flag_expired = true; - $ae_loc.cache_expired = true; - $ae_loc.allow_access = false; - } else if ($ae_loc?.authenticated_access && (Date.now() - $ae_loc?.last_cache_refresh) > authenticated_refresh_time) { - console.log(`ROOT: Last (authenticated) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`); + $ae_loc.cache_expired = true; + $ae_loc.allow_access = false; + } + } else if ($ae_loc?.authenticated_access) { + if ((Date.now() - $ae_loc?.last_cache_refresh) > authenticated_refresh_time) { + console.log(`ROOT: Last (authenticated) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`); - flag_clear_idb = true; - flag_clear_local = true; - flag_clear_sess = true; - flag_reload = true; - flag_expired = true; + flag_clear_idb = true; + flag_clear_local = true; + flag_clear_sess = true; + flag_reload = true; + flag_expired = true; - $ae_loc.cache_expired = true; - $ae_loc.allow_access = false; + $ae_loc.cache_expired = true; + $ae_loc.allow_access = false; + } } else if ((Date.now() - $ae_loc?.last_cache_refresh) > default_refresh_time) { console.log(`ROOT: Last (default) local config reload too old for all caches: ${$ae_loc.last_cache_refresh}`);