Merge branch 'main' into sam/privacy-pro-surveys

# By Fernando Bunn (3) and others
# Via GitHub
* main:
  Autofill engagement KPIs for pixel reporting (#2806)
  autofill: don't prefix autofill email pixels with `m.mac.` (#2808)
  Bump BSK (#2807)
  Make profile selector optional (#2811)
  Add History to iOS (updated UI and rollout) (#2770)
  New autofill save & update password prompt pixels for alignment with iOS (#2801)
  Add mylife data broker (#2786)
  Increase test timeout (#2810)
  Subscription refactoring, BSK update (#2809)
  Check for entitlement in DBP agent (#2802)
  move permanent survey card to first position (#2804)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "branch" : "fcappelli/subscription_refactoring_2",
-        "revision" : "874ae4269db821797742655e134e72199c2813c8"
+        "revision" : "e1e436422bc167933baa0f90838958f2ac7119f3",
+        "version" : "146.2.0"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "bb8e7e62104ed6506c7bfd3ef7aa4aca3686ed4f",
-        "version" : "5.15.0"
+        "revision" : "fa861c4eccb21d235e34070b208b78bdc32ece08",
+        "version" : "5.17.0"
       }
     },
     {
@@ -131,8 +131,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
-        "revision" : "46989693916f56d1186bd59ac15124caef896560",
-        "version" : "1.3.1"
+        "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
+        "version" : "1.4.0"
       }
     },
     {

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1530"
-   version = "1.8">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

DuckDuckGo/Application/AppDelegate.swift

@@ -76,6 +76,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     let featureFlagger: FeatureFlagger
     private var appIconChanger: AppIconChanger!
     private var autoClearHandler: AutoClearHandler!
+    private(set) var autofillPixelReporter: AutofillPixelReporter?
 
     private(set) var syncDataProviders: SyncDataProviders!
     private(set) var syncService: DDGSyncing?
@@ -94,7 +95,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
     private var networkProtectionSubscriptionEventHandler: NetworkProtectionSubscriptionEventHandler?
 #if DBP
-    private var dataBrokerProtectionSubscriptionEventHandler: DataBrokerProtectionSubscriptionEventHandler?
+    private lazy var dataBrokerProtectionSubscriptionEventHandler: DataBrokerProtectionSubscriptionEventHandler = {
+        let authManager = DataBrokerAuthenticationManagerBuilder.buildAuthenticationManager(subscriptionManager: subscriptionManager)
+        return DataBrokerProtectionSubscriptionEventHandler(featureDisabler: DataBrokerProtectionFeatureDisabler(),
+                                                            authenticationManager: authManager,
+                                                            pixelHandler: DataBrokerProtectionPixelsHandler())
+    }()
+
 #endif
 
     private var didFinishLaunching = false
@@ -216,9 +223,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         networkProtectionSubscriptionEventHandler = NetworkProtectionSubscriptionEventHandler(subscriptionManager: subscriptionManager,
                                                                                               tunnelController: tunnelController,
                                                                                               vpnUninstaller: vpnUninstaller)
-#if DBP
-        dataBrokerProtectionSubscriptionEventHandler = DataBrokerProtectionSubscriptionEventHandler(subscriptionManager: subscriptionManager)
-#endif
     }
 
     // swiftlint:disable:next function_body_length
@@ -310,14 +314,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         UNUserNotificationCenter.current().delegate = self
 
 #if DBP
-        dataBrokerProtectionSubscriptionEventHandler?.registerForSubscriptionAccountManagerEvents()
+        dataBrokerProtectionSubscriptionEventHandler.registerForSubscriptionAccountManagerEvents()
 #endif
 
 #if DBP
         DataBrokerProtectionAppEvents().applicationDidFinishLaunching()
 #endif
 
         setUpAutoClearHandler()
+
+        setUpAutofillPixelReporter()
     }
 
     func applicationDidBecomeActive(_ notification: Notification) {
@@ -584,6 +590,27 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
             }
         }
     }
+
+    private func setUpAutofillPixelReporter() {
+        autofillPixelReporter = AutofillPixelReporter(
+                userDefaults: .standard,
+                eventMapping: EventMapping<AutofillPixelEvent> {event, _, params, _ in
+                    switch event {
+                    case .autofillActiveUser:
+                        PixelKit.fire(GeneralPixel.autofillActiveUser)
+                    case .autofillEnabledUser:
+                        PixelKit.fire(GeneralPixel.autofillEnabledUser)
+                    case .autofillOnboardedUser:
+                        PixelKit.fire(GeneralPixel.autofillOnboardedUser)
+                    case .autofillLoginsStacked:
+                        PixelKit.fire(GeneralPixel.autofillLoginsStacked, withAdditionalParameters: params)
+                    case .autofillCreditCardsStacked:
+                        PixelKit.fire(GeneralPixel.autofillCreditCardsStacked, withAdditionalParameters: params)
+                    }
+                },
+                passwordManager: PasswordManagerCoordinator.shared,
+                installDate: AppDelegate.firstLaunchDate)
+    }
 }
 
 extension AppDelegate: UNUserNotificationCenterDelegate {

DuckDuckGo/Autofill/ContentOverlayViewController.swift

@@ -296,6 +296,7 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
 
     public func secureVaultManager(_: SecureVaultManager, didAutofill type: AutofillType, withObjectId objectId: String) {
         PixelKit.fire(GeneralPixel.formAutofilled(kind: type.formAutofillKind))
+        NotificationCenter.default.post(name: .autofillFillEvent, object: nil)
 
         if type.formAutofillKind == .password &&
             passwordManagerCoordinator.isEnabled {
@@ -325,8 +326,12 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
 
             self.emailManager.updateLastUseDate()
 
-            PixelKit.fire(GeneralPixel.jsPixel(pixel), withAdditionalParameters: pixelParameters)
+            PixelKit.fire(NonStandardEvent(GeneralPixel.jsPixel(pixel)), withAdditionalParameters: pixelParameters)
+            NotificationCenter.default.post(name: .autofillFillEvent, object: nil)
         } else {
+            if pixel.isIdentityPixel {
+                NotificationCenter.default.post(name: .autofillFillEvent, object: nil)
+            }
             PixelKit.fire(GeneralPixel.jsPixel(pixel), withAdditionalParameters: pixel.pixelParameters)
         }
     }

DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift

@@ -98,7 +98,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .homeViewShowWebUI,
                     .homeViewShowBadPathError,
                     .homeViewCTAMoveApplicationClicked,
-                    .homeViewCTAGrantPermissionClicked:
+                    .homeViewCTAGrantPermissionClicked,
+
+                    .entitlementCheckValid,
+                    .entitlementCheckInvalid,
+                    .entitlementCheckError:
                 PixelKit.fire(event, frequency: .dailyAndCount)
             }
         }

DuckDuckGo/DBP/DataBrokerProtectionSubscriptionEventHandler.swift

@@ -21,28 +21,55 @@ import Foundation
 import Subscription
 import DataBrokerProtection
 import PixelKit
+import Common
 
 final class DataBrokerProtectionSubscriptionEventHandler {
 
-    private let subscriptionManager: SubscriptionManaging
-    private let authRepository: AuthenticationRepository
+    private let authenticationManager: DataBrokerProtectionAuthenticationManaging
     private let featureDisabler: DataBrokerProtectionFeatureDisabling
+    private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
 
-    init(subscriptionManager: SubscriptionManaging,
-         authRepository: AuthenticationRepository = KeychainAuthenticationData(),
-         featureDisabler: DataBrokerProtectionFeatureDisabling = DataBrokerProtectionFeatureDisabler()) {
-        self.subscriptionManager = subscriptionManager
-        self.authRepository = authRepository
+    init(featureDisabler: DataBrokerProtectionFeatureDisabling,
+         authenticationManager: DataBrokerProtectionAuthenticationManaging,
+         pixelHandler: EventMapping<DataBrokerProtectionPixels>) {
         self.featureDisabler = featureDisabler
+        self.authenticationManager = authenticationManager
+        self.pixelHandler = pixelHandler
     }
 
     func registerForSubscriptionAccountManagerEvents() {
-        NotificationCenter.default.addObserver(self, selector: #selector(handleAccountDidSignOut), name: .accountDidSignOut, object: nil)
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(handleAccountDidSignOut),
+                                               name: .accountDidSignOut,
+                                               object: nil)
+
+        NotificationCenter.default.addObserver(self,
+                                               selector: #selector(entitlementsDidChange),
+                                               name: .entitlementsDidChange,
+                                               object: nil)
     }
 
     @objc private func handleAccountDidSignOut() {
         featureDisabler.disableAndDelete()
     }
+
+    @objc private func entitlementsDidChange() {
+        Task { @MainActor in
+            do {
+                if try await authenticationManager.hasValidEntitlement() {
+                    pixelHandler.fire(.entitlementCheckValid)
+                } else {
+                    pixelHandler.fire(.entitlementCheckInvalid)
+                    featureDisabler.disableAndDelete()
+                }
+            } catch {
+                /// We don't want to disable the agent in case of an error while checking for entitlements.
+                /// Since this is a destructive action, the only situation that should cause the data to be deleted and the agent to be removed is .success(false)
+                pixelHandler.fire(.entitlementCheckError)
+                assertionFailure("Error validating entitlement \(error)")
+            }
+        }
+    }
 }
 
 #endif

DuckDuckGo/DataImport/Logins/SecureVault/SecureVaultLoginImporter.swift

@@ -60,6 +60,10 @@ final class SecureVaultLoginImporter: LoginImporter {
             }
         }
 
+        if successful.count > 0 {
+            NotificationCenter.default.post(name: .autofillSaveEvent, object: nil, userInfo: nil)
+        }
+
         return .init(successful: successful.count, duplicate: duplicates.count, failed: failed.count)
     }
 

DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift

@@ -274,12 +274,10 @@ extension HomePage.Models {
         }
 
         var randomisedFeatures: [FeatureType] {
-            var features = FeatureType.allCases
-            features.shuffle()
-            for (index, feature) in features.enumerated() where feature == .defaultBrowser {
-                features.remove(at: index)
-                features.insert(feature, at: 0)
-            }
+            var features: [FeatureType]  = [.permanentSurvey, .defaultBrowser]
+            var shuffledFeatures = FeatureType.allCases.filter { $0 != .defaultBrowser && $0 != .permanentSurvey }
+            shuffledFeatures.shuffle()
+            features.append(contentsOf: shuffledFeatures)
             return features
         }
 

DuckDuckGo/Menus/MainMenuActions.swift

@@ -743,6 +743,9 @@ extension MainViewController {
             try? vault?.deleteNoteFor(noteId: noteID)
         }
         UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageContinueSetUpImport.rawValue)
+
+        let autofillPixelReporter = AutofillPixelReporter(userDefaults: .standard, eventMapping: EventMapping<AutofillPixelEvent> { _, _, _, _ in }, installDate: nil)
+        autofillPixelReporter.resetStoreDefaults()
     }
 
     @objc func resetBookmarks(_ sender: Any?) {

DuckDuckGo/SecureVault/View/PasswordManagementViewController.swift

@@ -539,6 +539,7 @@ final class PasswordManagementViewController: NSViewController {
                 refetchWithText(searchField.stringValue) { [weak self] in
                     self?.syncModelsOnCredentials(savedCredentials, select: true)
                 }
+                NotificationCenter.default.post(name: .autofillSaveEvent, object: nil, userInfo: nil)
             } else {
                 syncModelsOnCredentials(savedCredentials)
             }