Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Remove deprecated RPO logic from mobile app consistent with other apps

Leendert de Borst7c6782b85e4f
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.kt
index 6a4bd2652..425244951 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
@@ -133,8 +133,7 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
}
/**
- * Clear session data only (for forced logout).
- * Preserves vault data on disk for recovery on next login.
+ * Clear the vault for a forced logout, keeping only the username for the login prefill.
* @param promise The promise to resolve
*/
@ReactMethod
@@ -2036,37 +2035,6 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
}
}
- /**
- * Clear encrypted vault and reset sync state to force a fresh download on next sync.
- * Deletes the corrupted vault and resets sync state so sync will download fresh.
- * Called when existing vault cannot be decrypted (e.g. password changed).
- * @param promise The promise to resolve when complete.
- */
- @ReactMethod
- override fun clearEncryptedVaultForFreshDownload(promise: Promise) {
- try {
- // Delete only the encrypted database file (not all storage)
- val encryptedDbFile = java.io.File(reactApplicationContext.filesDir, "encrypted_database.db")
- if (encryptedDbFile.exists()) {
- encryptedDbFile.delete()
- Log.d(TAG, "Deleted corrupted encrypted database for fresh download")
- }
-
- // Close in-memory database connection if open
- vaultStore.clearCache()
-
- // Reset sync state - set isDirty=false and revision=0 so sync sees server as newer
- vaultStore.metadata.setIsDirty(false)
- vaultStore.setVaultRevisionNumber(0)
- vaultStore.clearSyncEngineState()
-
- promise.resolve(null)
- } catch (e: Exception) {
- Log.e(TAG, "Error clearing encrypted vault for fresh download", e)
- promise.reject("ERR_CLEAR_VAULT_FOR_DOWNLOAD", "Failed to clear vault for fresh download: ${e.message}", e)
- }
- }
-
// region Client core bridge
/**
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultCache.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultCache.kt
index 25eb9899a..a141f850a 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultCache.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultCache.kt
@@ -27,22 +27,6 @@ class VaultCache(
crypto.clearKey()
}
- /**
- * Clear session data only (for forced logout).
- * Preserves vault data on disk for recovery on next login.
- * This is used when the user is forcibly logged out (e.g., 401, token revocation)
- * to allow recovery of unsynced local changes.
- */
- fun clearSession() {
- Log.d(TAG, "Clearing session - preserving vault data for recovery")
-
- // Clear in-memory data only
- clearCache()
-
- // Clear biometric-protected key (user will need to re-authenticate)
- keystoreProvider.clearKeys()
- }
-
/**
* Clear all vault data including from persisted storage.
* This is used for user-initiated logout where they explicitly
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.kt
index de908670d..2e42fab94 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
@@ -916,14 +916,12 @@ class VaultStore(
}
/**
- * Clear session data only (for forced logout).
- * Preserves vault data on disk for recovery on next login.
- * This is used when the user is forcibly logged out (e.g., 401, token revocation)
- * to allow recovery of unsynced local changes.
+ * Clear the vault for a forced logout (e.g. 401, token revocation), keeping only the username for the login prefill.
*/
fun clearSession() {
- cache.clearSession()
- clearLastSuccessfulAuth()
+ val username = getUsername()
+ clearVault()
+ username?.let { setUsername(it) }
}
/**
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt
index 16057af2e..c18bcb9a9 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt
@@ -86,20 +86,15 @@ class AndroidStorageProvider(private val context: Context) : StorageProvider {
}
override fun clearStorage() {
- // Clear shared preferences, but preserve API URL settings for self-hosted instances
+ // Clear shared preferences, but preserve the connection settings (API URL, proxy headers) for self-hosted instances
val sharedPreferences = context.getSharedPreferences("aliasvault", Context.MODE_PRIVATE)
-
- // Save API URL before clearing
val apiUrl = sharedPreferences.getString("apiUrl", null)
+ val customProxyHeaders = sharedPreferences.getString("customProxyHeaders", null)
- // Clear all preferences
- sharedPreferences.edit { clear() }
-
- // Restore API URL if it was set
- if (apiUrl != null) {
- sharedPreferences.edit {
- putString("apiUrl", apiUrl)
- }
+ sharedPreferences.edit {
+ clear()
+ apiUrl?.let { putString("apiUrl", it) }
+ customProxyHeaders?.let { putString("customProxyHeaders", it) }
}
// Clear encrypted database file
diff --git a/apps/mobile-app/app/login.tsx b/apps/mobile-app/app/login.tsx
index c0a2ffd10..a830bc657 100644
--- a/apps/mobile-app/app/login.tsx
+++ b/apps/mobile-app/app/login.tsx
@@ -182,6 +182,11 @@ export default function LoginScreen() : React.ReactNode {
unlockKeyBase64: string,
initiateLoginResponse: LoginResponse
) : Promise<void> => {
+ // Login always starts from the server's vault, so drop one an older app version kept after a forced logout.
+ if (await NativeVaultManager.hasEncryptedDatabase()) {
+ await NativeVaultManager.clearSession();
+ }
+
// Get biometric display name
const biometricDisplayName = await AppUnlockUtility.getBiometricDisplayName();
const isBiometricsEnabledOnDevice = await AppUnlockUtility.isBiometricsAvailableOnDevice();
@@ -278,41 +283,10 @@ export default function LoginScreen() : React.ReactNode {
*/
await NativeVaultManager.resolveVaultKey(unlockKeyBase64);
- /*
- * Forced logout recovery check:
- * If there's an existing local vault (from forced logout), try to unlock it.
- * First check if it belongs to the same user - if different user, clear and download fresh.
- * If decryption fails (password changed or corrupted), reset sync state so
- * sync will do a clean download instead of trying to merge.
- */
- const hasExistingVault = await NativeVaultManager.hasEncryptedDatabase();
- if (hasExistingVault) {
- const storedUsername = await NativeVaultManager.getUsername();
- const normalizedLoginUsername = SrpAuthService.normalizeUsername(credentials.username);
-
- if (storedUsername && storedUsername !== normalizedLoginUsername) {
- // Different user: clear vault and download fresh
- console.info(`Existing vault belongs to different user (${storedUsername}), clearing for fresh download`);
- await NativeVaultManager.clearEncryptedVaultForFreshDownload();
- } else {
- try {
- await NativeVaultManager.unlockVault();
- // Decryption succeeded, local vault is valid, sync will handle it
- console.info('Existing local vault (after forced logout) decrypted successfully, syncing with server');
- } catch {
- // Decryption failed (password changed or corrupted), clear vault and download fresh
- console.info('Existing vault could not be decrypted (password changed or corrupted), clearing for fresh download');
- await NativeVaultManager.clearEncryptedVaultForFreshDownload();
- }
- }
- }
-
let upgradeRequired = false;
/*
* Sync vault from server (downloads, stores, and validates compatibility)
- * This will handle the forced logout recovery check in case our local vault is dirty
- * or is ahead of server in case of RPO event.
*
* Critical errors (auth, version) are handled internally via app.logout(message)
* which shows a native alert. We check the return value to know if sync succeeded.
diff --git a/apps/mobile-app/context/AppContext.tsx b/apps/mobile-app/context/AppContext.tsx
index ad2d57994..22a6aacc8 100644
--- a/apps/mobile-app/context/AppContext.tsx
+++ b/apps/mobile-app/context/AppContext.tsx
@@ -43,7 +43,7 @@ export const AppProvider: React.FC<{ children: React.ReactNode }> = ({ children
/**
* Logout the user (forced logout path - e.g., 401, token revocation).
- * Uses clearAuthForced to preserve vault data for potential RPO recovery.
+ * Uses clearAuthForced, which clears the vault but keeps the username for the login prefill.
* Prevents recursive logout calls by tracking logout state.
*/
const logout = useCallback(async (errorMessage?: string): Promise<void> => {
@@ -55,7 +55,7 @@ export const AppProvider: React.FC<{ children: React.ReactNode }> = ({ children
try {
isLoggingOutRef.current = true;
await webApi.revokeTokens();
- // Use forced logout to preserve vault data for recovery
+ // Use forced logout, which keeps the username for the login prefill
await auth.clearAuthForced(errorMessage);
} catch (error) {
console.error('Error during logout:', error);
diff --git a/apps/mobile-app/context/AuthContext.tsx b/apps/mobile-app/context/AuthContext.tsx
index b41075621..d85d3a707 100644
--- a/apps/mobile-app/context/AuthContext.tsx
+++ b/apps/mobile-app/context/AuthContext.tsx
@@ -28,7 +28,7 @@ type AuthContextType = {
clearAuthUserInitiated: (errorMessage?: string) => Promise<void>;
/**
* Clear auth for forced logout (e.g., 401 error, token revocation).
- * Preserves vault data for potential RPO recovery - user didn't choose to logout.
+ * Clears the vault too, keeps the username for the login prefill.
*/
clearAuthForced: (errorMessage?: string) => Promise<void>;
setAuthMethods: (methods: AuthMethod[]) => Promise<void>;
@@ -138,8 +138,8 @@ export const AuthProvider: React.FC<{
/**
* Clear authentication data for forced logout (e.g., 401 error, token revocation).
- * Preserves vault data for potential RPO recovery - user didn't choose to logout.
- * The vault will be recovered on next login if the password hasn't changed.
+ * Clears the vault and everything derived from it; the next login pulls a fresh one.
+ * Keeps the username for the login prefill.
*
* This is the base logout function. clearAuthUserInitiated builds on top of this.
*/
@@ -160,9 +160,10 @@ export const AuthProvider: React.FC<{
// Non-fatal error - continue with logout
}
- // Clear auth tokens and session in native layer (preserves vault data)
+ // Clear auth tokens and the vault in native layer (keeps the username)
await NativeVaultManager.clearAuthTokens();
await NativeVaultManager.clearSession();
+ dbContext?.clearDatabase();
// Clear from AsyncStorage (for backward compatibility)
// TODO: Remove AsyncStorage cleanup in future version 0.25.0+
@@ -175,13 +176,13 @@ export const AuthProvider: React.FC<{
}
setIsLoggedIn(false);
- }, []);
+ }, [dbContext]);
/**
* Clear authentication data for user-initiated logout (e.g., user clicks logout button).
* Clears ALL data including vault - user explicitly chose to logout.
*
- * Builds on clearAuthForced by also clearing vault data and username.
+ * Builds on clearAuthForced by also clearing the username.
*/
const clearAuthUserInitiated = useCallback(async (errorMessage?: string): Promise<void> => {
// First, perform the base forced logout (clears session, tokens, PIN, credentials)
@@ -191,9 +192,6 @@ export const AuthProvider: React.FC<{
await NativeVaultManager.clearUsername();
await AsyncStorage.removeItem('username'); // TODO: Remove in 0.25.0+
- // Clear all vault data - user explicitly chose to logout
- dbContext?.clearDatabase();
-
setUsername(null);
}, [dbContext, clearAuthForced]);
diff --git a/apps/mobile-app/context/DbContext.tsx b/apps/mobile-app/context/DbContext.tsx
index 2eadcc6a9..e4a547e81 100644
--- a/apps/mobile-app/context/DbContext.tsx
+++ b/apps/mobile-app/context/DbContext.tsx
@@ -187,11 +187,10 @@ export const DbProvider: React.FC<{ children: React.ReactNode }> = ({ children }
}, [dbInitialized, checkStoredVault]);
/**
- * Clear database and remove from native module, called when logging out.
+ * Forget the loaded database, called on logout after the native layer cleared the vault.
*/
const clearDatabase = useCallback(() : void => {
setDbInitialized(false);
- NativeVaultManager.clearVault();
}, []);
/**
diff --git a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
index 6ca51165a..0fcde0408 100644
--- a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
+++ b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
@@ -315,10 +315,6 @@
[vaultManager markVaultClean:(NSInteger)mutationSeqAtStart newServerRevision:(NSInteger)newServerRevision resolver:resolve rejecter:reject];
}
-- (void)clearEncryptedVaultForFreshDownload:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- [vaultManager clearEncryptedVaultForFreshDownload: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.swift
index 3f993e40b..52e00e7b4 100644
--- a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
+++ b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
@@ -233,11 +233,14 @@ public class VaultManager: NSObject {
}
}
- /// Clear session data only (for forced logout).
- /// Preserves vault data on disk for recovery on next login.
+ /// Clear the vault for a forced logout, keeping only the username for the login prefill.
@objc
func clearSession() {
- vaultStore.clearSession()
+ do {
+ try vaultStore.clearSession()
+ } catch {
+ print("Failed to clear session: \(error)")
+ }
// Reset password unlock failed attempts counter on logout
UserDefaults.standard.removeObject(forKey: "password_unlock_failed_attempts")
@@ -1450,27 +1453,6 @@ public class VaultManager: NSObject {
resolve(cleared)
}
- @objc
- func clearEncryptedVaultForFreshDownload(_ resolve: @escaping RCTPromiseResolveBlock,
- rejecter reject: @escaping RCTPromiseRejectBlock) {
- do {
- try vaultStore.removeEncryptedDatabase()
- print("Deleted corrupted encrypted database for fresh download")
- } catch {
- print("Could not delete encrypted database (may not exist): \(error)")
- }
-
- // Close in-memory database connection if open
- vaultStore.clearCache()
-
- // Reset sync state - set isDirty=false and revision=0 so sync sees server as newer
- vaultStore.setIsDirty(false)
- vaultStore.setCurrentVaultRevisionNumber(0)
- vaultStore.clearSyncEngineState()
-
- resolve(nil)
- }
-
@objc
func requiresMainQueueSetup() -> Bool {
return false
diff --git a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Cache.swift b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Cache.swift
index 51507de27..5b295da32 100644
--- a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Cache.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Cache.swift
@@ -12,24 +12,12 @@ extension VaultStore {
clearLastSuccessfulAuth()
}
- /// Clear session data only (for forced logout).
- /// Preserves vault data on disk for recovery on next login.
- /// This is used when the user is forcibly logged out (e.g., 401, token revocation)
- /// to allow recovery of unsynced local changes.
- public func clearSession() {
- print("Clearing session - preserving vault data for recovery")
-
- // Clear in-memory data only
- self.accountKey = nil
- self.dbConnection = nil
- clearLastSuccessfulAuth()
-
- // Clear biometric-protected key from keychain (user will need to re-authenticate)
- do {
- try removeKeyFromKeychain()
- print("Successfully removed encryption key from keychain")
- } catch {
- print("Failed to remove encryption key from keychain: \(error)")
+ /// Clear the vault for a forced logout (e.g. 401, token revocation), keeping only the username for the login prefill.
+ public func clearSession() throws {
+ let username = getUsername()
+ try clearVault()
+ if let username {
+ setUsername(username)
}
}
diff --git a/apps/mobile-app/specs/NativeVaultManager.ts b/apps/mobile-app/specs/NativeVaultManager.ts
index c1dfc0ea8..f3e112d8b 100644
--- a/apps/mobile-app/specs/NativeVaultManager.ts
+++ b/apps/mobile-app/specs/NativeVaultManager.ts
@@ -21,7 +21,7 @@ export interface Spec extends TurboModule {
isVaultUnlocked(): Promise<boolean>;
getVaultMetadata(): Promise<string>;
unlockVault(): Promise<boolean>;
- clearSession(): Promise<void>; // Clears session only, preserves vault for potential RPO recovery
+ clearSession(): Promise<void>; // Clears everything including vault data, keeps the username for the login prefill
clearVault(): Promise<void>; // Clears everything including vault data
// Rust core dispatch. The client core's Rust binding routes every call through here: `name` is the uniffi
@@ -47,7 +47,6 @@ export interface Spec extends TurboModule {
// Sync state management
getSyncState(): Promise<{isDirty: boolean; dirtyScopes: string[]; mutationSequence: number; serverRevision: number; isSyncing: boolean}>;
markVaultClean(mutationSeqAtStart: number, newServerRevision: number): Promise<boolean>;
- clearEncryptedVaultForFreshDownload(): Promise<void>;
// Vault SQL operations. executeQuery returns BLOB columns as base64 behind an "av-blob-base64:" prefix.
executeQuery(query: string, params: (string | number | null)[]): Promise<string[]>;