Subscriptions: 19. Error handling and minor updates (#2567)

duckduckgo · Mar 11, 2024 · bbacdd7 · bbacdd7
1 parent 576c98f
commit bbacdd7
Show file tree

Hide file tree

Showing 18 changed files with 187 additions and 40 deletions.
diff --git a/DuckDuckGo/SettingsSubscriptionView.swift b/DuckDuckGo/SettingsSubscriptionView.swift
@@ -138,25 +138,27 @@ 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 })
             }
 
         }
+        .sheet(isPresented: $isShowingDBP) {
+            SubscriptionPIRView()
+        }
+        .sheet(isPresented: $isShowingITP) {
+            SubscriptionITPView()
+        }
     }
 
     var body: some View {

diff --git a/DuckDuckGo/SettingsViewModel.swift b/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
@@ -372,7 +373,6 @@ extension SettingsViewModel {
                     }
                 }
             }
-
         default:
             // Account is active but there's not a valid subscription / entitlements
             signOutUser()

diff --git a/DuckDuckGo/Subscription/AsyncHeadlessWebview/AsyncHeadlessWebView.swift b/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)

diff --git a/DuckDuckGo/Subscription/AsyncHeadlessWebview/AsyncHeadlessWebViewModel.swift b/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)

diff --git a/DuckDuckGo/Subscription/AsyncHeadlessWebview/HeadlessWebView.swift b/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
         )
     }

diff --git a/DuckDuckGo/Subscription/AsyncHeadlessWebview/HeadlessWebViewCoordinator.swift b/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

diff --git a/DuckDuckGo/Subscription/UserScripts/IdentityTheftRestorationPagesFeature.swift b/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 {

diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionEmailViewModel.swift b/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) {

diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionFlowViewModel.swift b/DuckDuckGo/Subscription/ViewModel/SubscriptionFlowViewModel.swift
@@ -224,10 +224,24 @@ final class SubscriptionFlowViewModel: 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.transactionError = error != nil ? .generalError : nil
+                }
+
+            }
+            .store(in: &cancellables)
+
         canGoBackCancellable = webViewModel.$canGoBack
             .receive(on: DispatchQueue.main)
             .sink { [weak self] value in
-                self?.canNavigateBack = value
+                guard let strongSelf = self else { return }
+
+                let shouldNavigateBack = value && (strongSelf.webViewModel.url?.lastPathComponent != URL.subscriptionBaseURL.lastPathComponent)
+                strongSelf.canNavigateBack = shouldNavigateBack
             }
     }
 
@@ -242,6 +256,12 @@ final class SubscriptionFlowViewModel: ObservableObject {
         canNavigateBack = false
     }
 
+    private func urlRemovingQueryParams(_ url: URL) -> URL? {
+        var urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false)
+        urlComponents?.query = nil // Remove the query string
+        return urlComponents?.url
+    }
+
     func initializeViewData() async {
         await self.setupTransactionObserver()
         await self .setupWebViewObservers()
@@ -257,6 +277,7 @@ final class SubscriptionFlowViewModel: ObservableObject {
         userTappedRestoreButton = false
         shouldShowNavigationBar = false
         selectedFeature = nil
+        transactionError = nil
         canNavigateBack = false
         shouldDismissView = true
         subFeature.cleanup()

diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionITPViewModel.swift b/DuckDuckGo/Subscription/ViewModel/SubscriptionITPViewModel.swift
@@ -46,6 +46,7 @@ final class SubscriptionITPViewModel: ObservableObject {
     @Published var isDownloadableContent: Bool = false
     @Published var activityItems: [Any] = []
     @Published var attachmentURL: URL?
+    @Published var navigationError: Bool = false
     var webViewModel: AsyncHeadlessWebViewViewModel
 
     @Published var shouldNavigateToExternalURL: URL?
@@ -81,9 +82,20 @@ final class SubscriptionITPViewModel: ObservableObject {
                                                           settings: webViewSettings)
     }
 
-    // Observe transaction status
+    // swiftlint:disable function_body_length
     private func setupSubscribers() async {
 
+        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)
+
         webViewModel.$scrollPosition
             .receive(on: DispatchQueue.main)
             .throttle(for: .milliseconds(100), scheduler: DispatchQueue.main, latest: true)
@@ -134,6 +146,7 @@ final class SubscriptionITPViewModel: ObservableObject {
                 self?.canNavigateBack = value
             }
     }
+    // swiftlint:enable function_body_length
 
     func initializeView() {
         webViewModel.navigationCoordinator.navigateTo(url: manageITPURL )

diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionRestoreViewModel.swift b/DuckDuckGo/Subscription/ViewModel/SubscriptionRestoreViewModel.swift
@@ -81,7 +81,7 @@ final class SubscriptionRestoreViewModel: ObservableObject {
     private func handleRestoreError(error: SubscriptionPagesUseSubscriptionFeature.UseSubscriptionError) {
         switch error {
         case .failedToRestorePastPurchase:
-            activationResult = .notFound
+            activationResult = .error
         case .subscriptionExpired:
             activationResult = .expired
         case .subscriptionNotFound:

diff --git a/DuckDuckGo/Subscription/Views/SubscriptionEmailView.swift b/DuckDuckGo/Subscription/Views/SubscriptionEmailView.swift
@@ -50,6 +50,15 @@ struct SubscriptionEmailView: View {
             )
         }
 
+        .alert(isPresented: $viewModel.navigationError) {
+            Alert(
+                title: Text(UserText.subscriptionBackendErrorTitle),
+                message: Text(UserText.subscriptionBackendErrorMessage),
+                dismissButton: .cancel(Text(UserText.subscriptionBackendErrorButton)) {
+                    dismiss()
+                })
+        }
+
         .onAppear {
             viewModel.loadURL()
         }