Subscription refactoring #5

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

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "912001a8676345e96a8be360d5a6e3dca6d8e0ec",
-        "version" : "164.2.0"
+        "branch" : "fcappelli/subscription_refactoring_5",
+        "revision" : "a12f0127eb507701f80ff9bff69fc6e52d730d98"
       }
     },
     {

DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1530"
-   version = "1.8">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

DuckDuckGo/Preferences/View/PreferencesRootView.swift

@@ -164,18 +164,22 @@ enum Preferences {
                 openActivateViaEmailURL: {
                     let url = Application.appDelegate.subscriptionManager.url(for: .activateViaEmail)
                     WindowControllersManager.shared.showTab(with: .subscription(url))
-                },
-                restorePurchases: {
+                }, restorePurchases: {
                     if #available(macOS 12.0, *) {
                         Task {
-                            let subscriptionAppStoreRestorer = SubscriptionAppStoreRestorer(subscriptionManager: Application.appDelegate.subscriptionManager,
-                                                                                            uiHandler: Application.appDelegate.subscriptionUIHandler)
+                            let subscriptionManager = Application.appDelegate.subscriptionManager
+                            let appStoreRestoreFlow = DefaultAppStoreRestoreFlow(accountManager: subscriptionManager.accountManager,
+                                                                                 storePurchaseManager: subscriptionManager.storePurchaseManager(),
+                                                                                 subscriptionEndpointService: subscriptionManager.subscriptionEndpointService,
+                                                                                 authEndpointService: subscriptionManager.authEndpointService)
+                            let subscriptionAppStoreRestorer = DefaultSubscriptionAppStoreRestorer(
+                                subscriptionManager: Application.appDelegate.subscriptionManager,
+                                appStoreRestoreFlow: appStoreRestoreFlow,
+                                uiHandler: Application.appDelegate.subscriptionUIHandler)
                             await subscriptionAppStoreRestorer.restoreAppStoreSubscription()
                         }
                     }
-                },
-                uiActionHandler: handleUIEvent
-            )
+                }, uiActionHandler: handleUIEvent)
 
             return PreferencesSubscriptionModel(openURLHandler: openURL,
                                                 userEventHandler: handleUIEvent,

DuckDuckGo/Subscription/SubscriptionRedirectManager.swift

@@ -56,7 +56,7 @@ final class PrivacyProSubscriptionRedirectManager: SubscriptionRedirectManager {
     }
 }
 
-private extension URL {
+fileprivate extension URL {
 
     func addingQueryItems(from url: URL) -> URL {
         // If the origin value is of type "do+something" appending the percentEncodedQueryItem crashes the browser as + is replaced by a space.

DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift

@@ -23,16 +23,25 @@ import enum StoreKit.StoreKitError
 import PixelKit
 
 @available(macOS 12.0, *)
-struct SubscriptionAppStoreRestorer {
+protocol SubscriptionAppStoreRestorer {
+    var uiHandler: SubscriptionUIHandling { get }
+    func restoreAppStoreSubscription() async
+}
 
+@available(macOS 12.0, *)
+struct DefaultSubscriptionAppStoreRestorer: SubscriptionAppStoreRestorer {
     private let subscriptionManager: SubscriptionManager
-    @MainActor var window: NSWindow? { WindowControllersManager.shared.lastKeyMainWindowController?.window }
-    let subscriptionErrorReporter = SubscriptionErrorReporter()
+    private let subscriptionErrorReporter: SubscriptionErrorReporter
+    private let appStoreRestoreFlow: AppStoreRestoreFlow
     let uiHandler: SubscriptionUIHandling
 
     public init(subscriptionManager: SubscriptionManager,
+                subscriptionErrorReporter: SubscriptionErrorReporter = DefaultSubscriptionErrorReporter(),
+                appStoreRestoreFlow: AppStoreRestoreFlow,
                 uiHandler: SubscriptionUIHandling) {
         self.subscriptionManager = subscriptionManager
+        self.subscriptionErrorReporter = subscriptionErrorReporter
+        self.appStoreRestoreFlow = appStoreRestoreFlow
         self.uiHandler = uiHandler
     }
 
@@ -59,7 +68,6 @@ struct SubscriptionAppStoreRestorer {
     }
 
     private func continueRestore() async {
-        let appStoreRestoreFlow = DefaultAppStoreRestoreFlow(subscriptionManager: subscriptionManager)
         let result = await appStoreRestoreFlow.restoreAccountFromPastPurchase()
         await uiHandler.dismissProgressViewController()
         switch result {
@@ -87,12 +95,12 @@ struct SubscriptionAppStoreRestorer {
 
     // MARK: - UI interactions
 
-    func showSomethingWentWrongAlert() async {
+    private func showSomethingWentWrongAlert() async {
         PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailure, frequency: .dailyAndCount)
         await uiHandler.show(alertType: .somethingWentWrong)
     }
 
-    func showSubscriptionNotFoundAlert() async {
+    private func showSubscriptionNotFoundAlert() async {
         switch await uiHandler.show(alertType: .subscriptionNotFound) {
         case .alertFirstButtonReturn:
             let url = subscriptionManager.url(for: .purchase)
@@ -102,7 +110,7 @@ struct SubscriptionAppStoreRestorer {
         }
     }
 
-    func showSubscriptionInactiveAlert() async {
+    private func showSubscriptionInactiveAlert() async {
         switch await uiHandler.show(alertType: .subscriptionInactive) {
         case .alertFirstButtonReturn:
             let url = subscriptionManager.url(for: .purchase)

DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift

@@ -37,7 +37,11 @@ enum SubscriptionError: Error {
          generalError
 }
 
-struct SubscriptionErrorReporter {
+protocol SubscriptionErrorReporter {
+    func report(subscriptionActivationError: SubscriptionError)
+}
+
+struct DefaultSubscriptionErrorReporter: SubscriptionErrorReporter {
 
     // swiftlint:disable:next cyclomatic_complexity
     func report(subscriptionActivationError: SubscriptionError) {