Freemium PIR: Refactor Freemium PIR State to Remove Dependency on AccountManager

DuckDuckGo/Application/AppDelegate.swift

@@ -377,7 +377,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         dataBrokerProtectionSubscriptionEventHandler.registerForSubscriptionAccountManagerEvents()
 
-        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: subscriptionManager.accountManager)
+        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp)
         let pirGatekeeper = DefaultDataBrokerProtectionFeatureGatekeeper(accountManager:
                                                                             subscriptionManager.accountManager,
                                                                          freemiumPIRUserStateManager: freemiumPIRUserStateManager)
@@ -429,7 +429,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
         NetworkProtectionAppEvents(featureGatekeeper: DefaultVPNFeatureGatekeeper(subscriptionManager: subscriptionManager)).applicationDidBecomeActive()
 
-        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: subscriptionManager.accountManager)
+        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp)
         let pirGatekeeper = DefaultDataBrokerProtectionFeatureGatekeeper(accountManager:
                                                                             subscriptionManager.accountManager,
                                                                          freemiumPIRUserStateManager: freemiumPIRUserStateManager)

DuckDuckGo/DBP/DataBrokerProtectionFeatureGatekeeper.swift

@@ -86,7 +86,8 @@ struct DefaultDataBrokerProtectionFeatureGatekeeper: DataBrokerProtectionFeature
     /// - Returns: Bool indicating prerequisites are satisfied
     func arePrerequisitesSatisfied() async -> Bool {
 
-        if freemiumPIRUserStateManager.isActiveUser { return true }
+        let isAuthenticated = accountManager.isUserAuthenticated
+        if !isAuthenticated && freemiumPIRUserStateManager.didOnboard { return true }
 
         let entitlements = await accountManager.hasEntitlement(forProductName: .dataBrokerProtection,
                                                                cachePolicy: .reloadIgnoringLocalCacheData)
@@ -98,8 +99,6 @@ struct DefaultDataBrokerProtectionFeatureGatekeeper: DataBrokerProtectionFeature
             hasEntitlements = false
         }
 
-        let isAuthenticated = accountManager.accessToken != nil
-
         firePrerequisitePixelsAndLogIfNecessary(hasEntitlements: hasEntitlements, isAuthenticatedResult: isAuthenticated)
 
         return hasEntitlements && isAuthenticated

DuckDuckGo/Freemium/FreemiumDebugMenu.swift

@@ -42,11 +42,11 @@ final class FreemiumDebugMenu: NSMenuItem {
 
     @objc
     func setFreemiumPIROnboardStateEnabled() {
-        DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: Application.appDelegate.subscriptionManager.accountManager).didOnboard = true
+        DefaultFreemiumPIRUserStateManager(userDefaults: .dbp).didOnboard = true
     }
 
     @objc
     func setFreemiumPIROnboardStateDisabled() {
-        DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: Application.appDelegate.subscriptionManager.accountManager).didOnboard = false
+        DefaultFreemiumPIRUserStateManager(userDefaults: .dbp).didOnboard = false
     }
 }

DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift

@@ -272,7 +272,7 @@ final class NavigationBarViewController: NSViewController {
 
     @IBAction func optionsButtonAction(_ sender: NSButton) {
         let internalUserDecider = NSApp.delegateTyped.internalUserDecider
-        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: subscriptionManager.accountManager)
+        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp)
         let freemiumPIRFeature = DefaultFreemiumPIRFeature(subscriptionManager: subscriptionManager, accountManager: subscriptionManager.accountManager)
         let menu = MoreOptionsMenu(tabCollectionViewModel: tabCollectionViewModel,
                                    passwordManagerCoordinator: PasswordManagerCoordinator.shared,

DuckDuckGo/RemoteMessaging/RemoteMessagingConfigMatcherProvider.swift

@@ -137,7 +137,8 @@ final class RemoteMessagingConfigMatcherProvider: RemoteMessagingConfigMatcherPr
 
         let deprecatedRemoteMessageStorage = DefaultSurveyRemoteMessagingStorage.surveys()
 
-        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: subscriptionManager.accountManager)
+        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp)
+        let isCurrentFreemiumPIRUser = !subscriptionManager.accountManager.isUserAuthenticated && freemiumPIRUserStateManager.didOnboard
 
         return RemoteMessagingConfigMatcher(
             appAttributeMatcher: AppAttributeMatcher(statisticsStore: statisticsStore,
@@ -164,7 +165,7 @@ final class RemoteMessagingConfigMatcherProvider: RemoteMessagingConfigMatcherPr
                                                        hasCustomHomePage: startupPreferencesPersistor().launchToCustomHomePage,
                                                        isDuckPlayerOnboarded: duckPlayerPreferencesPersistor.youtubeOverlayAnyButtonPressed,
                                                        isDuckPlayerEnabled: duckPlayerPreferencesPersistor.duckPlayerModeBool != false,
-                                                       isCurrentFreemiumPIRUser: freemiumPIRUserStateManager.isActiveUser,
+                                                       isCurrentFreemiumPIRUser: isCurrentFreemiumPIRUser,
                                                        dismissedDeprecatedMacRemoteMessageIds: deprecatedRemoteMessageStorage.dismissedMessageIDs()
                                                       ),
             percentileStore: RemoteMessagingPercentileUserDefaultsStore(keyValueStore: UserDefaults.standard),

DuckDuckGo/Tab/View/BrowserTabViewController.swift

@@ -676,7 +676,7 @@ final class BrowserTabViewController: NSViewController {
         return homePageViewController ?? {
             let subscriptionManager = Application.appDelegate.subscriptionManager
             let freemiumPIRFeature = DefaultFreemiumPIRFeature(subscriptionManager: subscriptionManager, accountManager: subscriptionManager.accountManager)
-            let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: subscriptionManager.accountManager)
+            let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp)
             let homePageViewController = HomePageViewController(tabCollectionViewModel: tabCollectionViewModel, bookmarkManager: bookmarkManager,
                                                                 freemiumPIRFeature: freemiumPIRFeature,
                                                                 freemiumPIRUserStateManager: freemiumPIRUserStateManager)

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionAgentManager.swift

@@ -75,7 +75,7 @@ public class DataBrokerProtectionAgentManagerProvider {
                                                          emailService: emailService,
                                                          captchaService: captchaService)
 
-        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp, accountManager: accountManager)
+        let freemiumPIRUserStateManager = DefaultFreemiumPIRUserStateManager(userDefaults: .dbp)
 
         let agentstopper = DefaultDataBrokerProtectionAgentStopper(dataManager: dataManager,
                                                                    entitlementMonitor: DataBrokerProtectionEntitlementMonitor(),
@@ -100,6 +100,7 @@ public class DataBrokerProtectionAgentManagerProvider {
             operationDependencies: operationDependencies,
             pixelHandler: pixelHandler,
             agentStopper: agentstopper,
+            authenticationManager: authenticationManager,
             freemiumPIRUserStateManager: freemiumPIRUserStateManager)
     }
 }
@@ -114,6 +115,7 @@ public final class DataBrokerProtectionAgentManager {
     private let operationDependencies: DataBrokerOperationDependencies
     private let pixelHandler: EventMapping<DataBrokerProtectionPixels>
     private let agentStopper: DataBrokerProtectionAgentStopper
+    private let authenticationManager: DataBrokerProtectionAuthenticationManaging
     private let freemiumPIRUserStateManager: FreemiumPIRUserStateManager
 
     // Used for debug functions only, so not injected
@@ -129,6 +131,7 @@ public final class DataBrokerProtectionAgentManager {
          operationDependencies: DataBrokerOperationDependencies,
          pixelHandler: EventMapping<DataBrokerProtectionPixels>,
          agentStopper: DataBrokerProtectionAgentStopper,
+         authenticationManager: DataBrokerProtectionAuthenticationManaging,
          freemiumPIRUserStateManager: FreemiumPIRUserStateManager
     ) {
         self.userNotificationService = userNotificationService
@@ -139,6 +142,7 @@ public final class DataBrokerProtectionAgentManager {
         self.operationDependencies = operationDependencies
         self.pixelHandler = pixelHandler
         self.agentStopper = agentStopper
+        self.authenticationManager = authenticationManager
         self.freemiumPIRUserStateManager = freemiumPIRUserStateManager
 
         self.activityScheduler.delegate = self
@@ -189,18 +193,18 @@ extension DataBrokerProtectionAgentManager {
 
 private extension DataBrokerProtectionAgentManager {
 
-    /// Starts either Freemium (scan-only) or Subscription (scan and opt-out) scheduled operations
+    /// Starts either Subscription (scan and opt-out) or Freemium (scan-only) scheduled operations
     /// - Parameters:
     ///   - showWebView: Whether to show the web view or not
     ///   - operationDependencies: Operation dependencies
     ///   - completion: Completion handler
     func startFreemiumOrSubscriptionScheduledOperations(showWebView: Bool,
                                                         operationDependencies: DataBrokerOperationDependencies,
                                                         completion: ((DataBrokerProtectionAgentErrorCollection?) -> Void)?) {
-        if freemiumPIRUserStateManager.isActiveUser {
-            queueManager.startScheduledScanOperationsIfPermitted(showWebView: showWebView, operationDependencies: operationDependencies, completion: completion)
-        } else {
+        if authenticationManager.isUserAuthenticated {
             queueManager.startScheduledAllOperationsIfPermitted(showWebView: showWebView, operationDependencies: operationDependencies, completion: completion)
+        } else {
+            queueManager.startScheduledScanOperationsIfPermitted(showWebView: showWebView, operationDependencies: operationDependencies, completion: completion)
         }
     }
 }

LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Utils/DataBrokerProtectionAgentStopper.swift

@@ -61,15 +61,15 @@ struct DefaultDataBrokerProtectionAgentStopper: DataBrokerProtectionAgentStopper
         do {
             let hasProfile = try dataManager.fetchProfile() != nil
             let isAuthenticated = authenticationManager.isUserAuthenticated
-            let isFreemium = freemiumPIRUserStateManager.isActiveUser
+            let didOnboardToFreemium = freemiumPIRUserStateManager.didOnboard
 
-            if !hasProfile || (!isAuthenticated && !isFreemium) {
+            if !hasProfile || (!isAuthenticated && !didOnboardToFreemium) {
                 os_log("Prerequisites are invalid", log: .dataBrokerProtection)
                 stopAgent()
                 return
             }
 
-            if !isAuthenticated && isFreemium {
+            if satisfiesFreemiumPrerequisites() {
                 os_log("User is Freemium", log: .dataBrokerProtection)
                 return
             }
@@ -86,11 +86,18 @@ struct DefaultDataBrokerProtectionAgentStopper: DataBrokerProtectionAgentStopper
     public func monitorEntitlementAndStopAgentIfEntitlementIsInvalidAndUserIsNotFreemium(interval: TimeInterval) {
         entitlementMonitor.start(checkEntitlementFunction: authenticationManager.hasValidEntitlement,
                                  interval: interval) { result in
-            guard !self.freemiumPIRUserStateManager.isActiveUser else { return }
+
+            if satisfiesFreemiumPrerequisites() { return }
             stopAgentBasedOnEntitlementCheckResult(result)
         }
     }
 
+    private func satisfiesFreemiumPrerequisites() -> Bool {
+        let isAuthenticated = authenticationManager.isUserAuthenticated
+        let didOnboardToFreemium = freemiumPIRUserStateManager.didOnboard
+        return !isAuthenticated && didOnboardToFreemium
+    }
+
     private func stopAgent() {
         stopAction.stopAgent()
     }