mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2026-01-24 05:53:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update iOS app credential filter logic (#1013)

Browse Source
This commit is contained in:
Leendert de Borst
2025-07-22 16:48:14 +02:00
committed by Leendert de Borst
parent b0d03d6bb1
commit c92c8fc663
2 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/mobile-app/ios/VaultModels/Credential.swift
View File

@@ -1,6 +1,6 @@
import Foundation
public struct Credential: Codable {
public struct Credential: Codable, Hashable, Equatable {
public let id: UUID
public let alias: Alias?
public let service: Service
@@ -32,6 +32,14 @@ public struct Credential: Codable {
self.updatedAt = updatedAt
self.isDeleted = isDeleted
}
public static func == (lhs: Credential, rhs: Credential) -> Bool {
return lhs.id == rhs.id
}
public func hash(into hasher: inout Hasher) {
hasher.combine(id)
}
}
public struct Service: Codable, Hashable {

64
apps/mobile-app/ios/VaultUI/Views/CredentialProviderView.swift
View File

@@ -246,7 +246,7 @@ public class CredentialProviderViewModel: ObservableObject {
}
}
func filterCredentials() {
func filterCredentials() {
if searchText.isEmpty {
filteredCredentials = credentials
return
@@ -265,60 +265,62 @@ public class CredentialProviderViewModel: ObservableObject {
if let searchUrl = URL(string: searchText), let hostname = searchUrl.host, !hostname.isEmpty {
let baseUrl = "\(searchUrl.scheme ?? "https")://\(hostname)"
let rootDomain = extractRootDomain(from: searchUrl.absoluteString) ?? hostname
let domainWithoutExtension = extractDomainWithoutExtension(from: rootDomain)
let domainWithoutExtension = extractDomainWithoutExtension(from: rootDomain).lowercased()
var matches: Set<Credential> = []
// 1. Exact URL match
var matches = credentials.filter { credential in
let exactMatches = credentials.filter { credential in
if let serviceUrl = credential.service.url,
let url = URL(string: serviceUrl) {
let url = URL(string: serviceUrl) {
return url.absoluteString.lowercased() == searchUrl.absoluteString.lowercased()
}
return false
}
matches.formUnion(exactMatches)
// 2. Base URL match (excluding query/path)
if matches.isEmpty {
matches = credentials.filter { credential in
if let serviceUrl = credential.service.url,
let url = URL(string: serviceUrl) {
return url.absoluteString.lowercased().hasPrefix(baseUrl.lowercased())
}
return false
let baseUrlMatches = credentials.filter { credential in
if let serviceUrl = credential.service.url,
let url = URL(string: serviceUrl) {
return url.absoluteString.lowercased().hasPrefix(baseUrl.lowercased())
}
return false
}
matches.formUnion(baseUrlMatches)
// 3. Root domain match (e.g., coolblue.nl)
if matches.isEmpty {
matches = credentials.filter { credential in
if let serviceUrl = credential.service.url,
let credRootDomain = extractRootDomain(from: serviceUrl) {
return credRootDomain.lowercased() == rootDomain.lowercased()
}
return false
let rootDomainMatches = credentials.filter { credential in
if let serviceUrl = credential.service.url,
let credRootDomain = extractRootDomain(from: serviceUrl) {
return credRootDomain.lowercased() == rootDomain.lowercased()
}
return false
}
matches.formUnion(rootDomainMatches)
// 4. Domain name part match (e.g., "coolblue" in service name)
if matches.isEmpty {
matches = credentials.filter { credential in
if let serviceName = credential.service.name?.lowercased() {
return serviceName.contains(domainWithoutExtension.lowercased()) ||
domainWithoutExtension.lowercased().contains(serviceName)
}
return false
}
// 4. Domain name part match (e.g., "coolblue" in service name or notes)
let domainNameMatches = credentials.filter { credential in
let serviceNameMatch = credential.service.name?.lowercased().contains(domainWithoutExtension) ?? false
let notesMatch = credential.notes?.lowercased().contains(domainWithoutExtension) ?? false
let reverseNameMatch = domainWithoutExtension.contains(credential.service.name?.lowercased() ?? "")
return serviceNameMatch || notesMatch || reverseNameMatch
}
matches.formUnion(domainNameMatches)
filteredCredentials = matches
filteredCredentials = Array(matches)
} else {
// Non-URL fallback: simple text search in service name or username
// Non-URL fallback: simple text search in service name, username, or notes
let lowercasedSearch = searchText.lowercased()
filteredCredentials = credentials.filter { credential in
(credential.service.name?.localizedCaseInsensitiveContains(searchText) ?? false) ||
(credential.username?.localizedCaseInsensitiveContains(searchText) ?? false)
(credential.service.name?.lowercased().contains(lowercasedSearch) ?? false) ||
(credential.username?.lowercased().contains(lowercasedSearch) ?? false) ||
(credential.notes?.lowercased().contains(lowercasedSearch) ?? false)
}
}
}
func selectCredential(_ credential: Credential) {
selectedCredential = credential