Skip to content

Modern Docker Management, Designed for Everyone

fix: user display not showing in sidebar

Kyle Mendelle059cf2cb1ce
diff --git a/frontend/src/hooks.client.ts b/frontend/src/hooks.client.ts
index a37326402..2f9fb0858 100644
--- a/frontend/src/hooks.client.ts
+++ b/frontend/src/hooks.client.ts
@@ -1,13 +1,19 @@
-import { sequence } from '@sveltejs/kit/hooks';
-import type { Handle } from '@sveltejs/kit';
-import { building } from '$app/environment';
+import type { HandleClientError } from '@sveltejs/kit';
+import { AxiosError } from 'axios';
-const initHandler: Handle = async ({ event, resolve }) => {
- if (building) {
- return resolve(event);
+export const handleError: HandleClientError = async ({ error, message, status }) => {
+ if (error instanceof AxiosError) {
+ message = error.response?.data.error || message;
+ status = error.response?.status || status;
+ console.error(
+ `Axios error: ${error.request.path} - ${error.response?.data.error ?? error.message}`
+ );
+ } else {
+ console.error(error);
}
- return resolve(event);
+ return {
+ message,
+ status
+ };
};
-
-export const handle = sequence(initHandler);
diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelte
index 663a7e2e1..03bf9c7bd 100644
--- a/frontend/src/lib/components/sidebar/sidebar.svelte
+++ b/frontend/src/lib/components/sidebar/sidebar.svelte
@@ -13,6 +13,7 @@
import type { AppVersionInformation } from '$lib/types/application-configuration';
import SidebarLogo from './sidebar-logo.svelte';
import SidebarUpdatebanner from './sidebar-updatebanner.svelte';
+ import userStore from '$lib/stores/user-store';
let {
ref = $bindable(null),
@@ -27,6 +28,16 @@
const sidebar = useSidebar();
+ // Fallback to global user store so the user block appears immediately after login
+ let storeUser: User | null = $state(null);
+ $effect(() => {
+ const unsub = userStore.subscribe((u) => (storeUser = u));
+ return unsub;
+ });
+ const effectiveUser = $derived(user ?? storeUser);
+
+ console.log('USEROBJECT: ', user);
+
const isCollapsed = $derived(sidebar.state === 'collapsed');
</script>
@@ -47,8 +58,8 @@
{versionInformation}
updateAvailable={versionInformation.updateAvailable}
/>
- {#if user}
- <SidebarUser {isCollapsed} {user} />
+ {#if effectiveUser}
+ <SidebarUser {isCollapsed} user={effectiveUser} />
{/if}
</Sidebar.Footer>
<Sidebar.Rail />
diff --git a/frontend/src/lib/services/api/auth-api-service.ts b/frontend/src/lib/services/api/auth-api-service.ts
index eaaa62a9c..5c433c89a 100644
--- a/frontend/src/lib/services/api/auth-api-service.ts
+++ b/frontend/src/lib/services/api/auth-api-service.ts
@@ -3,33 +3,20 @@ import { browser } from '$app/environment';
import { invalidateAll } from '$app/navigation';
import BaseAPIService from './api-service';
import userStore from '$lib/stores/user-store';
+import type { User } from '$lib/types/user.type';
export interface LoginCredentials {
username: string;
password: string;
}
-export interface User {
- id: string;
- username: string;
- email?: string;
- role?: string;
-}
-
export class AuthService extends BaseAPIService {
async login(credentials: LoginCredentials): Promise<User> {
try {
const response = await this.api.post('/auth/login', credentials);
- const user = response.data.user || response.data.data;
+ const user = response.data.user as User;
- // Store user in the store
- if (user) {
- userStore.setUser(user);
- }
-
- if (browser) {
- await invalidateAll();
- }
+ userStore.setUser(user);
return user;
} catch (error: any) {
diff --git a/frontend/src/lib/utils/redirect.util.ts b/frontend/src/lib/utils/redirect.util.ts
index 915d94670..e7fb92084 100644
--- a/frontend/src/lib/utils/redirect.util.ts
+++ b/frontend/src/lib/utils/redirect.util.ts
@@ -19,16 +19,12 @@ const PROTECTED_RE = new RegExp(`^/(?:${PROTECTED_PREFIXES.map(escapeRe).join('|
const isProtectedPath = (path: string) => {
const result = PROTECTED_RE.test(path);
- console.log(`Testing path: "${path}" against regex | Result: ${result}`);
- console.log(`Regex pattern: ${PROTECTED_RE.source}`);
return result;
};
export function getAuthRedirectPath(path: string, user: User | null, settings: Settings | null) {
const isSignedIn = !!user;
- console.log(`Path: ${path}, isProtected: ${isProtectedPath(path)}, isSignedIn: ${isSignedIn}`);
-
const isUnauthenticatedOnlyPath =
path === '/auth/login' ||
path.startsWith('/auth/login/') ||
diff --git a/frontend/src/routes/auth/login/+page.svelte b/frontend/src/routes/auth/login/+page.svelte
index 943cdc8e0..950e0dda0 100644
--- a/frontend/src/routes/auth/login/+page.svelte
+++ b/frontend/src/routes/auth/login/+page.svelte
@@ -8,6 +8,8 @@
import type { PageData } from './$types';
import { goto, invalidateAll } from '$app/navigation';
import { authService } from '$lib/services/api/auth-api-service';
+ import { toast } from 'svelte-sonner';
+ import userStore from '$lib/stores/user-store';
let { data }: { data: PageData } = $props();
@@ -39,8 +41,11 @@
error = null;
try {
- await authService.login({ username, password });
+ const user = await authService.login({ username, password });
+ userStore.setUser(user);
const redirectTo = data.redirectTo || '/dashboard';
+ toast.success(`Welcome Back, ${user.displayName}`);
+ await invalidateAll();
goto(redirectTo);
} catch (err) {
error = err instanceof Error ? err.message : 'Login failed';
diff --git a/frontend/src/routes/auth/oidc/callback/+page.svelte b/frontend/src/routes/auth/oidc/callback/+page.svelte
index 9fe0af072..7d65165fd 100644
--- a/frontend/src/routes/auth/oidc/callback/+page.svelte
+++ b/frontend/src/routes/auth/oidc/callback/+page.svelte
@@ -74,8 +74,9 @@
};
userStore.setUser(user);
+ await invalidateAll();
toast.success(`Welcome Back, ${user.displayName}`);
- goto(redirectTo);
+ goto(redirectTo, { replaceState: true });
} else {
error = 'Authentication succeeded but user information is missing.';
setTimeout(() => goto('/auth/login?error=oidc_user_info_missing'), 3000);