From f9f73114183d551095f8528cade474c480817fdc Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Thu, 20 Aug 2026 12:44:39 -0400 Subject: [PATCH] refactor: use public config (#30891) --- web/src/routes/auth/login/+page.svelte | 22 +++++++++++----------- web/src/routes/auth/login/+page.ts | 4 ++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/web/src/routes/auth/login/+page.svelte b/web/src/routes/auth/login/+page.svelte index 78cd5fdba..b505ef1f9 100644 --- a/web/src/routes/auth/login/+page.svelte +++ b/web/src/routes/auth/login/+page.svelte @@ -2,7 +2,6 @@ import { goto } from '$app/navigation'; import AuthPageLayout from '$lib/components/layouts/AuthPageLayout.svelte'; import { eventManager } from '$lib/managers/event-manager.svelte'; - import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte'; import { serverConfigManager } from '$lib/managers/server-config-manager.svelte'; import { Route } from '$lib/route'; import { oauth } from '$lib/utils'; @@ -27,6 +26,7 @@ let oauthLoading = $state(true); const serverConfig = $derived(serverConfigManager.value); + const publicConfig = $derived(data.publicConfig); const onSuccess = async (user: LoginResponseDto) => { await goto(data.continueUrl, { invalidateAll: true }); @@ -37,7 +37,7 @@ const onOnboarding = () => goto(Route.onboarding()); onMount(async () => { - if (!featureFlagsManager.value.oauth) { + if (!publicConfig.oauth.enabled) { oauthLoading = false; return; } @@ -63,7 +63,7 @@ try { if ( - (featureFlagsManager.value.oauthAutoLaunch && !oauth.isAutoLaunchDisabled(location)) || + (publicConfig.oauth.autoLaunch && !oauth.isAutoLaunchDisabled(location)) || oauth.isAutoLaunchEnabled(location) ) { await goto(Route.login({ autoLaunch: 0 }), { replaceState: true }); @@ -128,14 +128,14 @@ - {#if serverConfig.loginPageMessage} + {#if publicConfig.server.loginPageMessage} - {@html serverConfig.loginPageMessage} + {@html publicConfig.server.loginPageMessage} {/if} - {#if !oauthLoading && featureFlagsManager.value.passwordLogin} + {#if !oauthLoading && publicConfig.passwordLogin.enabled}
{#if errorMessage} @@ -153,8 +153,8 @@ {/if} - {#if featureFlagsManager.value.oauth} - {#if featureFlagsManager.value.passwordLogin} + {#if publicConfig.oauth.enabled} + {#if publicConfig.passwordLogin.enabled}

- {serverConfig.oauthButtonText} + {publicConfig.oauth.buttonText} {/if} - {#if !featureFlagsManager.value.passwordLogin && !featureFlagsManager.value.oauth} + {#if !publicConfig.passwordLogin.enabled && !publicConfig.oauth.enabled} {/if} diff --git a/web/src/routes/auth/login/+page.ts b/web/src/routes/auth/login/+page.ts index dceb34050..a1daaf749 100644 --- a/web/src/routes/auth/login/+page.ts +++ b/web/src/routes/auth/login/+page.ts @@ -1,3 +1,4 @@ +import { getPublicConfig } from '@immich/sdk'; import { redirect } from '@sveltejs/kit'; import { authManager } from '$lib/managers/auth-manager.svelte'; import { serverConfigManager } from '$lib/managers/server-config-manager.svelte'; @@ -19,11 +20,14 @@ export const load = (async ({ parent, url }) => { redirect(307, Route.register()); } + const publicConfig = await getPublicConfig(); + const $t = await getFormatter(); return { meta: { title: $t('login'), }, continueUrl, + publicConfig, }; }) satisfies PageLoad;