Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update email components to handle offline mode (#1473)
Leendert de Borstfdaaf96cc2a5
diff --git a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsxindex 75934940b..5325c3e00 100644--- a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx@@ -74,6 +74,12 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) => {*/const loadEmails = async (): Promise<void> => {try {+ // Check if we are in offline mode+ if (dbContext.isOffline) {+ setLoading(false);+ return;+ }+setError(null);const isPublic = await isPublicDomain(email);const isPrivate = await isPrivateDomain(email);@@ -164,8 +170,10 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) => {// Try to parse as error response insteadconst apiErrorResponse = response as ApiErrorResponse;- // Suppress errors while vault has unsynced changes (e.g., after item creation)- // The server may not know about newly created items/aliases yet+ /*+ * Suppress errors while vault has unsynced changes (e.g., after item creation)+ * The server may not know about newly created items/aliases yet+ */if (dbContext.shouldSuppressEmailErrors()) {// Don't set error, keep loading state - will retry on next intervalreturn;@@ -202,6 +210,18 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) => {return null;}+ // Show offline message if in offline mode+ if (dbContext.isOffline) {+ return (+ <div className="text-gray-500 dark:text-gray-400 mb-4">+ <div className="flex items-center gap-2 mb-2">+ <h2 className="text-xl font-semibold text-gray-900 dark:text-white">{t('common.recentEmails')}</h2>+ </div>+ <p className="text-sm">{t('emails.offlineMessage')}</p>+ </div>+ );+ }+if (error) {return (<div className="text-gray-500 dark:text-gray-400 mb-4">diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsxindex 2edbf31fb..9ad1e8b60 100644--- a/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/Details/FieldHistoryModal.tsx@@ -1,4 +1,4 @@-import React, { useState, useEffect } from 'react';+import React, { useState, useEffect, useCallback } from 'react';import { useTranslation } from 'react-i18next';import ModalWrapper from '@/entrypoints/popup/components/Dialogs/ModalWrapper';@@ -47,7 +47,7 @@ const FieldHistoryModal: React.FC<FieldHistoryModalProps> = ({/*** Load field history from the database.*/- const loadHistory = (): void => {+ const loadHistory = useCallback(async (): Promise<void> => {if (!dbContext?.sqliteClient) {return;}@@ -61,14 +61,14 @@ const FieldHistoryModal: React.FC<FieldHistoryModalProps> = ({} finally {setLoading(false);}- };+ }, [dbContext?.sqliteClient, itemId, fieldKey]);useEffect(() => {if (!isOpen) {return;}loadHistory();- }, [isOpen, dbContext?.sqliteClient, itemId, fieldKey]);+ }, [isOpen, dbContext?.sqliteClient, itemId, fieldKey, loadHistory]);/*** Format a date string to a human readable format.diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsxindex 9dc78ecfc..4264895a9 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailDetails.tsx@@ -57,6 +57,14 @@ const EmailDetails: React.FC = (): React.ReactElement => {return;}+ // Check if we are in offline mode+ if (dbContext.isOffline) {+ setError(t('emails.offlineMessage'));+ setIsLoading(false);+ setIsInitialLoading(false);+ return;+ }+const response = await webApi.get<Email>(`Email/${id}`);// Decrypt email locally using public/private key pairs@@ -72,7 +80,7 @@ const EmailDetails: React.FC = (): React.ReactElement => {};loadEmail();- }, [id, dbContext?.sqliteClient, webApi, setIsLoading, setIsInitialLoading]);+ }, [id, dbContext?.sqliteClient, dbContext.isOffline, t, webApi, setIsLoading, setIsInitialLoading]);/*** Handle deleting an email.diff --git a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsxindex 3ee8a8ac8..c9b0e7312 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/emails/EmailsList.tsx@@ -46,6 +46,13 @@ const EmailsList: React.FC = () => {return;}+ // Check if we are in offline mode+ if (dbContext.isOffline) {+ setIsLoading(false);+ setIsInitialLoading(false);+ return;+ }+// Get unique email addresses from all credentials.const emailAddresses = dbContext.sqliteClient.items.getAllEmailAddresses();@@ -74,7 +81,7 @@ const EmailsList: React.FC = () => {setIsLoading(false);setIsInitialLoading(false);}- }, [dbContext?.sqliteClient, webApi, setIsLoading, setIsInitialLoading, t]);+ }, [dbContext?.sqliteClient, dbContext.isOffline, webApi, setIsLoading, setIsInitialLoading, t]);useEffect(() => {loadEmails();@@ -147,6 +154,22 @@ const EmailsList: React.FC = () => {return <div className="text-red-500">{t('common.error')}: {error}</div>;}+ // Show offline message if in offline mode+ if (dbContext.isOffline) {+ return (+ <div>+ <div className="flex justify-between items-center mb-4">+ <h2 className="text-gray-900 dark:text-white text-xl">{t('emails.title')}</h2>+ </div>+ <div className="text-gray-500 dark:text-gray-400 space-y-2">+ <p className="text-sm">+ {t('emails.offlineMessage')}+ </p>+ </div>+ </div>+ );+ }+if (emails.length === 0) {return (<div>diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex b3a84ebd8..fe09ee531 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -306,6 +306,7 @@"emailNotFound": "Email not found","noEmails": "No emails found","noEmailsDescription": "You have not received any emails at your private email addresses yet. When you receive a new email, it will appear here.",+ "offlineMessage": "You are offline. Please connect to the internet to load your emails.","dateFormat": {"justNow": "just now","minutesAgo_single": "{{count}} min ago",diff --git a/apps/mobile-app/app/(tabs)/emails/[id].tsx b/apps/mobile-app/app/(tabs)/emails/[id].tsxindex f33a3d75e..fec22fc65 100644--- a/apps/mobile-app/app/(tabs)/emails/[id].tsx+++ b/apps/mobile-app/app/(tabs)/emails/[id].tsx@@ -56,6 +56,13 @@ export default function EmailDetailsScreen() : React.ReactNode {return;}+ // Check if we are in offline mode+ if (dbContext.isOffline) {+ setError(t('emails.offlineMessage'));+ setIsLoading(false);+ return;+ }+const response = await webApi.get<Email>(`Email/${id}`);// Decrypt email locally using public/private key pairs@@ -77,11 +84,20 @@ export default function EmailDetailsScreen() : React.ReactNode {setHtmlView(false);}} catch (err) {+ /*+ * Suppress errors while vault has unsynced changes+ * Network errors during sync can trigger false positives+ */+ if (dbContext.shouldSuppressEmailErrors()) {+ setIsLoading(false);+ return;+ }+setError(err instanceof Error ? err.message : t('common.error'));} finally {setIsLoading(false);}- }, [dbContext.sqliteClient, id, webApi, t]);+ }, [dbContext.sqliteClient, dbContext, dbContext.isOffline, id, webApi, t]);useEffect(() => {loadEmail();diff --git a/apps/mobile-app/app/(tabs)/emails/index.tsx b/apps/mobile-app/app/(tabs)/emails/index.tsxindex 771c3c22e..1dd9190da 100644--- a/apps/mobile-app/app/(tabs)/emails/index.tsx+++ b/apps/mobile-app/app/(tabs)/emails/index.tsx@@ -19,7 +19,6 @@ import { ThemedText } from '@/components/themed/ThemedText';import { CollapsibleHeader } from '@/components/ui/CollapsibleHeader';import { SkeletonLoader } from '@/components/ui/SkeletonLoader';import { TitleContainer } from '@/components/ui/TitleContainer';-import { useAuth } from '@/context/AuthContext';import { useDb } from '@/context/DbContext';import { useWebApi } from '@/context/WebApiContext';@@ -30,7 +29,6 @@ export default function EmailsScreen() : React.ReactNode {const { t } = useTranslation();const dbContext = useDb();const webApi = useWebApi();- const authContext = useAuth();const colors = useColors();const navigation = useNavigation();const scrollY = useRef(new Animated.Value(0)).current;@@ -53,9 +51,8 @@ export default function EmailsScreen() : React.ReactNode {return;}- // Check if we are in offline mode, if so, we don't need to load emails from the server- const isOffline = authContext.isOffline;- if (isOffline) {+ // Check if we are in offline mode+ if (dbContext.isOffline) {setIsLoading(false);return;}@@ -80,6 +77,15 @@ export default function EmailsScreen() : React.ReactNode {setEmails(decryptedEmails);setIsLoading(false);} catch {+ /*+ * Suppress errors while vault has unsynced changes or if we're offline+ * Network errors during sync can trigger false positives+ */+ if (dbContext.shouldSuppressEmailErrors() || dbContext.isOffline) {+ setIsLoading(false);+ return;+ }+// Show toast and throw errorToast.show({type: 'error',@@ -93,7 +99,7 @@ export default function EmailsScreen() : React.ReactNode {} catch (err) {setError(err instanceof Error ? err.message : t('common.error'));}- }, [dbContext?.sqliteClient, webApi, setIsLoading, authContext.isOffline, t]);+ }, [dbContext, webApi, setIsLoading, t]);useEffect(() => {const unsubscribeFocus = navigation.addListener('focus', () => {@@ -157,7 +163,6 @@ export default function EmailsScreen() : React.ReactNode {alignItems: 'center',flex: 1,justifyContent: 'center',- padding: 20,},contentContainer: {paddingBottom: Platform.OS === 'ios' ? insets.bottom + 60 : 10,@@ -189,7 +194,7 @@ export default function EmailsScreen() : React.ReactNode {);}- if (authContext.isOffline) {+ if (dbContext.isOffline) {return (<View style={styles.centerContainer}><ThemedText style={styles.emptyText}>{t('emails.offlineMessage')}</ThemedText>diff --git a/apps/mobile-app/components/form/EmailDomainField.tsx b/apps/mobile-app/components/form/EmailDomainField.tsxindex b57c95dc6..dbfbee1bd 100644--- a/apps/mobile-app/components/form/EmailDomainField.tsx+++ b/apps/mobile-app/components/form/EmailDomainField.tsx@@ -67,9 +67,6 @@ export const EmailDomainField: React.FC<EmailDomainFieldProps> = ({const metadata = await dbContext.getVaultMetadata();setPrivateEmailDomains(metadata?.privateEmailDomains ?? []);setHiddenPrivateEmailDomains(metadata?.hiddenPrivateEmailDomains ?? []);-- console.log('privateEmailDomains', metadata?.privateEmailDomains);- console.log('hiddenPrivateEmailDomains', metadata?.hiddenPrivateEmailDomains);} catch (err) {console.error('Error loading email domains:', err);}diff --git a/apps/mobile-app/components/items/details/EmailPreview.tsx b/apps/mobile-app/components/items/details/EmailPreview.tsxindex 4d188d298..04bed54c2 100644--- a/apps/mobile-app/components/items/details/EmailPreview.tsx+++ b/apps/mobile-app/components/items/details/EmailPreview.tsx@@ -14,7 +14,6 @@ import { useColors } from '@/hooks/useColorScheme';import { PulseDot } from '@/components/PulseDot';import { ThemedText } from '@/components/themed/ThemedText';import { ThemedView } from '@/components/themed/ThemedView';-import { useAuth } from '@/context/AuthContext';import { useDb } from '@/context/DbContext';import { useWebApi } from '@/context/WebApiContext';@@ -37,7 +36,6 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.Reaconst [displayedCount, setDisplayedCount] = useState(2);const webApi = useWebApi();const dbContext = useDb();- const authContext = useAuth();const colors = useColors();const { t } = useTranslation();@@ -120,12 +118,6 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.Reareturn;}- // Check if we are in offline mode, if so, we don't need to load emails from the server- const isOffline = authContext.isOffline;- if (isOffline) {- return;- }-const isPublic = await isPublicDomain(email);const isPrivate = await isPrivateDomain(email);const isSupported = isPublic || isPrivate;@@ -134,6 +126,13 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.ReasetIsSupportedDomain(isSupported);if (!isSupported) {+ setLoading(false);+ return;+ }++ // Check if we are in offline mode - still show the component but with offline message+ if (dbContext.isOffline) {+ setLoading(false);return;}@@ -240,7 +239,7 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.ReaclearInterval(interval);}};- }, [email, loading, webApi, dbContext, isPublicDomain, isPrivateDomain, authContext.isOffline, isComponentVisible, t, displayedCount, updateDisplayedEmails]);+ }, [email, loading, webApi, dbContext, isPublicDomain, isPrivateDomain, isComponentVisible, t, displayedCount, updateDisplayedEmails]);const styles = StyleSheet.create({date: {@@ -319,38 +318,39 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.Reareturn null;}- if (error) {+ // Show offline message before error - offline mode should take precedence+ if (dbContext.isOffline) {return (<ThemedView style={styles.section}><View style={styles.titleContainer}><ThemedText type="title" style={styles.title}>{t('items.recentEmails')}</ThemedText></View>- <View style={styles.errorContainer}>- <ThemedText style={styles.errorText}>{error}</ThemedText>- </View>+ <ThemedText style={styles.placeholderText}>{t('items.offlineEmailsMessage')}</ThemedText></ThemedView>);}- if (loading) {+ if (error) {return (<ThemedView style={styles.section}><View style={styles.titleContainer}><ThemedText type="title" style={styles.title}>{t('items.recentEmails')}</ThemedText>- <PulseDot /></View>- <ThemedText style={styles.placeholderText}>{t('items.loadingEmails')}</ThemedText>+ <View style={styles.errorContainer}>+ <ThemedText style={styles.errorText}>{error}</ThemedText>+ </View></ThemedView>);}- if (authContext.isOffline) {+ if (loading) {return (<ThemedView style={styles.section}><View style={styles.titleContainer}><ThemedText type="title" style={styles.title}>{t('items.recentEmails')}</ThemedText>+ <PulseDot /></View>- <ThemedText style={styles.placeholderText}>{t('items.offlineEmailsMessage')}</ThemedText>+ <ThemedText style={styles.placeholderText}>{t('items.loadingEmails')}</ThemedText></ThemedView>);}diff --git a/apps/mobile-app/hooks/useVaultSync.ts b/apps/mobile-app/hooks/useVaultSync.tsindex e72c78ee1..1ea977f2d 100644--- a/apps/mobile-app/hooks/useVaultSync.ts+++ b/apps/mobile-app/hooks/useVaultSync.ts@@ -98,12 +98,12 @@ export const useVaultSync = (): {if (result.error) {const errorCode = getVaultSyncErrorCodeFromString(result.error);if (errorCode) {- return await handleSyncError(result.error, errorCode, app, t, onError, onOffline);+ return await handleSyncError(result.error, errorCode, app, dbContext, t, onError, onOffline);}}if (result.wasOffline) {- await NativeVaultManager.setOfflineMode(true);+ await dbContext.setIsOffline(true);onOffline?.();// Return true to continue with local vaultreturn true;@@ -113,6 +113,9 @@ export const useVaultSync = (): {return false;}+ // Sync succeeded - clear offline mode if it was set+ await dbContext.setIsOffline(false);+// Update status based on action takenswitch (result.action) {case 'uploaded':@@ -179,7 +182,7 @@ export const useVaultSync = (): {// Check if it's a vault sync error with error codeconst errorCode = getVaultSyncErrorCode(err);if (errorCode) {- return await handleSyncError(err, errorCode, app, t, onError, onOffline);+ return await handleSyncError(err, errorCode, app, dbContext, t, onError, onOffline);}const errorMessage = err instanceof Error ? err.message : t('common.errors.unknownError');@@ -226,6 +229,7 @@ async function handleSyncError(err: unknown,errorCode: VaultSyncErrorCode | null,app: ReturnType<typeof useApp>,+ dbContext: ReturnType<typeof useDb>,t: (key: string) => string,onError?: (error: string) => void,onOffline?: () => void@@ -251,7 +255,7 @@ async function handleSyncError(case VaultSyncErrorCode.SERVER_UNAVAILABLE:case VaultSyncErrorCode.NETWORK_ERROR:case VaultSyncErrorCode.TIMEOUT:- await NativeVaultManager.setOfflineMode(true);+ await dbContext.setIsOffline(true);onOffline?.();// Return true to continue with local vaultreturn true;diff --git a/apps/server/AliasVault.Api/Controllers/VaultController.cs b/apps/server/AliasVault.Api/Controllers/VaultController.csindex 9899b1eb3..1941ba0cc 100644--- a/apps/server/AliasVault.Api/Controllers/VaultController.cs+++ b/apps/server/AliasVault.Api/Controllers/VaultController.cs@@ -141,9 +141,6 @@ public class VaultController(ILogger<VaultController> logger, IAliasServerDbContreturn Unauthorized();}- // Simulate a delay to test the email error suppression logic.- await Task.Delay(10000);-// Compare the logged-in username with the username in the provided vault model.// If they do not match reject the request. This is important because it's// possible that a user has logged in with a different username than the one