Merge commit 'd791a005b56059ac6b42668726c384d222c80e35' into smodi/co…

…mpilation_time_tracking

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Core/FeatureFlag.swift

@@ -32,6 +32,7 @@ public enum FeatureFlag: String {
     case autofillFailureReporting
     case autofillOnForExistingUsers
     case autofillUnknownUsernameCategorization
+    case autofillPartialFormSaves
     case incontextSignup
     case autoconsentOnByDefault
     case history
@@ -101,6 +102,8 @@ extension FeatureFlag: FeatureFlagDescribing {
             return .remoteReleasable(.subfeature(AutofillSubfeature.onForExistingUsers))
         case .autofillUnknownUsernameCategorization:
             return .remoteReleasable(.subfeature(AutofillSubfeature.unknownUsernameCategorization))
+        case .autofillPartialFormSaves:
+            return .remoteReleasable(.subfeature(AutofillSubfeature.partialFormSaves))
         case .incontextSignup:
             return .remoteReleasable(.feature(.incontextSignup))
         case .autoconsentOnByDefault:

Core/Pixel.swift

@@ -147,6 +147,7 @@ public struct PixelParameters {
 
     // Autofill
     public static let countBucket = "count_bucket"
+    public static let backfilled = "backfilled"
 
     // Privacy Dashboard
     public static let daysSinceInstall = "daysSinceInstall"

DuckDuckGo/EmailSignupViewController.swift

@@ -64,6 +64,7 @@ class EmailSignupViewController: UIViewController {
 
     lazy private var vaultManager: SecureVaultManager = {
         let manager = SecureVaultManager(includePartialAccountMatches: true,
+                                         shouldAllowPartialFormSaves: featureFlagger.isFeatureOn(.autofillPartialFormSaves),
                                          tld: AppDependencyProvider.shared.storageCache.tld)
         manager.delegate = self
         return manager

DuckDuckGo/SaveAutofillLoginManager.swift

@@ -29,6 +29,7 @@ protocol SaveAutofillLoginManagerProtocol {
     var isPasswordOnlyAccount: Bool { get }
     var hasOtherCredentialsOnSameDomain: Bool { get }
     var hasSavedMatchingPasswordWithoutUsername: Bool { get }
+    var hasSavedMatchingUsernameWithoutPassword: Bool { get }
     var hasSavedMatchingUsername: Bool { get }
 
     static func saveCredentials(_ credentials: SecureVaultModels.WebsiteCredentials, with factory: AutofillVaultFactory) throws -> Int64
@@ -85,7 +86,15 @@ final class SaveAutofillLoginManager: SaveAutofillLoginManagerProtocol {
     var hasSavedMatchingUsername: Bool {
         savedMatchingUsernameCredential != nil
     }
-
+
+    var hasSavedMatchingUsernameWithoutPassword: Bool {
+        if let savedMatchingUsernameCredential {
+            return savedMatchingUsernameCredential.password.flatMap { String(data: $0, encoding: .utf8) }.isNilOrEmpty
+        } else {
+            return false
+        }
+    }
+
     func prepareData(completion: @escaping () -> Void) {
         fetchDomainStoredCredentials { [weak self] credentials in
             self?.domainStoredCredentials = credentials
@@ -112,7 +121,7 @@ final class SaveAutofillLoginManager: SaveAutofillLoginManagerProtocol {
         let credentialsWithSameUsername = domainStoredCredentials.filter { $0.account.username == credentials.account.username }
         return credentialsWithSameUsername.first
     }
-    
+
     private func fetchDomainStoredCredentials(completion: @escaping ([SecureVaultModels.WebsiteCredentials]) -> Void) {
         DispatchQueue.global(qos: .userInteractive).async {
             var result = [SecureVaultModels.WebsiteCredentials]()

DuckDuckGo/SaveLoginView.swift

@@ -264,6 +264,7 @@ private enum Const {
 
 struct SaveLoginView_Previews: PreviewProvider {
     private struct MockManager: SaveAutofillLoginManagerProtocol {
+        var hasSavedMatchingUsernameWithoutPassword: Bool { false }
 
         var username: String { "[email protected]" }
         var visiblePassword: String { "supersecurepasswordquack" }

DuckDuckGo/SaveLoginViewController.swift

@@ -77,9 +77,11 @@ class SaveLoginViewController: UIViewController {
         case .savePassword:
             Pixel.fire(pixel: .autofillLoginsSavePasswordModalDismissed)
         case .updateUsername:
-            Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDismissed)
+            let isBackfilled = viewModel.isUpdatingEmptyUsername
+            Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDismissed, withAdditionalParameters: [PixelParameters.backfilled: String(describing: isBackfilled)])
         case .updatePassword:
-            Pixel.fire(pixel: .autofillLoginsUpdatePasswordModalDismissed)
+            let isBackfilled = viewModel.isUpdatingEmptyPassword
+            Pixel.fire(pixel: .autofillLoginsUpdatePasswordModalDismissed, withAdditionalParameters: [PixelParameters.backfilled: String(describing: isBackfilled)])
         }
 
         viewModel.viewControllerDidDisappear()
@@ -103,9 +105,11 @@ class SaveLoginViewController: UIViewController {
         case .savePassword:
             Pixel.fire(pixel: .autofillLoginsSavePasswordModalDisplayed)
         case .updateUsername:
-            Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDisplayed)
+            let isBackfilled = saveViewModel.isUpdatingEmptyUsername
+            Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDisplayed, withAdditionalParameters: [PixelParameters.backfilled: String(describing: isBackfilled)])
         case .updatePassword:
-            Pixel.fire(pixel: .autofillLoginsUpdatePasswordModalDisplayed)
+            let isBackfilled = saveViewModel.isUpdatingEmptyPassword
+            Pixel.fire(pixel: .autofillLoginsUpdatePasswordModalDisplayed, withAdditionalParameters: [PixelParameters.backfilled: String(describing: isBackfilled)])
         }
     }
 }
@@ -124,9 +128,11 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate {
             delegate?.saveLoginViewController(self, didSaveCredentials: credentialManager.credentials)
         case .updatePassword, .updateUsername:
             if viewModel.layoutType == .updatePassword {
-                Pixel.fire(pixel: .autofillLoginsUpdatePasswordModalConfirmed)
+                let isBackfilled = viewModel.isUpdatingEmptyPassword
+                Pixel.fire(pixel: .autofillLoginsUpdatePasswordModalConfirmed, withAdditionalParameters: [PixelParameters.backfilled: String(describing: isBackfilled)])
             } else {
-                Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalConfirmed)
+                let isBackfilled = viewModel.isUpdatingEmptyUsername
+                Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalConfirmed, withAdditionalParameters: [PixelParameters.backfilled: String(describing: isBackfilled)])
             }
             delegate?.saveLoginViewController(self, didUpdateCredentials: credentialManager.credentials)
         }

DuckDuckGo/SaveLoginViewModel.swift

@@ -88,10 +88,14 @@ final class SaveLoginViewModel: ObservableObject {
         credentialManager.hasSavedMatchingUsername
     }
 
-    var isUpdatingUsername: Bool {
+    var isUpdatingEmptyUsername: Bool {
         credentialManager.hasSavedMatchingPasswordWithoutUsername
     }
 
+    var isUpdatingEmptyPassword: Bool {
+        credentialManager.hasSavedMatchingUsernameWithoutPassword
+    }
+
     var hiddenPassword: String {
         PasswordHider(password: credentialManager.visiblePassword).hiddenPassword
     }
@@ -132,7 +136,7 @@ final class SaveLoginViewModel: ObservableObject {
             return .savePassword
         }
 
-        if isUpdatingUsername {
+        if isUpdatingEmptyUsername {
             return .updateUsername
         }
 

DuckDuckGo/TabViewController.swift

@@ -270,6 +270,7 @@ class TabViewController: UIViewController {
 
     lazy var vaultManager: SecureVaultManager = {
         let manager = SecureVaultManager(includePartialAccountMatches: true,
+                                         shouldAllowPartialFormSaves: featureFlagger.isFeatureOn(.autofillPartialFormSaves),
                                          tld: AppDependencyProvider.shared.storageCache.tld)
         manager.delegate = self
         return manager