Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Cleanup unused methods, add markVaultDirty flag (#1404)
Leendert de Borst3a0cea3b4066
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.ktindex 1747de462..c1cd8b870 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt@@ -1533,4 +1533,20 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :}}+ /**+ * Persist the in-memory vault to storage and mark as dirty.+ * Combines getting the encrypted database and storing it with dirty flag in one call.+ * This is used after local mutations to persist changes.+ */+ @ReactMethod+ fun markVaultDirty(promise: Promise) {+ try {+ vaultStore.markVaultDirty()+ promise.resolve(null)+ } catch (e: Exception) {+ Log.e(TAG, "Error persisting vault", e)+ promise.reject("ERR_PERSIST_VAULT", "Failed to persist vault: ${e.message}", e)+ }+ }+}diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.ktindex e0d8df704..eba8f1c07 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt@@ -511,6 +511,21 @@ class VaultStore(return metadata.markVaultClean(mutationSeqAtStart, newServerRevision)}+ /**+ * Persist the in-memory vault to storage and mark as dirty.+ * Combines getting the encrypted database and storing it with dirty flag in one call.+ * This is used after local mutations to persist changes.+ */+ fun markVaultDirty() {+ val encryptedVault = databaseComponent.getEncryptedDatabase()+ storeEncryptedVaultWithSyncState(+ encryptedVault = encryptedVault,+ markDirty = true,+ serverRevision = null,+ expectedMutationSeq = null+ )+ }+/*** Upload the vault to the server.*/diff --git a/apps/mobile-app/app/login.tsx b/apps/mobile-app/app/login.tsxindex b26327c1c..3e6efecab 100644--- a/apps/mobile-app/app/login.tsx+++ b/apps/mobile-app/app/login.tsx@@ -163,8 +163,7 @@ export default function LoginScreen() : React.ReactNode {};/*- * Set auth tokens, store encryption key and key derivation params.- * Note: We don't call initializeDatabase here anymore - instead, syncVault will download+ * Store auth tokens and encryption credentials. syncVault will download* the vault and store it (including metadata) through native code.*/await authContext.setAuthTokens(ConversionUtility.normalizeUsername(credentials.username), token, refreshToken);@@ -172,12 +171,8 @@ export default function LoginScreen() : React.ReactNode {await dbContext.storeEncryptionKeyDerivationParams(encryptionKeyDerivationParams);let checkSuccess = true;- /**- * After setting auth tokens, execute a server status check immediately- * which takes care of certain sanity checks such as ensuring client/server- * compatibility. This also downloads the vault and stores it (including metadata)- * through native code.- */++ // Sync vault from server (downloads, stores, and validates compatibility)await syncVault({/*** Update login status during sync.diff --git a/apps/mobile-app/app/unlock.tsx b/apps/mobile-app/app/unlock.tsxindex 6af94798c..9eafd5963 100644--- a/apps/mobile-app/app/unlock.tsx+++ b/apps/mobile-app/app/unlock.tsx@@ -20,7 +20,6 @@ import { Avatar } from '@/components/ui/Avatar';import { RobustPressable } from '@/components/ui/RobustPressable';import { useApp } from '@/context/AppContext';import { useDb } from '@/context/DbContext';-import { useNavigation } from '@/context/NavigationContext';import NativeVaultManager from '@/specs/NativeVaultManager';/**@@ -29,7 +28,6 @@ import NativeVaultManager from '@/specs/NativeVaultManager';export default function UnlockScreen() : React.ReactNode {const { isLoggedIn, username, isBiometricsEnabled, getBiometricDisplayName, getEncryptionKeyDerivationParams, logout } = useApp();const dbContext = useDb();- const navigation = useNavigation();const [password, setPassword] = useState('');const [isLoading, setIsLoading] = useState(true);const [isBiometricsAvailable, setIsBiometricsAvailable] = useState(false);@@ -130,10 +128,10 @@ export default function UnlockScreen() : React.ReactNode {}/*- * Navigate using centralized navigation logic- * This ensures we handle pending deep links and return URLs correctly+ * Navigate to reinitialize which will sync vault with server+ * and then navigate to the appropriate destination.*/- navigation.navigateAfterUnlock();+ router.replace('/reinitialize');} else {Alert.alert(t('common.error'),diff --git a/apps/mobile-app/context/DbContext.tsx b/apps/mobile-app/context/DbContext.tsxindex 416b9291c..5d4d34981 100644--- a/apps/mobile-app/context/DbContext.tsx+++ b/apps/mobile-app/context/DbContext.tsx@@ -1,7 +1,6 @@import React, { createContext, useContext, useState, useEffect, useCallback, useMemo } from 'react';import type { EncryptionKeyDerivationParams, VaultMetadata } from '@/utils/dist/core/models/metadata';-import type { VaultResponse } from '@/utils/dist/core/models/webapi';import SqliteClient from '@/utils/SqliteClient';import NativeVaultManager from '@/specs/NativeVaultManager';@@ -12,7 +11,6 @@ type DbContextType = {dbAvailable: boolean;storeEncryptionKey: (derivedKey: string) => Promise<void>;storeEncryptionKeyDerivationParams: (keyDerivationParams: EncryptionKeyDerivationParams) => Promise<void>;- initializeDatabase: (vaultResponse: VaultResponse) => Promise<void>;hasPendingMigrations: () => Promise<boolean>;clearDatabase: () => void;getVaultMetadata: () => Promise<VaultMetadata | null>;@@ -80,39 +78,6 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }await sqliteClient.storeEncryptionKeyDerivationParams(keyDerivationParams);}, [sqliteClient]);- /**- * Initialize the database in the native module.- * This is called during initial login/registration to set up the vault.- * Note: During sync operations, metadata is stored automatically by native VaultSync.- *- * @param vaultResponse The vault response from the API- */- const initializeDatabase = useCallback(async (vaultResponse: VaultResponse) => {- const metadata: VaultMetadata = {- publicEmailDomains: vaultResponse.vault.publicEmailDomainList ?? [],- privateEmailDomains: vaultResponse.vault.privateEmailDomainList ?? [],- hiddenPrivateEmailDomains: vaultResponse.vault.hiddenPrivateEmailDomainList ?? [],- vaultRevisionNumber: vaultResponse.vault.currentRevisionNumber,- };-- // Store vault blob atomically with sync state (fresh from server, not dirty)- await NativeVaultManager.storeEncryptedVaultWithSyncState(- vaultResponse.vault.blob,- false, // markDirty = false (fresh from server)- vaultResponse.vault.currentRevisionNumber, // serverRevision- null // expectedMutationSeq (not checking race on initial login)- );-- // Store metadata separately (email domains - not critical for race conditions)- await sqliteClient.storeMetadata(JSON.stringify(metadata));-- // Unlock the vault to make it available for queries- await unlockVault();-- setDbInitialized(true);- setDbAvailable(true);- }, [sqliteClient, unlockVault]);-/*** Check if there are any pending migrations. This method also checks if the current vault version is known to the client.* If the current vault version is not known to the client, the method will throw an exception which causes the app to logout.@@ -212,7 +177,6 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }sqliteClient,dbInitialized,dbAvailable,- initializeDatabase,hasPendingMigrations,clearDatabase,getVaultMetadata,@@ -222,7 +186,7 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }storeEncryptionKeyDerivationParams,checkStoredVault,setDatabaseAvailable,- }), [sqliteClient, dbInitialized, dbAvailable, initializeDatabase, hasPendingMigrations, clearDatabase, getVaultMetadata, testDatabaseConnection, unlockVault, storeEncryptionKey, storeEncryptionKeyDerivationParams, checkStoredVault, setDatabaseAvailable]);+ }), [sqliteClient, dbInitialized, dbAvailable, hasPendingMigrations, clearDatabase, getVaultMetadata, testDatabaseConnection, unlockVault, storeEncryptionKey, storeEncryptionKeyDerivationParams, checkStoredVault, setDatabaseAvailable]);return (<DbContext.Provider value={contextValue}>diff --git a/apps/mobile-app/hooks/useVaultMutate.ts b/apps/mobile-app/hooks/useVaultMutate.tsindex d3da86bef..deedf62bd 100644--- a/apps/mobile-app/hooks/useVaultMutate.ts+++ b/apps/mobile-app/hooks/useVaultMutate.ts@@ -107,20 +107,8 @@ export function useVaultMutate() : {// The operation should wrap its changes in beginTransaction/commitTransactionawait operation();- // After the operation completes, the native layer has the updated encrypted database.- // We need to store it with the isDirty flag set atomically.- const encryptedDb = await NativeVaultManager.getEncryptedDatabase();- if (!encryptedDb) {- throw new Error(t('vault.errors.failedToGetEncryptedDatabase'));- }-- // Store locally with dirty flag (atomic operation)- await NativeVaultManager.storeEncryptedVaultWithSyncState(- encryptedDb,- true, // markDirty - increments mutation sequence and sets isDirty- null, // serverRevision - don't change- null // expectedMutationSeq - not checking for race (local mutation)- );+ // Persist the updated vault to storage and mark as dirty+ await NativeVaultManager.markVaultDirty();setSyncStatus(t('vault.uploadingVaultToServer'));diff --git a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mmindex 0ba01d1f5..0f8c81d54 100644--- a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm+++ b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm@@ -259,6 +259,10 @@[vaultManager uploadVault:resolve rejecter:reject];}+- (void)markVaultDirty:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {+ [vaultManager markVaultDirty:resolve rejecter:reject];+}+// MARK: - PIN Unlock- (void)isPinEnabled:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {diff --git a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swiftindex 0b06abd8e..8d5ba86dd 100644--- a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift+++ b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift@@ -999,6 +999,24 @@ public class VaultManager: NSObject {}}+ /// Persist the in-memory vault to storage and mark as dirty (for local mutations).+ @objc+ func markVaultDirty(_ resolve: @escaping RCTPromiseResolveBlock,+ rejecter reject: @escaping RCTPromiseRejectBlock) {+ Task {+ do {+ try vaultStore.markVaultDirty()+ await MainActor.run {+ resolve(nil)+ }+ } catch {+ await MainActor.run {+ reject("PERSIST_VAULT_ERROR", "Failed to persist vault: \(error.localizedDescription)", error)+ }+ }+ }+ }+@objcfunc requiresMainQueueSetup() -> Bool {return falsediff --git a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swiftindex 9a874daf4..bd0063a1d 100644--- a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift+++ b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift@@ -242,4 +242,10 @@ extension VaultStore {userDefaults.removeObject(forKey: VaultConstants.isSyncingKey)userDefaults.synchronize()}++ /// Mark the vault as dirty.+ /// This is used after local mutations to mark the vault as dirty.+ public func markVaultDirty() throws {+ setIsDirty(true)+ }}diff --git a/apps/mobile-app/specs/NativeVaultManager.ts b/apps/mobile-app/specs/NativeVaultManager.tsindex 800037ebc..3ef9370fd 100644--- a/apps/mobile-app/specs/NativeVaultManager.ts+++ b/apps/mobile-app/specs/NativeVaultManager.ts@@ -29,6 +29,8 @@ export interface Spec extends TurboModule {getSyncState(): Promise<{isDirty: boolean; mutationSequence: number; serverRevision: number; isSyncing: boolean}>;storeEncryptedVaultWithSyncState(encryptedVault: string, markDirty: boolean, serverRevision: number | null, expectedMutationSeq: number | null): Promise<{ success: boolean; mutationSequence: number }>;markVaultClean(mutationSeqAtStart: number, newServerRevision: number): Promise<boolean>;+ markVaultDirty(): Promise<void>;+uploadVault(): Promise<{ success: boolean; status: number; newRevisionNumber: number; mutationSeqAtStart: number; error: string | null }>;// Vault SQL operations