Autofill engagement KPIs for pixel reporting

DuckDuckGo.xcodeproj/project.pbxproj

@@ -13021,7 +13021,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 146.1.0;
+				version = 146.2.0;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "65f3ccadd0118bcef112e3f5fff03e491b3261cd",
-        "version" : "146.1.0"
+        "revision" : "e1e436422bc167933baa0f90838958f2ac7119f3",
+        "version" : "146.2.0"
       }
     },
     {

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?
@@ -321,6 +322,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 #endif
 
         setUpAutoClearHandler()
+
+        setUpAutofillPixelReporter()
     }
 
     func applicationDidBecomeActive(_ notification: Notification) {
@@ -587,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 {
@@ -326,7 +327,11 @@ extension ContentOverlayViewController: SecureVaultManagerDelegate {
             self.emailManager.updateLastUseDate()
 
             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/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/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)
             }

DuckDuckGo/SecureVault/View/SaveCredentialsViewController.swift

@@ -241,6 +241,8 @@ final class SaveCredentialsViewController: NSViewController {
             PixelKit.fire(DebugEvent(GeneralPixel.secureVaultError(error: error)))
         }
 
+        NotificationCenter.default.post(name: .autofillSaveEvent, object: nil, userInfo: nil)
+
         evaluateCredentialsAndFirePixels(for: .confirmed, credentials: existingCredentials)
 
         PixelKit.fire(GeneralPixel.autofillItemSaved(kind: .password))

DuckDuckGo/Statistics/ATB/StatisticsLoader.swift

@@ -167,6 +167,7 @@ final class StatisticsLoader {
             if let data = response?.data, let atb  = try? self.parser.convert(fromJsonData: data) {
                 self.statisticsStore.searchRetentionAtb = atb.version
                 self.storeUpdateVersionIfPresent(atb)
+                NotificationCenter.default.post(name: .searchDAU, object: nil, userInfo: nil)
             }
 
             completion()

DuckDuckGo/Statistics/GeneralPixel.swift

@@ -61,6 +61,12 @@ enum GeneralPixel: PixelKitEventV2 {
     case autofillLoginsUpdateUsernameInlineConfirmed
     case autofillLoginsUpdateUsernameInlineDismissed
 
+    case autofillActiveUser
+    case autofillEnabledUser
+    case autofillOnboardedUser
+    case autofillLoginsStacked
+    case autofillCreditCardsStacked
+
     case bitwardenPasswordAutofilled
     case bitwardenPasswordSaved
 
@@ -414,6 +420,17 @@ enum GeneralPixel: PixelKitEventV2 {
         case .autofillLoginsUpdateUsernameInlineDismissed:
             return "m_mac_autofill_logins_update_username_inline_dismissed"
 
+        case .autofillActiveUser:
+            return "m_mac_autofill_activeuser"
+        case .autofillEnabledUser:
+            return "m_mac_autofill_enableduser"
+        case .autofillOnboardedUser:
+            return "m_mac_autofill_onboardeduser"
+        case .autofillLoginsStacked:
+            return "m_mac_autofill_logins_stacked"
+        case .autofillCreditCardsStacked:
+            return "m_mac_autofill_creditcards_stacked"
+
         case .bitwardenPasswordAutofilled:
             return "m_mac_bitwarden_autofill_password"
 

LocalPackages/DataBrokerProtection/Package.swift

@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "146.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "146.2.0"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],

LocalPackages/NetworkProtectionMac/Package.swift

@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "146.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "146.2.0"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),

LocalPackages/SubscriptionUI/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "146.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "146.2.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

UnitTests/DataExport/MockSecureVault.swift

@@ -161,6 +161,10 @@ final class MockSecureVault<T: AutofillDatabaseProvider>: AutofillSecureVault {
         return storedCards
     }
 
+    func creditCardsCount() throws -> Int {
+        return storedCards.count
+    }
+
     func creditCardFor(id: Int64) throws -> SecureVaultModels.CreditCard? {
         return storedCards.first { $0.id == id }
     }
@@ -408,6 +412,10 @@ class MockDatabaseProvider: AutofillDatabaseProvider {
         return Array(_creditCards.values)
     }
 
+    func creditCardsCount() throws -> Int {
+        return _creditCards.count
+    }
+
     func creditCardForCardId(_ cardId: Int64) throws -> SecureVaultModels.CreditCard? {
         return _creditCards[cardId]
     }