Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Add back in checks for pending migration and API auth errors (#1617)
Leendert de Borst0148a2967afa
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.tsindex 747ebbebd..74b6fc042 100644--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts@@ -7,6 +7,7 @@ import type { Vault, VaultResponse, VaultPostResponse } from '@/utils/dist/core/import { EncryptionUtility } from '@/utils/EncryptionUtility';import { SqliteClient } from '@/utils/SqliteClient';import { getItemWithFallback } from '@/utils/StorageUtility';+import { ApiAuthError } from '@/utils/types/errors/ApiAuthError';import { NetworkError } from '@/utils/types/errors/NetworkError';import { VaultVersionIncompatibleError } from '@/utils/types/errors/VaultVersionIncompatibleError';import { BoolResponse as messageBoolResponse } from '@/utils/types/messaging/BoolResponse';@@ -1155,12 +1156,17 @@ export async function handleFullVaultSync(): Promise<FullVaultSyncResult> {const errorMessage = err instanceof Error ? err.message : 'Unknown error during vault sync';console.error('Vault sync error:', err);- // Check if it's a version-related error+ // Version incompatibility requires logoutif (err instanceof VaultVersionIncompatibleError) {return { success: false, hasNewVault: false, wasOffline: false, upgradeRequired: false, requiresLogout: true, error: errorMessage };}- // Check if it's a network error - enter offline mode+ // Auth error (session expired) - signal popup to trigger logout+ if (err instanceof ApiAuthError) {+ return { success: false, hasNewVault: false, wasOffline: false, upgradeRequired: false, requiresLogout: true, errorKey: 'sessionExpired' };+ }++ // Network error - enter offline mode if we have a local vaultif (err instanceof NetworkError) {const encryptedVault = await storage.getItem('local:encryptedVault');if (encryptedVault) {diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.tsindex 8e96828f1..08dd5023f 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultSync.ts@@ -46,7 +46,6 @@ export const useVaultSync = (): { syncVault: (options?: VaultSyncOptions) => Proreturn false;}- // Show checking status (don't show syncing indicator yet - only if server has new vault)onStatus?.(t('common.checkingVaultUpdates'));// Delegate to background script for full sync orchestration@@ -54,9 +53,7 @@ export const useVaultSync = (): { syncVault: (options?: VaultSyncOptions) => Pro// Handle logout requirementif (result.requiresLogout) {- const errorMessage = result.errorKey- ? t('common.errors.' + result.errorKey)- : result.error;+ const errorMessage = result.errorKey ? t('common.errors.' + result.errorKey) : result.error;await app.logout(errorMessage);return false;}@@ -83,9 +80,7 @@ export const useVaultSync = (): { syncVault: (options?: VaultSyncOptions) => Pro// Handle errorsif (!result.success) {- const errorMessage = result.errorKey- ? t('common.errors.' + result.errorKey)- : result.error ?? t('common.errors.unknownError');+ const errorMessage = result.errorKey ? t('common.errors.' + result.errorKey) : result.error ?? t('common.errors.unknownError');onError?.(errorMessage);return false;}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/Reinitialize.tsx b/apps/browser-extension/src/entrypoints/popup/pages/Reinitialize.tsxindex 8970d7704..c14bfec87 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/Reinitialize.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/Reinitialize.tsx@@ -33,7 +33,7 @@ const Reinitialize: React.FC = () => {// Auth and DB stateconst { isInitialized: authInitialized, isLoggedIn } = useApp();- const { dbInitialized, dbAvailable, refreshSyncState } = useDb();+ const { dbInitialized, dbAvailable, refreshSyncState, hasPendingMigrations } = useDb();// Derived stateconst isFullyInitialized = authInitialized && dbInitialized;@@ -109,6 +109,13 @@ const Reinitialize: React.FC = () => {// Only perform vault sync once during initializationhasInitialized.current = true;+ // Check for pending migrations before navigating+ if (await hasPendingMigrations()) {+ setIsInitialLoading(false);+ navigate('/upgrade', { replace: true });+ return;+ }+/** Navigate immediately using local vault - don't block on sync.* This ensures the UI is responsive even if server is slow.diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsxindex 936aae1f6..bb54f8673 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Login.tsx@@ -20,7 +20,6 @@ import { AppInfo } from '@/utils/AppInfo';import { SrpAuthService } from '@/utils/auth/SrpAuthService';import type { VaultResponse, LoginResponse } from '@/utils/dist/core/models/webapi';import { EncryptionUtility } from '@/utils/EncryptionUtility';-import SqliteClient from '@/utils/SqliteClient';import { ApiAuthError } from '@/utils/types/errors/ApiAuthError';import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';@@ -59,9 +58,8 @@ const Login: React.FC = () => {/*** Helper to persist and load vault after successful authentication.* Checks if local vault exists from forced logout and preserves it if more advanced.- * @returns The initialized SqliteClient*/- const persistAndLoadVault = async (vaultResponse: VaultResponse, encryptionKey: string): Promise<SqliteClient> => {+ const persistAndLoadVault = async (vaultResponse: VaultResponse, encryptionKey: string): Promise<void> => {// Check if there's existing vault data (from forced logout)const existingVault = await storage.getItem('local:encryptedVault') as string | null;const existingRevision = await storage.getItem('local:serverRevision') as number | null;@@ -91,7 +89,8 @@ const Login: React.FC = () => {hiddenPrivateEmailDomainList: vaultResponse.vault.hiddenPrivateEmailDomainList,}, 'background');- return dbContext.loadDatabase(decryptedExisting);+ await dbContext.loadDatabase(decryptedExisting);+ return;}// Server is more advanced - will overwrite local@@ -119,7 +118,7 @@ const Login: React.FC = () => {// Decrypt and load the vault into memoryconst decryptedVault = await EncryptionUtility.symmetricDecrypt(vaultToLoad, encryptionKey);- return dbContext.loadDatabase(decryptedVault);+ await dbContext.loadDatabase(decryptedVault);};/**@@ -149,32 +148,23 @@ const Login: React.FC = () => {});/*- * Persist and load the vault+ * Persist and load the vault.* If there was a forced logout, persistAndLoadVault checks existing vault data:* - If local vault is more advanced → preserves it (will upload via sync in /reinitialize)* - If server is more advanced → uses server vault* - If password changed (can't decrypt) → uses server vault*/- const sqliteClient = await persistAndLoadVault(vaultResponseJson, passwordHashBase64);-- // If there are pending migrations, redirect to the upgrade page.- try {- if (await sqliteClient.hasPendingMigrations()) {- navigate('/upgrade', { replace: true });- hideLoading();- return;- }- } catch (err) {- await app.logout();- setError(err instanceof Error ? err.message : t('common.errors.unknownError'));- hideLoading();- return;- }+ await persistAndLoadVault(vaultResponseJson, passwordHashBase64);// Reset prefill flag so next logout will prefill againusernamePrefillAttempted = false;- // Navigate to reinitialize page which will take care of the proper redirect.+ /*+ * Navigate to reinitialize page which will:+ * 1. Call syncVault() to check version compatibility+ * 2. Handle pending migrations via onUpgradeRequired callback+ * 3. Navigate to appropriate page+ */navigate('/reinitialize', { replace: true });// Show app.@@ -391,24 +381,14 @@ const Login: React.FC = () => {});// Persist and load the vault- const sqliteClient = await persistAndLoadVault(vaultResponse, result.decryptionKey);-- // Check for pending migrations- try {- if (await sqliteClient.hasPendingMigrations()) {- navigate('/upgrade', { replace: true });- hideLoading();- setIsInitialLoading(false);- return;- }- } catch (err) {- await app.logout();- setError(err instanceof Error ? err.message : t('common.errors.unknownError'));- hideLoading();- return;- }+ await persistAndLoadVault(vaultResponse, result.decryptionKey);- // Navigate to reinitialize page+ /*+ * Navigate to reinitialize page which will:+ * 1. Call syncVault() to check version compatibility+ * 2. Handle pending migrations via onUpgradeRequired callback+ * 3. Navigate to appropriate page+ */hideLoading();setIsInitialLoading(false);navigate('/reinitialize', { replace: true });