Subscriptions: 20 - Subscription Caching

DuckDuckGo.xcodeproj/project.pbxproj

@@ -10043,8 +10043,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 122.0.0;
+				branch = daniel/subscription.cache;
+				kind = branch;
 			};
 		};
 		B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */ = {

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "83bcbbf0dace717db6e518e4d867d617c846a3b5",
-        "version" : "122.0.0"
+        "branch" : "daniel/subscription.cache",
+        "revision" : "844a9e49d7bd8aa253a4bd00efcc73b8594086f2"
       }
     },
     {

DuckDuckGo/SettingsSubscriptionView.swift

@@ -94,6 +94,11 @@ struct SettingsSubscriptionView: View {
                                action: { isShowingsubScriptionFlow = true },
                                isButton: true )
 
+            // Subscription Restore
+            .sheet(isPresented: $isShowingsubScriptionFlow,
+                   onDismiss: { Task { viewModel.onAppear() } },
+                   content: { SubscriptionFlowView(viewModel: subscriptionFlowViewModel).interactiveDismissDisabled() })
+
             SettingsCustomCell(content: { iHaveASubscriptionView },
                                action: {
                                     isShowingsubScriptionFlow = true
@@ -138,25 +143,30 @@ struct SettingsSubscriptionView: View {
                 SettingsCellView(label: UserText.settingsPProDBPTitle,
                                  subtitle: UserText.settingsPProDBPSubTitle,
                                  action: { isShowingDBP.toggle() }, isButton: true)
+
                 .sheet(isPresented: $isShowingDBP) {
                     SubscriptionPIRView()
                 }
+
             }
 
             if viewModel.shouldShowITP {
                 SettingsCellView(label: UserText.settingsPProITRTitle,
                                  subtitle: UserText.settingsPProITRSubTitle,
                                  action: { isShowingITP.toggle() }, isButton: true)
+
                 .sheet(isPresented: $isShowingITP) {
                     SubscriptionITPView()
                 }
+
             }
 
             NavigationLink(destination: SubscriptionSettingsView()) {
                 SettingsCustomCell(content: { manageSubscriptionView })
             }
 
         }
+
     }
 
     var body: some View {
@@ -179,18 +189,6 @@ struct SettingsSubscriptionView: View {
                 }
 
             }
-            // Subscription Restore
-            .sheet(isPresented: $isShowingsubScriptionFlow) {
-                SubscriptionFlowView(viewModel: subscriptionFlowViewModel).interactiveDismissDisabled()
-            }
-
-
-            // Refresh subscription when dismissing the Subscription Flow
-            .onChange(of: isShowingsubScriptionFlow, perform: { value in
-                if !value {
-                    Task { viewModel.onAppear() }
-                }
-            })
 
             .onChange(of: viewModel.shouldNavigateToDBP, perform: { value in
                 if value {

DuckDuckGo/SettingsViewModel.swift

@@ -25,6 +25,7 @@ import Common
 import Combine
 import SyncUI
 
+
 #if SUBSCRIPTION
 import Subscription
 #endif
@@ -47,12 +48,20 @@ final class SettingsViewModel: ObservableObject {
     private var legacyViewProvider: SettingsLegacyViewProvider
     private lazy var versionProvider: AppVersion = AppVersion.shared
     private let voiceSearchHelper: VoiceSearchHelperProtocol
+
 #if SUBSCRIPTION
     private var accountManager: AccountManager
     private var signOutObserver: Any?
+
+    // Sheet Presentation & Navigation
     @Published var isRestoringSubscription: Bool = false
     @Published var shouldDisplayRestoreSubscriptionError: Bool = false
+    @Published var shouldShowNetP = false
+    @Published var shouldShowDBP = false
+    @Published var shouldShowITP = false
 #endif
+    @UserDefaultsWrapper(key: .subscriptionIsActive, defaultValue: false)
+    static private var cachedHasActiveSubscription: Bool
 
 
 #if NETWORK_PROTECTION
@@ -63,10 +72,6 @@ final class SettingsViewModel: ObservableObject {
     private lazy var isPad = UIDevice.current.userInterfaceIdiom == .pad
     private var cancellables = Set<AnyCancellable>()
 
-    // Defaults
-    @UserDefaultsWrapper(key: .subscriptionIsActive, defaultValue: false)
-    static private var cachedHasActiveSubscription: Bool
-
     // Closures to interact with legacy view controllers through the container
     var onRequestPushLegacyView: ((UIViewController) -> Void)?
     var onRequestPresentLegacyView: ((UIViewController, _ modal: Bool) -> Void)?
@@ -78,10 +83,6 @@ final class SettingsViewModel: ObservableObject {
     @Published var shouldNavigateToDBP = false
     @Published var shouldNavigateToITP = false
     @Published var shouldNavigateToSubscriptionFlow = false
-
-    @Published var shouldShowNetP = false
-    @Published var shouldShowDBP = false
-    @Published var shouldShowITP = false
 
     // Our View State
     @Published private(set) var state: SettingsState
@@ -247,8 +248,9 @@ extension SettingsViewModel {
     // This manual (re)initialization will go away once appSettings and
     // other dependencies are observable (Such as AppIcon and netP)
     // and we can use subscribers (Currently called from the view onAppear)
-    private func initState() {
-        self.state = SettingsState(
+    @MainActor
+    private func initState() async {
+        self.state = await SettingsState(
             appTheme: appSettings.currentThemeName,
             appIcon: AppIconManager.shared.appIcon,
             fireButtonAnimation: appSettings.currentFireButtonAnimation,
@@ -274,15 +276,6 @@ extension SettingsViewModel {
 
         setupSubscribers()
 
-        #if SUBSCRIPTION
-        if #available(iOS 15, *) {
-            Task {
-                if state.subscription.enabled {
-                    await setupSubscriptionEnvironment()
-                }
-            }
-        }
-        #endif
     }
 
     private func getNetworkProtectionState() -> SettingsState.NetworkProtection {
@@ -296,14 +289,24 @@ extension SettingsViewModel {
         return SettingsState.NetworkProtection(enabled: enabled, status: "")
     }
 
-    private func getSubscriptionState() -> SettingsState.Subscription {
+    private func getSubscriptionState() async -> SettingsState.Subscription {
         var enabled = false
         var canPurchase = false
-        let hasActiveSubscription = Self.cachedHasActiveSubscription
-        #if SUBSCRIPTION
+        var hasActiveSubscription = false
+
+#if SUBSCRIPTION
+        if #available(iOS 15, *) {
             enabled = featureFlagger.isFeatureOn(.subscription)
             canPurchase = SubscriptionPurchaseEnvironment.canPurchase
-        #endif
+            await setupSubscriptionEnvironment()
+            if let token = AccountManager().accessToken {
+                let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token)
+                if case .success(let subscription) = subscriptionResult {
+                    hasActiveSubscription = subscription.isActive
+                }
+            }
+        }
+#endif
         return SettingsState.Subscription(enabled: enabled,
                                         canPurchase: canPurchase,
                                         hasActiveSubscription: hasActiveSubscription)
@@ -353,9 +356,6 @@ extension SettingsViewModel {
 
         case .success(let subscription) where subscription.isActive:
 
-            // Cache Subscription state
-            cacheSubscriptionState(active: true)
-
             // Check entitlements and update UI accordingly
             let entitlements: [Entitlement.ProductName] = [.identityTheftRestoration, .dataBrokerProtection, .networkProtection]
             for entitlement in entitlements {
@@ -372,7 +372,6 @@ extension SettingsViewModel {
                     }
                 }
             }
-
         default:
             // Account is active but there's not a valid subscription / entitlements
             signOutUser()
@@ -382,18 +381,11 @@ extension SettingsViewModel {
     @available(iOS 15.0, *)
     private func signOutUser() {
         AccountManager().signOut()
-        cacheSubscriptionState(active: false)
         setupSubscriptionPurchaseOptions()
     }
 
-    private func cacheSubscriptionState(active: Bool) {
-        self.state.subscription.hasActiveSubscription = active
-        Self.cachedHasActiveSubscription = active
-    }
-
     @available(iOS 15.0, *)
     private func setupSubscriptionPurchaseOptions() {
-        cacheSubscriptionState(active: false)
         PurchaseManager.shared.$availableProducts
             .receive(on: RunLoop.main)
             .sink { [weak self] products in
@@ -470,7 +462,7 @@ extension SettingsViewModel {
 extension SettingsViewModel {
 
     func onAppear() {
-        initState()
+        Task { await initState() }
         Task { await MainActor.run { navigateOnAppear() } }
     }
 

DuckDuckGo/Subscription/AsyncHeadlessWebview/AsyncHeadlessWebView.swift

@@ -65,6 +65,9 @@ struct AsyncHeadlessWebView: View {
                 onContentType: { value in
                     viewModel.contentType = value
                 },
+                onNavigationError: { value in
+                    viewModel.navigationError = value
+                },
                 navigationCoordinator: viewModel.navigationCoordinator
             )
             .frame(width: geometry.size.width, height: geometry.size.height)

DuckDuckGo/Subscription/AsyncHeadlessWebview/AsyncHeadlessWebViewModel.swift

@@ -37,6 +37,7 @@ final class AsyncHeadlessWebViewViewModel: ObservableObject {
     @Published var canGoBack: Bool = false
     @Published var canGoForward: Bool = false
     @Published var contentType: String = ""
+    @Published var navigationError: Error?
     @Published var allowedDomains: [String]?
 
     var navigationCoordinator = HeadlessWebViewNavCoordinator(webView: nil)

DuckDuckGo/Subscription/AsyncHeadlessWebview/HeadlessWebView.swift

@@ -32,6 +32,7 @@ struct HeadlessWebView: UIViewRepresentable {
     var onCanGoBack: ((Bool) -> Void)?
     var onCanGoForward: ((Bool) -> Void)?
     var onContentType: ((String) -> Void)?
+    var onNavigationError: ((Error?) -> Void)?
     var navigationCoordinator: HeadlessWebViewNavCoordinator
 
     func makeUIView(context: Context) -> WKWebView {
@@ -73,6 +74,7 @@ struct HeadlessWebView: UIViewRepresentable {
                     onCanGoBack: onCanGoBack,
                     onCanGoForward: onCanGoForward,
                     onContentType: onContentType,
+                    onNavigationError: onNavigationError,
                     settings: settings
         )
     }

DuckDuckGo/Subscription/AsyncHeadlessWebview/HeadlessWebViewCoordinator.swift

@@ -30,6 +30,7 @@ final class HeadlessWebViewCoordinator: NSObject {
     var onCanGoBack: ((Bool) -> Void)?
     var onCanGoForward: ((Bool) -> Void)?
     var onContentType: ((String) -> Void)?
+    var onNavigationError: ((Error?) -> Void)?
     var settings: AsyncHeadlessWebViewSettings
 
     var size: CGSize = .zero
@@ -52,6 +53,7 @@ final class HeadlessWebViewCoordinator: NSObject {
          onCanGoBack: ((Bool) -> Void)?,
          onCanGoForward: ((Bool) -> Void)?,
          onContentType: ((String) -> Void)?,
+         onNavigationError: ((Error?) -> Void)?,
          allowedDomains: [String]? = nil,
          settings: AsyncHeadlessWebViewSettings = AsyncHeadlessWebViewSettings()) {
         self.parent = parent
@@ -60,6 +62,7 @@ final class HeadlessWebViewCoordinator: NSObject {
         self.onURLChange = onURLChange
         self.onCanGoBack = onCanGoBack
         self.onCanGoForward = onCanGoForward
+        self.onNavigationError = onNavigationError
         self.onContentType = onContentType
         self.settings = settings
     }
@@ -106,6 +109,7 @@ final class HeadlessWebViewCoordinator: NSObject {
         onCanGoBack = nil
         onCanGoForward = nil
         onContentType = nil
+        onNavigationError = nil
     }
 
 }
@@ -128,6 +132,7 @@ extension HeadlessWebViewCoordinator: WKNavigationDelegate {
        }
 
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
+        onNavigationError?(nil)
         if let url = webView.url, url != lastURL {
             onURLChange?(url)
             lastURL = url
@@ -182,8 +187,12 @@ extension HeadlessWebViewCoordinator: WKNavigationDelegate {
         decisionHandler(.allow)
     }
 
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: any Error) {
+        onNavigationError?(error)
+    }
+
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        // NOOP
+        onNavigationError?(error)
     }
 
     // Javascript Confirm dialogs Delegate

DuckDuckGo/Subscription/UserScripts/IdentityTheftRestorationPagesFeature.swift

@@ -66,10 +66,13 @@ final class IdentityTheftRestorationPagesFeature: Subfeature, ObservableObject {
             return nil
         }
     }
-
+    
     func getAccessToken(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        let authToken = AccountManager().authToken ?? ""
-        return [Constants.token: authToken]
+        if let accessToken = AccountManager().accessToken {
+            return [Constants.token: accessToken]
+        } else {
+            return [String: String]()
+        }
     }
 
     deinit {

DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift

@@ -225,6 +225,8 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
                 switch error {
                 case .cancelledByUser:
                     setTransactionError(.cancelledByUser)
+                    await pushPurchaseUpdate(originalMessage: message, purchaseUpdate: PurchaseUpdate(type: "canceled"))
+                    return nil
                 case .accountCreationFailed:
                     setTransactionError(.accountCreationFailed)
                 case .activeSubscriptionAlreadyPresent:

DuckDuckGo/Subscription/ViewModel/SubscriptionEmailViewModel.swift

@@ -38,6 +38,7 @@ final class SubscriptionEmailViewModel: ObservableObject {
     @Published var activateSubscription = false
     @Published var managingSubscriptionEmail = false
     @Published var transactionError: SubscriptionRestoreError?
+    @Published var navigationError: Bool = false
     @Published var shouldDisplayInactiveError: Bool = false
     var webViewModel: AsyncHeadlessWebViewViewModel
 
@@ -101,6 +102,17 @@ final class SubscriptionEmailViewModel: ObservableObject {
                 }
             }
         .store(in: &cancellables)
+
+        webViewModel.$navigationError
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] error in
+                guard let strongSelf = self else { return }
+                DispatchQueue.main.async {
+                    strongSelf.navigationError = error != nil ? true : false
+                }
+
+            }
+            .store(in: &cancellables)
     }
 
     private func handleTransactionError(error: SubscriptionPagesUseSubscriptionFeature.UseSubscriptionError) {