macOS BSK change: De-duplicate passwords on import (#3048)

duckduckgo · Jul 5, 2024 · 761b139 · 761b139
1 parent effc931
commit 761b139
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9946,7 +9946,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 166.0.0;
+				version = 167.0.0;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "f23384018ede5aa63777b1c143e81855a16210fd",
-        "version" : "166.0.0"
+        "revision" : "5954412504b0cf294f5c0d90d7a0c8dfcd009558",
+        "version" : "167.0.0"
       }
     },
     {

diff --git a/DuckDuckGoTests/MockSecureVault.swift b/DuckDuckGoTests/MockSecureVault.swift
@@ -39,7 +39,6 @@ let MockSecureVaultFactory = SecureVaultFactory<MockSecureVault>(
 )
 
 final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
-
     public typealias MockSecureVaultDatabaseProviders = SecureStorageProviders<T>
 
     var storedAccounts: [SecureVaultModels.WebsiteAccount] = []
@@ -63,6 +62,11 @@ final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
         data
     }
 
+    func encryptPassword(for credentials: BrowserServicesKit.SecureVaultModels.WebsiteCredentials, key l2Key: Data?, salt: Data?) throws -> BrowserServicesKit.SecureVaultModels.WebsiteCredentials {
+        .init(account: .init(username: nil, domain: nil), password: nil)
+    }
+
+
     func decrypt(_ data: Data, using key: Data) throws -> Data {
         data
     }