Fixed WebDAV account loading and vault deletion issues (#415)

Author: tobihagemann

Cryptomator/Common/CloudAccountList/AccountListViewModel.swift

@@ -43,8 +43,23 @@ class AccountListViewModel: AccountListViewModelProtocol {
 
 	func refreshItems() throws {
 		let refreshedAccountInfos = try dbManager.getAllAccounts(for: cloudProviderType)
-		let refreshedAccounts = try refreshedAccountInfos.map { try createAccountCellContent(from: $0) }
-		accountInfos = refreshedAccountInfos
+		var refreshedAccounts: [AccountCellContent] = []
+		var validAccountInfos: [AccountInfo] = []
+
+		for accountInfo in refreshedAccountInfos {
+			do {
+				let accountContent = try createAccountCellContent(from: accountInfo)
+				refreshedAccounts.append(accountContent)
+				validAccountInfos.append(accountInfo)
+			} catch CloudProviderAccountError.accountNotFoundError {
+				DDLogError("Account \(accountInfo.accountUID) not found in keychain, skipping")
+			} catch {
+				DDLogError("Error creating account cell content for \(accountInfo.accountUID): \(error)")
+				throw error
+			}
+		}
+
+		accountInfos = validAccountInfos
 		accounts = refreshedAccounts
 	}
 

Cryptomator/Common/CloudAuthenticator.swift

@@ -139,15 +139,18 @@ class CloudAuthenticator {
 			try WebDAVCredentialManager.shared.removeCredentialFromKeychain(with: account.accountUID)
 		}
 		let correspondingVaults = try vaultAccountManager.getAllAccounts().filter { $0.delegateAccountUID == account.accountUID }
-		_ = Promise<Void>(on: .global()) { fulfill, _ in
-			for correspondingVault in correspondingVaults {
-				do {
-					try awaitPromise(self.vaultManager.removeVault(withUID: correspondingVault.vaultUID))
-				} catch {
-					DDLogError("Remove corresponding vault: \(correspondingVault.vaultName) after deauthenticated account: \(account) - failed with error: \(error)")
+		let vaultUIDs = correspondingVaults.map { $0.vaultUID }
+
+		_ = Promise<Void>(on: .global()) { fulfill, reject in
+			do {
+				if !vaultUIDs.isEmpty {
+					try awaitPromise(self.vaultManager.removeVaults(withUIDs: vaultUIDs))
+					DDLogInfo("Removed \(vaultUIDs.count) vaults for deauthenticated account: \(account)")
 				}
+				fulfill(())
+			} catch {
+				reject(error)
 			}
-			fulfill(())
 		}.then {
 			try self.accountManager.removeAccount(with: account.accountUID)
 		}.catch { error in

CryptomatorCommon/Sources/CryptomatorCommonCore/Manager/VaultAccountDBManager.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2020 Skymatic GmbH. All rights reserved.
 //
 
+import CocoaLumberjackSwift
 import CryptomatorCloudAccessCore
 import Dependencies
 import Foundation
@@ -46,6 +47,7 @@ extension VaultAccount: PersistableRecord {
 public protocol VaultAccountManager {
 	func saveNewAccount(_ account: VaultAccount) throws
 	func removeAccount(with vaultUID: String) throws
+	func removeAccounts(with vaultUIDs: [String]) throws
 	func getAccount(with vaultUID: String) throws -> VaultAccount
 	func getAllAccounts() throws -> [VaultAccount]
 	func updateAccount(_ account: VaultAccount) throws
@@ -77,6 +79,18 @@ public class VaultAccountDBManager: VaultAccountManager {
 		}
 	}
 
+	public func removeAccounts(with vaultUIDs: [String]) throws {
+		guard !vaultUIDs.isEmpty else {
+			return
+		}
+		let deletedCount = try database.write { db in
+			try VaultAccount.deleteAll(db, keys: vaultUIDs)
+		}
+		if deletedCount != vaultUIDs.count {
+			DDLogError("Expected to delete \(vaultUIDs.count) vault accounts, but only deleted \(deletedCount)")
+		}
+	}
+
 	public func getAccount(with vaultUID: String) throws -> VaultAccount {
 		let fetchedAccount = try database.read { db in
 			return try VaultAccount.fetchOne(db, key: vaultUID)

CryptomatorCommon/Sources/CryptomatorCommonCore/Manager/VaultDBManager.swift

@@ -31,6 +31,7 @@ public protocol VaultManager {
 	func manualUnlockVault(withUID vaultUID: String, kek: [UInt8]) throws -> CloudProvider
 	func createVaultProvider(withUID vaultUID: String, masterkey: Masterkey) throws -> CloudProvider
 	func removeVault(withUID vaultUID: String) throws -> Promise<Void>
+	func removeVaults(withUIDs vaultUIDs: [String]) throws -> Promise<Void>
 	func removeAllUnusedFileProviderDomains() -> Promise<Void>
 	func moveVault(account: VaultAccount, to targetVaultPath: CloudPath) -> Promise<Void>
 	func changePassphrase(oldPassphrase: String, newPassphrase: String, forVaultUID vaultUID: String) -> Promise<Void>
@@ -406,6 +407,49 @@ public class VaultDBManager: VaultManager {
 		}
 	}
 
+	/**
+	 Removes multiple vaults at once, handling database operations in a single transaction to avoid constraint violations.
+	 - Precondition: `VaultAccount`s for the `vaultUIDs` exist in the database.
+	 - Postcondition: All specified vaults are removed from the database, keychain, and FileProvider.
+	 */
+	public func removeVaults(withUIDs vaultUIDs: [String]) throws -> Promise<Void> {
+		guard !vaultUIDs.isEmpty else {
+			return Promise(())
+		}
+
+		return Promise<Void>(on: .global()) { fulfill, reject in
+			do {
+				// Remove passwords and cached masterkeys for all vaults
+				for vaultUID in vaultUIDs {
+					do {
+						try self.passwordManager.removePassword(forVaultUID: vaultUID)
+						try self.masterkeyCacheManager.removeCachedMasterkey(forVaultUID: vaultUID)
+					} catch {
+						DDLogError("Failed to remove password/masterkey for vault \(vaultUID): \(error)")
+					}
+				}
+
+				// Remove all FileProvider domains
+				for vaultUID in vaultUIDs {
+					do {
+						try awaitPromise(self.removeFileProviderDomain(withVaultUID: vaultUID))
+					} catch {
+						DDLogError("Failed to remove FileProvider domain for vault \(vaultUID): \(error)")
+					}
+				}
+
+				// Remove all vault accounts in a single transaction
+				try self.vaultAccountManager.removeAccounts(with: vaultUIDs)
+				DDLogInfo("Removed \(vaultUIDs.count) vaults")
+
+				fulfill(())
+			} catch {
+				DDLogError("Removing vaults failed with error: \(error)")
+				reject(error)
+			}
+		}
+	}
+
 	/**
 	 Removes all unused FileProvider domains.
 

CryptomatorCommon/Sources/CryptomatorCommonCore/Mocks/VaultManagerMock.swift

@@ -156,6 +156,29 @@ final class VaultManagerMock: VaultManager {
 		return try removeVaultWithUIDClosure.map({ try $0(vaultUID) }) ?? removeVaultWithUIDReturnValue
 	}
 
+	// MARK: - removeVaults
+
+	var removeVaultsWithUIDsThrowableError: Error?
+	var removeVaultsWithUIDsCallsCount = 0
+	var removeVaultsWithUIDsCalled: Bool {
+		removeVaultsWithUIDsCallsCount > 0
+	}
+
+	var removeVaultsWithUIDsReceivedVaultUIDs: [String]?
+	var removeVaultsWithUIDsReceivedInvocations: [[String]] = []
+	var removeVaultsWithUIDsReturnValue: Promise<Void>!
+	var removeVaultsWithUIDsClosure: (([String]) throws -> Promise<Void>)?
+
+	func removeVaults(withUIDs vaultUIDs: [String]) throws -> Promise<Void> {
+		if let error = removeVaultsWithUIDsThrowableError {
+			throw error
+		}
+		removeVaultsWithUIDsCallsCount += 1
+		removeVaultsWithUIDsReceivedVaultUIDs = vaultUIDs
+		removeVaultsWithUIDsReceivedInvocations.append(vaultUIDs)
+		return try removeVaultsWithUIDsClosure.map({ try $0(vaultUIDs) }) ?? removeVaultsWithUIDsReturnValue
+	}
+
 	// MARK: - removeAllUnusedFileProviderDomains
 
 	var removeAllUnusedFileProviderDomainsThrowableError: Error?