Merge branch 'main' into daniel/private-email-autofill

# Conflicts: # Sources/BrowserServicesKit/SecureVault/SecureVaultManager.swift
duckduckgo · Aug 2, 2023 · 5206c6d · 5206c6d
2 parents a5d33aa + 289d6fe
commit 5206c6d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/Sources/BrowserServicesKit/SecureVault/SecureVaultManager.swift b/Sources/BrowserServicesKit/SecureVault/SecureVaultManager.swift
@@ -594,7 +594,26 @@ extension SecureVaultManager: AutofillSecureVaultDelegate {
 
     private func existingCredentials(with autofillData: AutofillUserScript.DetectedAutofillData,
                                      domain: String,
+                                     automaticallySavedCredentials: Bool,
+                                     shouldSilentlySave: Bool,
                                      vault: any AutofillSecureVault) throws -> SecureVaultModels.WebsiteCredentials? {
+        if let credentials = autofillData.credentials, let passwordData = credentials.password.data(using: .utf8) {
+            let accounts = try vault.accountsFor(domain: domain)
+            if let account = accounts.first(where: { $0.username == credentials.username ?? "" }) {
+                if let existingAccountID = account.id,
+                   let existingCredentials = try vault.websiteCredentialsFor(accountId: existingAccountID),
+                   existingCredentials.password == passwordData {
+                    if automaticallySavedCredentials || shouldSilentlySave {
+                        os_log("Found duplicate credentials which were just saved, notifying user", log: .passwordManager)
+                        return SecureVaultModels.WebsiteCredentials(account: account, password: passwordData)
+                    } else {
+                        os_log("Found duplicate credentials which were previously saved, avoid notifying user", log: .passwordManager)
+                        return nil
+                    }
+                } else {
+                    os_log("Found existing credentials to update", log: .passwordManager)
+                    return SecureVaultModels.WebsiteCredentials(account: account, password: passwordData)
+                }
 
         guard let credentials = autofillData.credentials,
             let passwordData = credentials.password?.data(using: .utf8) else {
@@ -712,6 +731,7 @@ extension SecureVaultManager: AutofillSecureVaultDelegate {
 
     private func existingCredentialsInPasswordManager(with autofillData: AutofillUserScript.DetectedAutofillData,
                                                       domain: String,
+                                                      automaticallySavedCredentials: Bool,
                                                       vault: any AutofillSecureVault) -> SecureVaultModels.WebsiteCredentials? {
         guard let passwordManager = passwordManager, passwordManager.isEnabled else {
             return nil

diff --git a/Tests/BrowserServicesKitTests/SecureVault/SecureVaultManagerTests.swift b/Tests/BrowserServicesKitTests/SecureVault/SecureVaultManagerTests.swift
@@ -750,6 +750,10 @@ private class MockSecureVaultManagerDelegate: SecureVaultManagerDelegate {
         true
     }
 
+    func secureVaultManagerShouldSaveData(_: BrowserServicesKit.SecureVaultManager) -> Bool {
+        true
+    }
+
     func secureVaultManager(_: SecureVaultManager, didRequestCreditCardsManagerForDomain domain: String) {}
 
     func secureVaultManager(_: SecureVaultManager, didRequestIdentitiesManagerForDomain domain: String) {}