Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Update default email domain selection and metadata retrieval (#1371)
Leendert de Borst2e34e64c6c15
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.tsindex 6b3c1189e..634e08197 100644--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts@@ -321,11 +321,8 @@ export async function getEmailAddressesForVault(export function handleGetDefaultEmailDomain(): Promise<stringResponse> {return (async (): Promise<stringResponse> => {try {- const privateEmailDomains = await storage.getItem('session:privateEmailDomains') as string[];- const publicEmailDomains = await storage.getItem('session:publicEmailDomains') as string[];-const sqliteClient = await createVaultSqliteClient();- const defaultEmailDomain = sqliteClient.getDefaultEmailDomain(privateEmailDomains, publicEmailDomains);+ const defaultEmailDomain = await sqliteClient.getDefaultEmailDomain();return { success: true, value: defaultEmailDomain ?? undefined };} catch (error) {diff --git a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsxindex a22cc2b7e..f702b2a86 100644--- a/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx+++ b/apps/browser-extension/src/entrypoints/popup/context/DbContext.tsx@@ -8,6 +8,8 @@ import SqliteClient from '@/utils/SqliteClient';import { StoreVaultRequest } from '@/utils/types/messaging/StoreVaultRequest';import type { VaultResponse as messageVaultResponse } from '@/utils/types/messaging/VaultResponse';+import { storage } from '#imports';+type DbContextType = {sqliteClient: SqliteClient | null;dbInitialized: boolean;@@ -42,11 +44,6 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }*/const [dbAvailable, setDbAvailable] = useState(false);- /**- * Vault revision.- */- const [vaultMetadata, setVaultMetadata] = useState<VaultMetadata | null>(null);-const initializeDatabase = useCallback(async (vaultResponse: VaultResponse, derivedKey: string) => {// Attempt to decrypt the blob.const decryptedBlob = await EncryptionUtility.symmetricDecrypt(@@ -61,15 +58,9 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }setSqliteClient(client);setDbInitialized(true);setDbAvailable(true);- setVaultMetadata({- publicEmailDomains: vaultResponse.vault.publicEmailDomainList ?? [],- privateEmailDomains: vaultResponse.vault.privateEmailDomainList ?? [],- hiddenPrivateEmailDomains: vaultResponse.vault.hiddenPrivateEmailDomainList ?? [],- vaultRevisionNumber: vaultResponse.vault.currentRevisionNumber,- });/**- * Store encrypted vault in background worker.+ * Store encrypted vault and metadata in background worker (session storage).*/const request: StoreVaultRequest = {vaultBlob: vaultResponse.vault.blob,@@ -94,13 +85,7 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }setSqliteClient(client);setDbInitialized(true);setDbAvailable(true);-- setVaultMetadata({- publicEmailDomains: response.publicEmailDomains ?? [],- privateEmailDomains: response.privateEmailDomains ?? [],- hiddenPrivateEmailDomains: response.hiddenPrivateEmailDomains ?? [],- vaultRevisionNumber: response.vaultRevisionNumber ?? 0,- });+ // Metadata is already stored in session storage by background worker} else {setDbInitialized(true);setDbAvailable(false);@@ -113,23 +98,37 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }}, []);/**- * Get the vault metadata.+ * Get the vault metadata from session storage.*/const getVaultMetadata = useCallback(async () : Promise<VaultMetadata | null> => {- return vaultMetadata;- }, [vaultMetadata]);+ try {+ const publicEmailDomains = await storage.getItem('session:publicEmailDomains') as string[] | null;+ const privateEmailDomains = await storage.getItem('session:privateEmailDomains') as string[] | null;+ const hiddenPrivateEmailDomains = await storage.getItem('session:hiddenPrivateEmailDomains') as string[] | null;+ const vaultRevisionNumber = await storage.getItem('session:vaultRevisionNumber') as number | null;++ if (!publicEmailDomains && !privateEmailDomains) {+ return null;+ }++ return {+ publicEmailDomains: publicEmailDomains ?? [],+ privateEmailDomains: privateEmailDomains ?? [],+ hiddenPrivateEmailDomains: hiddenPrivateEmailDomains ?? [],+ vaultRevisionNumber: vaultRevisionNumber ?? 0,+ };+ } catch (error) {+ console.error('Error getting vault metadata from session storage:', error);+ return null;+ }+ }, []);/**- * Set the current vault revision number.+ * Set the current vault revision number in session storage.*/const setCurrentVaultRevisionNumber = useCallback(async (revisionNumber: number) => {- setVaultMetadata({- publicEmailDomains: vaultMetadata?.publicEmailDomains ?? [],- privateEmailDomains: vaultMetadata?.privateEmailDomains ?? [],- hiddenPrivateEmailDomains: vaultMetadata?.hiddenPrivateEmailDomains ?? [],- vaultRevisionNumber: revisionNumber,- });- }, [vaultMetadata]);+ await storage.setItem('session:vaultRevisionNumber', revisionNumber);+ }, []);/*** Check if there are pending migrations.diff --git a/apps/browser-extension/src/entrypoints/popup/pages/credentials/CredentialAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/credentials/CredentialAddEdit.tsxindex fba999826..8bae31033 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/credentials/CredentialAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/credentials/CredentialAddEdit.tsx@@ -396,11 +396,7 @@ const CredentialAddEdit: React.FC = () => {const identity = identityGenerator.generateRandomIdentity(genderPreference);const password = passwordGenerator.generateRandomPassword();- const metadata = await dbContext.getVaultMetadata();-- const privateEmailDomains = metadata?.privateEmailDomains ?? [];- const publicEmailDomains = metadata?.publicEmailDomains ?? [];- const defaultEmailDomain = dbContext.sqliteClient!.getDefaultEmailDomain(privateEmailDomains, publicEmailDomains);+ const defaultEmailDomain = await dbContext.sqliteClient!.getDefaultEmailDomain();const email = defaultEmailDomain ? `${identity.emailPrefix}@${defaultEmailDomain}` : identity.emailPrefix;// Check current valuesdiff --git a/apps/browser-extension/src/utils/SqliteClient.ts b/apps/browser-extension/src/utils/SqliteClient.tsindex fd8a24740..b97352ed0 100644--- a/apps/browser-extension/src/utils/SqliteClient.ts+++ b/apps/browser-extension/src/utils/SqliteClient.ts@@ -9,6 +9,8 @@ import { VaultVersionIncompatibleError } from '@/utils/types/errors/VaultVersionimport { t } from '@/i18n/StandaloneI18n';+import { storage } from '#imports';+/*** Placeholder base64 image for credentials without a logo.*/@@ -381,18 +383,24 @@ export class SqliteClient {* Get the default email domain from the database.* @param privateEmailDomains - Array of private email domains* @param publicEmailDomains - Array of public email domains+ * @param hiddenPrivateEmailDomains - Array of hidden private email domains (optional)* @returns The default email domain or null if no valid domain is found*/- public getDefaultEmailDomain(privateEmailDomains: string[], publicEmailDomains: string[]): string | null {+ public async getDefaultEmailDomain(): Promise<string | null> {+ const publicEmailDomains = await storage.getItem('session:publicEmailDomains') as string[] ?? [];+ const privateEmailDomains = await storage.getItem('session:privateEmailDomains') as string[] ?? [];+ const hiddenPrivateEmailDomains = await storage.getItem('session:hiddenPrivateEmailDomains') as string[] ?? [];+const defaultEmailDomain = this.getSetting('DefaultEmailDomain');/**- * Check if a domain is valid.+ * Check if a domain is valid (not disabled, not hidden, and exists in domain lists).*/const isValidDomain = (domain: string): boolean => {return Boolean(domain &&domain !== 'DISABLED.TLD' &&domain !== '' &&+ !hiddenPrivateEmailDomains.includes(domain) &&(privateEmailDomains.includes(domain) || publicEmailDomains.includes(domain)));};@@ -401,7 +409,7 @@ export class SqliteClient {return defaultEmailDomain;}- // If default domain is not valid, fall back to first available private domain.+ // If default domain is not valid, fall back to first available private domain (excluding hidden ones).const firstPrivate = privateEmailDomains.find(isValidDomain);if (firstPrivate) {return firstPrivate;