Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: stop checking api path for auto login when disabled
Kyle Mendell64eb4d3588a9
diff --git a/frontend/src/lib/stores/config-store.svelte.ts b/frontend/src/lib/stores/config-store.svelte.tsindex b2fae8781..113775c9f 100644--- a/frontend/src/lib/stores/config-store.svelte.ts+++ b/frontend/src/lib/stores/config-store.svelte.ts@@ -23,31 +23,8 @@ const set = (settings: Settings) => {});};-// Auto-login state management-const AUTO_LOGIN_DISABLED_KEY = 'arcane_auto_login_disabled';let autoLoginEnabled = $state(false);-const setAutoLoginEnabled = (enabled: boolean) => {- autoLoginEnabled = enabled;-};--const cacheAutoLoginDisabled = (): void => {- if (typeof sessionStorage !== 'undefined') {- sessionStorage.setItem(AUTO_LOGIN_DISABLED_KEY, 'true');- }-};--const isAutoLoginKnownDisabled = (): boolean => {- if (typeof sessionStorage === 'undefined') return false;- return sessionStorage.getItem(AUTO_LOGIN_DISABLED_KEY) === 'true';-};--const clearAutoLoginDisabledCache = (): void => {- if (typeof sessionStorage !== 'undefined') {- sessionStorage.removeItem(AUTO_LOGIN_DISABLED_KEY);- }-};-export default {get current() {return current;@@ -66,9 +43,8 @@ export default {get current() {return autoLoginEnabled;},- set: setAutoLoginEnabled,- cacheDisabled: cacheAutoLoginDisabled,- isKnownDisabled: isAutoLoginKnownDisabled,- clearDisabledCache: clearAutoLoginDisabledCache+ set(enabled: boolean) {+ autoLoginEnabled = enabled;+ }}};diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.tsindex 4bd92ace5..8cade6088 100644--- a/frontend/src/routes/+layout.ts+++ b/frontend/src/routes/+layout.ts@@ -62,36 +62,28 @@ export const load: LayoutLoad = async ({ url }) => {};}- const versionInformationRequest = versionService.getVersionInformation();- const autoLoginConfigRequest = browser- ? queryClient.query({- queryKey: queryKeys.auth.autoLoginConfig(),- queryFn: () => authService.getAutoLoginConfig()- })- : Promise.resolve(null);- let [user, autoLoginConfig] = await Promise.all([+ let [user, versionInformation] = await Promise.all([// Only an explicit rejection signs the user out; transient check failures keep the known user.tryCatch(userService.getCurrentUser()).then((result): User | null => {if (!result.error) return result.data;return isAuthRejectionError(result.error) || isSessionCancelledError(result.error) ? null : userStore.current;}),- autoLoginConfigRequest+ versionService.getVersionInformation()]);-- if (autoLoginConfig) {- if (autoLoginConfig.enabled) {- settingsStore.autoLoginEnabled.set(true);- settingsStore.autoLoginEnabled.clearDisabledCache();- if (!user) {- user = await queryClient.query({- queryKey: queryKeys.auth.autoLoginAttempt(),- queryFn: () => authService.attemptAutoLogin()- });- }- } else {- settingsStore.autoLoginEnabled.set(false);- settingsStore.autoLoginEnabled.cacheDisabled();- }+ const autoLoginConfig =+ browser && versionInformation.enabledFeatures?.includes('autologin')+ ? await queryClient.query({+ queryKey: queryKeys.auth.autoLoginConfig(),+ queryFn: () => authService.getAutoLoginConfig()+ })+ : null;++ settingsStore.autoLoginEnabled.set(autoLoginConfig?.enabled === true);+ if (autoLoginConfig?.enabled && !user) {+ user = await queryClient.query({+ queryKey: queryKeys.auth.autoLoginAttempt(),+ queryFn: () => authService.attemptAutoLogin()+ });}const nextAuthenticatedUserId = user?.id ?? null;@@ -155,7 +147,6 @@ export const load: LayoutLoad = async ({ url }) => {settingsStore.set(settings);}- const versionInformation = await versionInformationRequest;versionStore.seed(versionInformation);// Waiting lets the first page view be traced, but a stalled SDK download must never hold up the app.await Promise.race([