Subscription refactoring

.gitignore

@@ -76,3 +76,4 @@ Configuration/ExternalDeveloper.xcconfig
 scripts/assets
 
 DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift*.plist
+*.profraw

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "b901a47ad442356b0953ffdb768ea1fae47fe912",
-        "version" : "145.3.0"
+        "branch" : "fcappelli/subscription_refactoring_2",
+        "revision" : "3819577dbab2f3b90ba61a9141ac3efc869be982"
       }
     },
     {
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
         "revision" : "46989693916f56d1186bd59ac15124caef896560",
         "version" : "1.3.1"
@@ -183,7 +183,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "6c84fd19139414fc0edbf9673ade06e532a564f0",
         "version" : "2.0.0"

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme

@@ -61,6 +61,9 @@
                <Test
                   Identifier = "AppTrackingProtectionListModelTests/testWhenNewChangesAreWrittenToTheDatabase_ThenTheSectionsPropertyIsUpdated()">
                </Test>
+               <Test
+                  Identifier = "AutoconsentMessageProtocolTests/testEval()">
+               </Test>
             </SkippedTests>
          </TestableReference>
          <TestableReference

DuckDuckGo/AppDelegate+Waitlists.swift

@@ -37,16 +37,14 @@ extension AppDelegate {
     func checkWaitlists() {
 
 #if NETWORK_PROTECTION
-        if vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist() {
+        if AppDependencyProvider.shared.vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist() {
             checkNetworkProtectionWaitlist()
         }
 #endif
     }
 
 #if NETWORK_PROTECTION
     private func checkNetworkProtectionWaitlist() {
-        let accessController = NetworkProtectionAccessController()
-
         VPNWaitlist.shared.fetchInviteCodeIfAvailable { [weak self] error in
             guard error == nil else {
                 return
@@ -65,7 +63,9 @@ extension AppDelegate {
     func fetchVPNWaitlistAuthToken(inviteCode: String) {
         Task {
             do {
-                try await NetworkProtectionCodeRedemptionCoordinator().redeem(inviteCode)
+                try await NetworkProtectionCodeRedemptionCoordinator(accountManager:
+                                                                        AppDependencyProvider.shared.subscriptionManager.accountManager
+                ).redeem(inviteCode)
                 VPNWaitlist.shared.sendInviteCodeAvailableNotification()
             } catch {}
         }

DuckDuckGo/AppDelegate.swift

@@ -42,13 +42,10 @@ import WebKit
 
 // swiftlint:disable file_length
 // swiftlint:disable type_body_length
-
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
-// swiftlint:enable type_body_length
-
-    private static let ShowKeyboardOnLaunchThreshold = TimeInterval(20)
+@UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate {
+    // swiftlint:enable type_body_length
 
+    private static let ShowKeyboardOnLaunchThreshold = TimeInterval(20)
     private struct ShortcutKey {
         static let clipboard = "com.duckduckgo.mobile.ios.clipboard"
         static let passwords = "com.duckduckgo.mobile.ios.passwords"
@@ -69,7 +66,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 #if NETWORK_PROTECTION
     private let widgetRefreshModel = NetworkProtectionWidgetRefreshModel()
     private let tunnelDefaults = UserDefaults.networkProtectionGroupDefaults
-    lazy var vpnFeatureVisibility = DefaultNetworkProtectionVisibility()
 #endif
 
     private var autoClear: AutoClear?
@@ -91,9 +87,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     @UserDefaultsWrapper(key: .privacyConfigCustomURL, defaultValue: nil)
     private var privacyConfigCustomURL: String?
-
-    @UserDefaultsWrapper(key: .privacyProEnvironment, defaultValue: SubscriptionPurchaseEnvironment.ServiceEnvironment.default.description)
-    private var privacyProEnvironment: String
 
     // swiftlint:disable:next function_body_length cyclomatic_complexity
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -223,7 +216,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         PixelExperiment.install()
 
         // MARK: Sync initialisation
-
 #if DEBUG
         let defaultEnvironment = ServerEnvironment.development
 #else
@@ -323,12 +315,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 #if NETWORK_PROTECTION
         widgetRefreshModel.beginObservingVPNStatus()
-        NetworkProtectionAccessController().refreshNetworkProtectionAccess()
+        AppDependencyProvider.shared.networkProtectionAccessController.refreshNetworkProtectionAccess()
 #endif
-
-        setupSubscriptionsEnvironment()
 
-        if vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist() {
+        if AppDependencyProvider.shared.vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist() {
             clearDebugWaitlistState()
         }
 
@@ -406,7 +396,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private func presentExpiredEntitlementNotificationIfNeeded() {
         let presenter = NetworkProtectionNotificationsPresenterTogglableDecorator(
-            settings: VPNSettings(defaults: .networkProtectionGroupDefaults),
+            settings: AppDependencyProvider.shared.vpnSettings,
             defaults: .networkProtectionGroupDefaults,
             wrappee: NetworkProtectionUNNotificationPresenter()
         )
@@ -431,21 +421,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
     }
 
-
-    private func setupSubscriptionsEnvironment() {
-        Task {
-            #if ALPHA || DEBUG
-                let defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.staging
-            #else
-                let defaultEnvironment = SubscriptionPurchaseEnvironment.ServiceEnvironment.production
-            #endif
-            let environment = SubscriptionPurchaseEnvironment.ServiceEnvironment(rawValue: privacyProEnvironment) ?? defaultEnvironment
-            SubscriptionPurchaseEnvironment.currentServiceEnvironment = environment
-            VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment = (environment == .production) ? .production : .staging
-            SubscriptionPurchaseEnvironment.current = .appStore
-        }
-    }
-
     private func reportAdAttribution() {
         guard AdAttributionPixelReporter.isAdAttributionReportingEnabled else { return }
 
@@ -522,53 +497,54 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     private func stopTunnelAndShowThankYouMessagingIfNeeded() {
-        if AccountManager().isUserAuthenticated {
+
+        if AppDependencyProvider.shared.accountManager.isUserAuthenticated {
             tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown = true
             return
         }
 
-        if vpnFeatureVisibility.shouldShowThankYouMessaging() && !tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown {
+        if AppDependencyProvider.shared.vpnFeatureVisibility.shouldShowThankYouMessaging()
+            && !tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown {
             Task {
                 await self.stopAndRemoveVPN(with: "thank-you-dialog")
             }
-        } else if vpnFeatureVisibility.isPrivacyProLaunched() && !AccountManager().isUserAuthenticated {
+        } else if AppDependencyProvider.shared.vpnFeatureVisibility.isPrivacyProLaunched()
+                    && !AppDependencyProvider.shared.accountManager.isUserAuthenticated {
             Task {
                 await self.stopAndRemoveVPN(with: "subscription-check")
             }
         }
     }
 
     private func stopAndRemoveVPN(with reason: String) async {
-        let controller = NetworkProtectionTunnelController()
-        guard await controller.isInstalled else {
+        guard await AppDependencyProvider.shared.networkProtectionTunnelController.isInstalled else {
             return
         }
 
-        let isConnected = await controller.isConnected
+        let isConnected = await AppDependencyProvider.shared.networkProtectionTunnelController.isConnected
 
         DailyPixel.fireDailyAndCount(pixel: .privacyProVPNBetaStoppedWhenPrivacyProEnabled, withAdditionalParameters: [
             "reason": reason,
             "vpn-connected": String(isConnected)
         ])
 
-        await controller.stop()
-        await controller.removeVPN()
+        await AppDependencyProvider.shared.networkProtectionTunnelController.stop()
+        await AppDependencyProvider.shared.networkProtectionTunnelController.removeVPN()
     }
 
     func updateSubscriptionStatus() {
         Task {
-            let accountManager = AccountManager()
-
-            guard let token = accountManager.accessToken else { return }
-
-            if case .success(let subscription) = await SubscriptionService.getSubscription(accessToken: token,
+            guard let token = AppDependencyProvider.shared.accountManager.accessToken else { return }
+            var subscriptionService: SubscriptionService {
+                AppDependencyProvider.shared.subscriptionManager.subscriptionService
+            }
+            if case .success(let subscription) = await subscriptionService.getSubscription(accessToken: token,
                                                                                            cachePolicy: .reloadIgnoringLocalCacheData) {
                 if subscription.isActive {
                     DailyPixel.fire(pixel: .privacyProSubscriptionActive)
                 }
             }
-
-            _ = await accountManager.fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData)
+            await AppDependencyProvider.shared.accountManager.fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData)
         }
     }
 
@@ -868,8 +844,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 #if NETWORK_PROTECTION
             if shortcutItem.type == ShortcutKey.openVPNSettings {
-                let visibility = DefaultNetworkProtectionVisibility()
-                if visibility.shouldShowVPNShortcut() {
+                if AppDependencyProvider.shared.vpnFeatureVisibility.shouldShowVPNShortcut() {
                     presentNetworkProtectionStatusSettingsModal()
                 }
             }
@@ -906,7 +881,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func refreshShortcuts() {
 #if NETWORK_PROTECTION
-        guard vpnFeatureVisibility.shouldShowVPNShortcut() else {
+        guard AppDependencyProvider.shared.vpnFeatureVisibility.shouldShowVPNShortcut() else {
             UIApplication.shared.shortcutItems = nil
             return
         }
@@ -981,15 +956,14 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
 #if NETWORK_PROTECTION
             if NetworkProtectionNotificationIdentifier(rawValue: identifier) != nil {
                 Task {
-                    let accountManager = AccountManager()
-                    if case .success(let hasEntitlements) = await accountManager.hasEntitlement(for: .networkProtection),
+                    if case .success(let hasEntitlements) = await AppDependencyProvider.shared.accountManager.hasEntitlement(for: .networkProtection),
                         hasEntitlements {
                         presentNetworkProtectionStatusSettingsModal()
                     }
                 }
             }
 
-            if vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist(), identifier == VPNWaitlist.notificationIdentifier {
+            if AppDependencyProvider.shared.vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist(), identifier == VPNWaitlist.notificationIdentifier {
                 presentNetworkProtectionWaitlistModal()
             }
 #endif