From 8b3047b8fc0b99daba5576b7c75c882f967646c2 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Thu, 5 Feb 2026 23:22:43 -0600 Subject: [PATCH] add frontend per-user session lifecycle - userStorage.ts: per-user localStorage scoping utility with migration - authStore: add userId to UserInfo interface - LoginView: extract user_id from login/auto_login responses - +page.svelte: call activate_user_session after login, deactivate_user_session before logout, set up per-user localStorage --- src/lib/components/views/LoginView.svelte | 11 ++- src/lib/stores/authStore.ts | 1 + src/lib/utils/userStorage.ts | 97 +++++++++++++++++++++++ src/routes/+page.svelte | 28 +++++++ 4 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 src/lib/utils/userStorage.ts diff --git a/src/lib/components/views/LoginView.svelte b/src/lib/components/views/LoginView.svelte index da0f5b70b..0ead0ae2a 100644 --- a/src/lib/components/views/LoginView.svelte +++ b/src/lib/components/views/LoginView.svelte @@ -8,6 +8,7 @@ interface UserInfo { userName: string; + userId: number; subscription: string; subscriptionValidUntil?: string | null; } @@ -71,14 +72,16 @@ if (loggedIn) { clearTimeoutTimer(); const userInfo = await invoke<{ user_name: string; subscription: string; subscription_valid_until?: string | null } | null>('get_user_info'); - if (userInfo) { + const userId = await invoke('get_current_user_id'); + if (userInfo && userId) { onLoginSuccess({ userName: userInfo.user_name, + userId, subscription: userInfo.subscription, subscriptionValidUntil: userInfo.subscription_valid_until ?? null, }); } else { - onLoginSuccess({ userName: 'User', subscription: 'Active' }); + onLoginSuccess({ userName: 'User', userId: userId || 0, subscription: 'Active' }); } return; } @@ -96,6 +99,7 @@ const response = await invoke<{ success: boolean; user_name?: string; + user_id?: number; subscription?: string; subscription_valid_until?: string | null; error?: string; @@ -107,6 +111,7 @@ console.log('Auto-login successful'); onLoginSuccess({ userName: response.user_name || 'User', + userId: response.user_id || 0, subscription: response.subscription || 'Active', subscriptionValidUntil: response.subscription_valid_until ?? null, }); @@ -165,6 +170,7 @@ const response = await invoke<{ success: boolean; user_name?: string; + user_id?: number; subscription?: string; subscription_valid_until?: string | null; error?: string; @@ -187,6 +193,7 @@ onLoginSuccess({ userName: response.user_name || 'User', + userId: response.user_id || 0, subscription: response.subscription || 'Active', subscriptionValidUntil: response.subscription_valid_until ?? null, }); diff --git a/src/lib/stores/authStore.ts b/src/lib/stores/authStore.ts index 64999c72e..20572af6f 100644 --- a/src/lib/stores/authStore.ts +++ b/src/lib/stores/authStore.ts @@ -6,6 +6,7 @@ export interface UserInfo { userName: string; + userId: number; subscription: string; subscriptionValidUntil?: string | null; } diff --git a/src/lib/utils/userStorage.ts b/src/lib/utils/userStorage.ts new file mode 100644 index 000000000..22409ba97 --- /dev/null +++ b/src/lib/utils/userStorage.ts @@ -0,0 +1,97 @@ +/** + * Per-user localStorage scoping + * + * Prefixes localStorage keys with the active Qobuz user ID so that + * different accounts get independent UI preferences. + * + * Keys follow the pattern: `qbz.{userId}.{originalKey}` + * When no user is active, falls back to the original key (pre-migration). + */ + +let currentUserId: number | null = null; + +const MIGRATION_MARKER_PREFIX = 'qbz.__migrated_to_user.'; + +/** + * Set the active user ID for localStorage scoping. + * Called after login, before any store reads. + */ +export function setStorageUserId(userId: number | null): void { + currentUserId = userId; +} + +/** + * Get the current storage user ID. + */ +export function getStorageUserId(): number | null { + return currentUserId; +} + +/** + * Build a user-scoped key from an original key. + * `qbz-theme` → `qbz.12345678.qbz-theme` + */ +function userKey(key: string): string { + if (currentUserId === null) { + return key; + } + return `qbz.${currentUserId}.${key}`; +} + +/** + * Read a per-user localStorage value. + */ +export function getUserItem(key: string): string | null { + return localStorage.getItem(userKey(key)); +} + +/** + * Write a per-user localStorage value. + */ +export function setUserItem(key: string, value: string): void { + localStorage.setItem(userKey(key), value); +} + +/** + * Remove a per-user localStorage value. + */ +export function removeUserItem(key: string): void { + localStorage.removeItem(userKey(key)); +} + +/** + * One-time migration of old global `qbz-*` keys to user-scoped keys. + * + * Copies (not moves) existing values so that a rollback to an older + * version still works. The marker prevents re-running. + */ +export function migrateLocalStorage(userId: number): void { + const marker = `${MIGRATION_MARKER_PREFIX}${userId}`; + if (localStorage.getItem(marker)) { + return; + } + + let migrated = 0; + for (let i = 0; i < localStorage.length; i++) { + const key = localStorage.key(i); + if (!key || !key.startsWith('qbz-')) continue; + // Skip keys that are already user-scoped + if (key.startsWith('qbz.')) continue; + + const value = localStorage.getItem(key); + if (value !== null) { + const scoped = `qbz.${userId}.${key}`; + // Only copy if the user-scoped key doesn't already exist + if (localStorage.getItem(scoped) === null) { + localStorage.setItem(scoped, value); + migrated++; + } + } + } + + localStorage.setItem(marker, String(Date.now())); + + if (migrated > 0) { + console.log(`[userStorage] Migrated ${migrated} localStorage keys for user ${userId}`); + } +} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 535c58639..83aa731c6 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -97,6 +97,7 @@ getAuthState, type UserInfo } from '$lib/stores/authStore'; + import { setStorageUserId, migrateLocalStorage } from '$lib/utils/userStorage'; // Favorites state management import { loadFavorites } from '$lib/stores/favoritesStore'; @@ -2172,6 +2173,7 @@ await setManualOffline(true); setLoggedIn({ userName: 'Offline User', + userId: 0, subscription: 'Local Library Only' }); navigateTo('library'); @@ -2179,6 +2181,23 @@ } async function handleLoginSuccess(info: UserInfo) { + // Activate per-user backend state before anything else + if (info.userId) { + try { + await invoke('activate_user_session', { userId: info.userId }); + console.log('[Session] Per-user session activated for user', info.userId); + } catch (err) { + console.error('[Session] Failed to activate user session:', err); + // Non-fatal: app works but uses empty stores + } + } + + // Set up per-user localStorage scoping and migrate old keys + setStorageUserId(info.userId || null); + if (info.userId) { + migrateLocalStorage(info.userId); + } + setLoggedIn(info); showToast($t('toast.welcomeUser', { values: { name: info.userName } }), 'success'); @@ -2303,6 +2322,15 @@ console.error('Failed to clear credentials:', clearErr); // Don't block logout if clearing fails } + // Deactivate per-user backend state (closes DB connections) + try { + await invoke('deactivate_user_session'); + console.log('[Session] Per-user session deactivated'); + } catch (deactivateErr) { + console.error('[Session] Failed to deactivate user session:', deactivateErr); + } + // Clear per-user localStorage scoping + setStorageUserId(null); // Clear session state await clearSession(); setLoggedOut();