subscription manager load initial data improved, pixels added

Core/PixelEvent.swift

@@ -805,6 +805,8 @@ extension Pixel {
         case privacyProSubscriptionCookieRefreshedWithEmptyValue
         case privacyProSubscriptionCookieFailedToSetSubscriptionCookie
         case privacyProDeadTokenDetected
+        case authV1MigrationFailed
+        case authV1MigrationSucceeded
 
         // MARK: Pixel Experiment
         case pixelExperimentEnrollment
@@ -1756,6 +1758,8 @@ extension Pixel.Event {
         case .privacyProSubscriptionCookieRefreshedWithEmptyValue: return "m_privacy-pro_subscription-cookie-refreshed_with_empty_value"
         case .privacyProSubscriptionCookieFailedToSetSubscriptionCookie: return "m_privacy-pro_subscription-cookie-failed_to_set_subscription_cookie"
         case .privacyProDeadTokenDetected: return "m_privacy-pro_dead_token_detected"
+        case .authV1MigrationFailed: return "m_privacy-pro_v1migration_failed"
+        case .authV1MigrationSucceeded: return "m_privacy-pro_v1migration_succeeded"
 
         // MARK: Pixel Experiment
         case .pixelExperimentEnrollment: return "pixel_experiment_enrollment"

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

@@ -33,7 +33,7 @@
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
         "branch" : "fcappelli/subscription_oauth_api_v2",
-        "revision" : "e6591e5fc40cc32e6309fa4ff4f1e2dfbb865833"
+        "revision" : "9fd4aeaef05e212b8e93cd5e025c0ae38f013453"
       }
     },
     {

DuckDuckGo/AppDependencyProvider.swift

@@ -148,6 +148,12 @@ final class AppDependencyProvider: DependencyProvider {
             switch type {
             case .deadToken:
                 Pixel.fire(pixel: .privacyProDeadTokenDetected)
+            case .subscriptionIsActive:
+                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
+            case .v1MigrationFailed:
+                Pixel.fire(pixel: .authV1MigrationFailed)
+            case .v1MigrationSuccessful:
+                Pixel.fire(pixel: .authV1MigrationSucceeded)
             }
         }
         let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: storePurchaseManager,

DuckDuckGo/AppLifecycle/AppStates/Active.swift

@@ -179,11 +179,11 @@ struct Active: AppState {
             }
         }
 
-        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
-            if isSubscriptionActive {
-                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
-            }
-        }
+//        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
+//            if isSubscriptionActive {
+//                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
+//            }
+//        }
 
         Task {
             await appDependencies.subscriptionService.subscriptionCookieManager.refreshSubscriptionCookie()

DuckDuckGo/AppLifecycle/AppStates/Launched.swift

@@ -90,6 +90,10 @@ struct Launched: AppState {
         @UserDefaultsWrapper(key: .privacyConfigCustomURL, defaultValue: nil)
         var privacyConfigCustomURL: String?
 
+        Task {
+            await AppDependencyProvider.shared.subscriptionManager.loadInitialData()
+        }
+
         application = stateContext.application
         privacyProDataReporter = PrivacyProDataReporter(fireproofing: fireproofing)
         vpnWorkaround = VPNRedditSessionWorkaround(subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
@@ -460,8 +464,6 @@ struct Launched: AppState {
 
         widgetRefreshModel.beginObservingVPNStatus()
 
-        AppDependencyProvider.shared.subscriptionManager.loadInitialData()
-
         let autofillUsageMonitor = AutofillUsageMonitor()
         autofillPixelReporter = AutofillPixelReporter(
             userDefaults: .standard,

DuckDuckGo/OldAppDelegate.swift

@@ -452,6 +452,10 @@ final class OldAppDelegate: NSObject, UIApplicationDelegate, DDGApp {
 
         self.voiceSearchHelper.migrateSettingsFlagIfNecessary()
 
+        Task {
+            await AppDependencyProvider.shared.subscriptionManager.loadInitialData()
+        }
+
         // Task handler registration needs to happen before the end of `didFinishLaunching`, otherwise submitting a task can throw an exception.
         // Having both in `didBecomeActive` can sometimes cause the exception when running on a physical device, so registration happens here.
         AppConfigurationFetch.registerBackgroundRefreshTaskHandler()
@@ -475,8 +479,6 @@ final class OldAppDelegate: NSObject, UIApplicationDelegate, DDGApp {
 
         widgetRefreshModel.beginObservingVPNStatus()
 
-        AppDependencyProvider.shared.subscriptionManager.loadInitialData()
-
         setUpAutofillPixelReporter()
 
         if didCrashDuringCrashHandlersSetUp {
@@ -717,11 +719,11 @@ final class OldAppDelegate: NSObject, UIApplicationDelegate, DDGApp {
             }
         }
 
-        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
-            if isSubscriptionActive {
-                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
-            }
-        }
+//        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
+//            if isSubscriptionActive {
+//                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
+//            }
+//        }
 
         Task {
             await subscriptionCookieManager.refreshSubscriptionCookie()

DuckDuckGo/SettingsViewModel.swift

@@ -773,7 +773,7 @@ extension SettingsViewModel {
             state.subscription.subscriptionExist = true
             state.subscription.platform = subscription.platform
             state.subscription.hasActiveSubscription = subscription.isActive
-            let features = await subscriptionManager.currentSubscriptionFeatures(forceRefresh: true)
+            let features = await subscriptionManager.currentSubscriptionFeatures(forceRefresh: false)
             state.subscription.entitlements = features.compactMap({ feature in
                 if feature.enabled {
                     return feature.entitlement

DuckDuckGo/Subscription/Feedback/UnifiedFeedbackFormViewModel.swift

@@ -158,25 +158,26 @@ final class UnifiedFeedbackFormViewModel: ObservableObject {
         self.defaultMetadataCollector = defaultMetadatCollector
         self.feedbackSender = feedbackSender
         self.source = source.rawValue
+    }
 
-        Task {
-            let features = await subscriptionManager.currentSubscriptionFeatures(forceRefresh: false)
-            let vpnFeature = features.first { $0.entitlement == .networkProtection }
-            let dbpFeature = features.first { $0.entitlement == .dataBrokerProtection }
-            let itrFeature = features.first { $0.entitlement == .identityTheftRestoration }
-            let itrgFeature = features.first { $0.entitlement == .identityTheftRestorationGlobal }
-
-            if vpnFeature?.enabled ?? false {
-                availableCategories.append(.vpn)
-            }
-            if dbpFeature?.enabled ?? false {
-                availableCategories.append(.pir)
-            }
-            let idpEnabled = itrFeature?.enabled ?? false
-            let idpgEnabled = itrgFeature?.enabled ?? false
-            if idpEnabled || idpgEnabled {
-                availableCategories.append(.itr)
-            }
+    @MainActor
+    func updateCategories() async {
+        let features = await subscriptionManager.currentSubscriptionFeatures(forceRefresh: false)
+        let vpnFeature = features.first { $0.entitlement == .networkProtection }
+        let dbpFeature = features.first { $0.entitlement == .dataBrokerProtection }
+        let itrFeature = features.first { $0.entitlement == .identityTheftRestoration }
+        let itrgFeature = features.first { $0.entitlement == .identityTheftRestorationGlobal }
+
+        if vpnFeature?.enabled ?? false {
+            availableCategories.append(.vpn)
+        }
+        if dbpFeature?.enabled ?? false {
+            availableCategories.append(.pir)
+        }
+        let idpEnabled = itrFeature?.enabled ?? false
+        let idpgEnabled = itrgFeature?.enabled ?? false
+        if idpEnabled || idpgEnabled {
+            availableCategories.append(.itr)
         }
     }
 

DuckDuckGo/Subscription/Feedback/UnifiedFeedbackRootView.swift

@@ -46,6 +46,7 @@ struct UnifiedFeedbackRootView: View {
         }
         .onFirstAppear {
             Task {
+                await viewModel.updateCategories()
                 await viewModel.process(action: .reportActions)
             }
         }

DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift

@@ -79,13 +79,17 @@ final class SubscriptionSettingsViewModel: ObservableObject {
         setupNotificationObservers()
     }
 
-    private var dateFormatter: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.dateStyle = .long
-        formatter.timeStyle = .none
-        return formatter
+    private var dateFormatter = {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateStyle = .long
+#if DEBUG
+        dateFormatter.timeStyle = .medium
+#else
+        dateFormatter.timeStyle = .none
+#endif
+        return dateFormatter
     }()
-    
+
     func onFirstAppear() {
         Task {
             // Load initial state from the cache

PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift

@@ -495,6 +495,8 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
             switch type {
             case .deadToken:
                 Pixel.fire(pixel: .privacyProDeadTokenDetected)
+            case .subscriptionIsActive, .v1MigrationFailed, .v1MigrationSuccessful: // handled by the main app only
+                break
             }
         }
         let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: storePurchaseManager,
@@ -526,7 +528,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
                    snoozeTimingStore: NetworkProtectionSnoozeTimingStore(userDefaults: .networkProtectionGroupDefaults),
                    wireGuardInterface: DefaultWireGuardInterface(),
                    keychainType: .dataProtection(.unspecified),
-                   tokenProvider: subscriptionManager,
+                   subscriptionManager: subscriptionManager,
                    debugEvents: Self.networkProtectionDebugEvents(controllerErrorStore: errorStore),
                    providerEvents: Self.packetTunnelProviderEvents,
                    settings: settings,