Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Refactor mobile app service urls duplicate attribute (#2159)
Leendert de Borstb7f29b4a467c
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.ktindex 941a818e2..7b07a94f4 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeySelectionFragment.kt@@ -66,7 +66,7 @@ class PasskeySelectionFragment : Fragment() {val subtitle = buildString {itemInfo.username?.let { append(it) }}- subtitleView.text = subtitle.ifEmpty { itemInfo.url ?: viewModel.rpId }+ subtitleView.text = subtitle.ifEmpty { itemInfo.urls.firstOrNull() ?: viewModel.rpId }itemView.setOnClickListener {viewModel.onMergeSelected(itemInfo)diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/Item.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/Item.ktindex 97d7f2646..7b00f552e 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/Item.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/Item.kt@@ -48,13 +48,7 @@ data class Item(}/**- * Get the URL field value (login.url).- */- val url: String?- get() = getFieldValue(FieldKey.LOGIN_URL)-- /**- * Get all URL field values (login.url) for multi-URL support.+ * Get all URL field values (login.url).*/val urls: List<String>get() = getFieldValues(FieldKey.LOGIN_URL)diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.ktindex 8ecf97361..2f4f613d7 100644--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/repositories/PasskeyRepository.kt@@ -425,7 +425,6 @@ class PasskeyRepository(database: VaultDatabase) : BaseRepository(database) {ItemWithCredentialInfo(itemId = itemId,serviceName = itemName,- url = urls.firstOrNull(),urls = urls,username = itemUsername,hasPassword = hasPassword,@@ -747,8 +746,7 @@ data class PasskeyWithItem(data class ItemWithCredentialInfo(val itemId: UUID,val serviceName: String?,- val url: String?,- val urls: List<String> = url?.let { listOf(it) } ?: emptyList(),+ val urls: List<String>,val username: String?,val hasPassword: Boolean,val createdAt: Date,diff --git a/apps/mobile-app/android/app/src/test/java/net/aliasvault/app/nativevaultmanager/VaultStoreTest.kt b/apps/mobile-app/android/app/src/test/java/net/aliasvault/app/nativevaultmanager/VaultStoreTest.ktindex 7ef15a330..475288d45 100644--- a/apps/mobile-app/android/app/src/test/java/net/aliasvault/app/nativevaultmanager/VaultStoreTest.kt+++ b/apps/mobile-app/android/app/src/test/java/net/aliasvault/app/nativevaultmanager/VaultStoreTest.kt@@ -79,7 +79,7 @@ class VaultStoreTest {// Verify all expected propertiesassertEquals("Gmail Test Account", gmailItem.name)- assertEquals("https://google.com", gmailItem.url)+ assertEquals(listOf("https://google.com"), gmailItem.urls)assertEquals("[email protected]", gmailItem.username)assertEquals("Test", gmailItem.firstName)assertEquals("User", gmailItem.lastName)diff --git a/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift b/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swiftindex 082c6b235..014f539bb 100644--- a/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift+++ b/apps/mobile-app/ios/Autofill/CredentialProviderViewController+Passkey.swift@@ -288,7 +288,7 @@ extension CredentialProviderViewController: PasskeyProviderDelegate {ItemWithCredentialInfo(itemId: item.itemId,serviceName: item.serviceName,- url: item.url,+ urls: item.urls,username: item.username,hasPassword: item.hasPassword,createdAt: item.createdAt,diff --git a/apps/mobile-app/ios/VaultModels/AutofillCredential.swift b/apps/mobile-app/ios/VaultModels/AutofillCredential.swiftindex 4638123b4..fb3a8b91c 100644--- a/apps/mobile-app/ios/VaultModels/AutofillCredential.swift+++ b/apps/mobile-app/ios/VaultModels/AutofillCredential.swift@@ -6,7 +6,6 @@ import Foundationpublic struct AutofillCredential: Codable, Hashable, Equatable {public let id: UUIDpublic let serviceName: String?- public let serviceUrl: String?/// All URLs associated with this credential (for multi-URL support)public let serviceUrls: [String]public let logo: Data?@@ -27,8 +26,7 @@ public struct AutofillCredential: Codable, Hashable, Equatable {public init(id: UUID,serviceName: String?,- serviceUrl: String?,- serviceUrls: [String] = [],+ serviceUrls: [String],logo: Data?,username: String?,email: String?,@@ -41,8 +39,7 @@ public struct AutofillCredential: Codable, Hashable, Equatable {) {self.id = idself.serviceName = serviceName- self.serviceUrl = serviceUrl- self.serviceUrls = serviceUrls.isEmpty ? (serviceUrl.map { [$0] } ?? []) : serviceUrls+ self.serviceUrls = serviceUrlsself.logo = logoself.username = usernameself.email = email@@ -62,7 +59,6 @@ public struct AutofillCredential: Codable, Hashable, Equatable {public init(from item: Item, passkey: Passkey? = nil, totp: TotpCode? = nil) {self.id = item.idself.serviceName = item.name- self.serviceUrl = item.urlself.serviceUrls = item.urlsself.logo = item.logoself.username = item.usernamediff --git a/apps/mobile-app/ios/VaultModels/Item.swift b/apps/mobile-app/ios/VaultModels/Item.swiftindex ac1f2c8be..a470812bc 100644--- a/apps/mobile-app/ios/VaultModels/Item.swift+++ b/apps/mobile-app/ios/VaultModels/Item.swift@@ -63,12 +63,7 @@ public struct Item: Codable, Hashable, Equatable {return fields.filter { $0.fieldKey == fieldKey }.map { $0.value }}- /// Get the URL field value (login.url).- public var url: String? {- return getFieldValue(FieldKey.loginUrl)- }-- /// Get all URL field values (login.url) for multi-URL support.+ /// Get all URL field values (login.url).public var urls: [String] {return getFieldValues(FieldKey.loginUrl)}diff --git a/apps/mobile-app/ios/VaultStoreKit/Database/Repositories/PasskeyRepository.swift b/apps/mobile-app/ios/VaultStoreKit/Database/Repositories/PasskeyRepository.swiftindex 2d4d2beee..fee6eeaf2 100644--- a/apps/mobile-app/ios/VaultStoreKit/Database/Repositories/PasskeyRepository.swift+++ b/apps/mobile-app/ios/VaultStoreKit/Database/Repositories/PasskeyRepository.swift@@ -98,7 +98,7 @@ public class PasskeyRepository: BaseRepository {items.append(ItemWithCredentialInfoData(itemId: itemId,serviceName: serviceName,- url: url,+ urls: url.map { [$0] } ?? [],username: itemUsername,hasPassword: hasPassword,createdAt: createdAt,@@ -518,7 +518,6 @@ public class PasskeyRepository: BaseRepository {public struct ItemWithCredentialInfoData {public let itemId: UUIDpublic let serviceName: String?- public let url: String?/// All URLs associated with this item (supports multi-value URL fields)public let urls: [String]public let username: String?@@ -526,21 +525,9 @@ public struct ItemWithCredentialInfoData {public let createdAt: Datepublic let updatedAt: Date- public init(itemId: UUID, serviceName: String?, url: String?, username: String?, hasPassword: Bool, createdAt: Date, updatedAt: Date) {- self.itemId = itemId- self.serviceName = serviceName- self.url = url- self.urls = url.map { [$0] } ?? []- self.username = username- self.hasPassword = hasPassword- self.createdAt = createdAt- self.updatedAt = updatedAt- }-public init(itemId: UUID, serviceName: String?, urls: [String], username: String?, hasPassword: Bool, createdAt: Date, updatedAt: Date) {self.itemId = itemIdself.serviceName = serviceName- self.url = urls.firstself.urls = urlsself.username = usernameself.hasPassword = hasPassworddiff --git a/apps/mobile-app/ios/VaultStoreKitTests/VaultStoreKitTests.swift b/apps/mobile-app/ios/VaultStoreKitTests/VaultStoreKitTests.swiftindex f80badb9b..8a10f9ebd 100644--- a/apps/mobile-app/ios/VaultStoreKitTests/VaultStoreKitTests.swift+++ b/apps/mobile-app/ios/VaultStoreKitTests/VaultStoreKitTests.swift@@ -75,7 +75,7 @@ final public class VaultStoreKitTests: XCTestCase {if let gmail = gmailItem {// Verify all expected propertiesXCTAssertEqual(gmail.name, "Gmail Test Account")- XCTAssertEqual(gmail.url, "https://google.com")+ XCTAssertEqual(gmail.urls, ["https://google.com"])XCTAssertEqual(gmail.username, "[email protected]")XCTAssertEqual(gmail.firstName, "Test")XCTAssertEqual(gmail.lastName, "User")diff --git a/apps/mobile-app/ios/VaultUI/Registration/Passkeys/Models/ItemWithCredentialInfo.swift b/apps/mobile-app/ios/VaultUI/Registration/Passkeys/Models/ItemWithCredentialInfo.swiftindex e327e06a3..b19bcbb7b 100644--- a/apps/mobile-app/ios/VaultUI/Registration/Passkeys/Models/ItemWithCredentialInfo.swift+++ b/apps/mobile-app/ios/VaultUI/Registration/Passkeys/Models/ItemWithCredentialInfo.swift@@ -5,17 +5,18 @@ public struct ItemWithCredentialInfo: Identifiable {public let id: UUID // Alias for itemId for Identifiable conformancepublic let itemId: UUIDpublic let serviceName: String?- public let url: String?+ /// All URLs associated with this item (supports multi-value URL fields)+ public let urls: [String]public let username: String?public let hasPassword: Boolpublic let createdAt: Datepublic let updatedAt: Date- public init(itemId: UUID, serviceName: String?, url: String?, username: String?, hasPassword: Bool, createdAt: Date, updatedAt: Date) {+ public init(itemId: UUID, serviceName: String?, urls: [String], username: String?, hasPassword: Bool, createdAt: Date, updatedAt: Date) {self.id = itemIdself.itemId = itemIdself.serviceName = serviceName- self.url = url+ self.urls = urlsself.username = usernameself.hasPassword = hasPasswordself.createdAt = createdAtdiff --git a/apps/mobile-app/ios/VaultUI/Selection/Components/CredentialCardView.swift b/apps/mobile-app/ios/VaultUI/Selection/Components/CredentialCardView.swiftindex a81392561..f41d435a6 100644--- a/apps/mobile-app/ios/VaultUI/Selection/Components/CredentialCardView.swift+++ b/apps/mobile-app/ios/VaultUI/Selection/Components/CredentialCardView.swift@@ -193,7 +193,7 @@ public func truncateText(_ text: String?, limit: Int) -> String {credential: AutofillCredential(id: UUID(),serviceName: "Example Service with a very long name bla bla bla",- serviceUrl: "https://example.com",+ serviceUrls: ["https://example.com"],logo: nil,username: "usernameverylongverylongtextindeed",email: "[email protected]",diff --git a/apps/mobile-app/ios/VaultUI/Selection/CredentialProviderView.swift b/apps/mobile-app/ios/VaultUI/Selection/CredentialProviderView.swiftindex 64495ed6a..ad323e451 100644--- a/apps/mobile-app/ios/VaultUI/Selection/CredentialProviderView.swift+++ b/apps/mobile-app/ios/VaultUI/Selection/CredentialProviderView.swift@@ -476,7 +476,7 @@ extension AutofillCredential {AutofillCredential(id: UUID(),serviceName: "Example Service",- serviceUrl: "https://example.com",+ serviceUrls: ["https://example.com"],logo: nil,username: "johndoe",email: "[email protected]",@@ -497,7 +497,7 @@ public class PreviewCredentialProviderViewModel: CredentialProviderViewModel {AutofillCredential(id: UUID(),serviceName: "Another Service",- serviceUrl: "https://another.com",+ serviceUrls: ["https://another.com"],logo: nil,username: "anotheruser",email: "[email protected]",diff --git a/apps/mobile-app/ios/VaultUI/Selection/PasskeyProviderView.swift b/apps/mobile-app/ios/VaultUI/Selection/PasskeyProviderView.swiftindex fafc54676..972f5cf3b 100644--- a/apps/mobile-app/ios/VaultUI/Selection/PasskeyProviderView.swift+++ b/apps/mobile-app/ios/VaultUI/Selection/PasskeyProviderView.swift@@ -146,7 +146,7 @@ private struct PasskeyCredentialCard: View {}VStack(alignment: .leading, spacing: 4) {- Text(credential.serviceName ?? credential.serviceUrl ?? "-")+ Text(credential.serviceName ?? credential.serviceUrls.first ?? "-").font(.headline).foregroundColor(colors.text)@@ -252,12 +252,14 @@ public class PasskeyProviderViewModel: ObservableObject {// Prepare searchable fields including passkey rpIdsvar searchableFields = [credential.serviceName?.lowercased() ?? "",- credential.serviceUrl?.lowercased() ?? "",credential.username?.lowercased() ?? "",credential.email?.lowercased() ?? "",credential.notes?.lowercased() ?? ""]+ // Add all associated URLs to searchable fields+ searchableFields.append(contentsOf: credential.serviceUrls.map { $0.lowercased() })+// Add passkey rpId to searchable fieldsif let passkey = credential.passkey {searchableFields.append(passkey.rpId.lowercased())@@ -336,7 +338,7 @@ public class PasskeyProviderViewModel: ObservableObject {AutofillCredential(id: UUID(),serviceName: "GitHub",- serviceUrl: "https://github.com",+ serviceUrls: ["https://github.com"],logo: nil,username: "johndoe",email: "[email protected]",@@ -349,7 +351,7 @@ public class PasskeyProviderViewModel: ObservableObject {AutofillCredential(id: UUID(),serviceName: "Google",- serviceUrl: "https://google.com",+ serviceUrls: ["https://google.com"],logo: nil,username: nil,email: "[email protected]",@@ -395,7 +397,7 @@ public class PasskeyProviderViewModel: ObservableObject {AutofillCredential(id: UUID(),serviceName: "GitHub",- serviceUrl: "https://github.com",+ serviceUrls: ["https://github.com"],logo: nil,username: "johndoe",email: "[email protected]",