Fix post merge issues

duckduckgo · Mar 20, 2024 · f594f52 · f594f52
1 parent be21003
commit f594f52
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift
@@ -28,6 +28,10 @@ import Subscription
 import Subscription
 #endif
 
+#if NETWORK_PROTECTION
+import NetworkProtection
+#endif
+
 protocol DependencyProvider {
 
     var appSettings: AppSettings { get }
@@ -85,9 +89,18 @@ class AppDependencyProvider: DependencyProvider {
 
 #if SUBSCRIPTION
     let subscriptionManager: SubscriptionManaging = {
+
+        var serviceEnvironment: SubscriptionServiceEnvironment = .staging
+
+#if NETWORK_PROTECTION
+        if VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment == .staging {
+            serviceEnvironment = .staging
+        }
+#endif
+
         let configuration = DefaultSubscriptionConfiguration(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs),
                                                              purchasePlatform: .appStore,
-                                                             serviceEnvironment: .staging)
+                                                             serviceEnvironment: serviceEnvironment)
 
         return SubscriptionManager(configuration: configuration)
     }()

diff --git a/DuckDuckGo/NetworkProtectionDebugViewController.swift b/DuckDuckGo/NetworkProtectionDebugViewController.swift
@@ -688,7 +688,7 @@ shouldShowVPNShortcut: \(vpnVisibility.shouldShowVPNShortcut() ? "YES" : "NO")
                 if subscriptionOverrideEnabled {
                     defaults.subscriptionOverrideEnabled = false
 #if SUBSCRIPTION
-                    AccountManager().signOut()
+                    AppDependencyProvider.shared.subscriptionManager.signOut()
 #endif
                 } else {
                     defaults.resetsubscriptionOverrideEnabled()

diff --git a/DuckDuckGo/NetworkProtectionVisibilityForTunnelProvider.swift b/DuckDuckGo/NetworkProtectionVisibilityForTunnelProvider.swift
@@ -37,7 +37,9 @@ struct NetworkProtectionVisibilityForTunnelProvider: NetworkProtectionFeatureVis
     // todo - https://app.asana.com/0/0/1206844038943626/f
     func isPrivacyProLaunched() -> Bool {
 #if SUBSCRIPTION
-        AccountManager().accessToken != nil
+        let subscriptionAppGroup = Bundle.main.appGroup(bundle: .subs)
+        let tokenStore = SubscriptionTokenKeychainStorage(keychainType: .dataProtection(.named(subscriptionAppGroup)))
+        return tokenStore.accessToken != nil
 #else
         false
 #endif

diff --git a/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift b/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
@@ -329,7 +329,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
     func backToSettings(params: Any, original: WKScriptMessage) async -> Encodable? {
         if let accessToken = subscriptionManager.tokenStorage.accessToken,
            case let .success(accountDetails) = await accountManager.fetchAccountDetails(with: accessToken) {
-            switch await SubscriptionService.getSubscription(accessToken: accessToken) {
+            switch await subscriptionService.getSubscription(accessToken: accessToken) {
 
             case .success:
                 subscriptionManager.tokenStorage.accessToken = accessToken

diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
@@ -239,12 +239,11 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
         let accessTokenProvider: () -> String? = {
 #if SUBSCRIPTION
             if featureVisibility.shouldMonitorEntitlement() {
-                return { 
-	// TODO: FIXME
-let subscriptiongroup = subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs)
-Tokenstore blah blh
-AccountManager().accessToken 
-}
+                return {
+                    let subscriptionAppGroup = Bundle.main.appGroup(bundle: .subs)
+                    let tokenStore = SubscriptionTokenKeychainStorage(keychainType: .dataProtection(.named(subscriptionAppGroup)))
+                    return tokenStore.accessToken
+                }
             }
 #endif
             return { nil }
@@ -328,16 +327,14 @@ AccountManager().accessToken
             return .success(true)
         }
 
-        if VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment == .staging {
-            SubscriptionPurchaseEnvironment.currentServiceEnvironment = .staging
-        }
-// TODO: FIXM
-	let configuration = DefaultSubscriptionConfiguration(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs),
-                                                             purchasePlatform: .appStore,
-                                                             serviceEnvironment: .staging)
-        let accountManager = SubscriptionManager(configuration: configuration).accountManager
+        let vpnEnvironment = VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment
+        let serviceEnvironment: SubscriptionServiceEnvironment = vpnEnvironment == .production ? .production : .staging
+        let configuration = DefaultSubscriptionConfiguration(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs),
+                                                             purchasePlatform: .stripe, // TODO: Not relevant in this context
+                                                             serviceEnvironment: serviceEnvironment)
+        let subscriptionManager = SubscriptionManager(configuration: configuration)
 
-        let result = await accountManager.hasEntitlement(for: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
+        let result = await subscriptionManager.accountManager.hasEntitlement(for: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
         switch result {
         case .success(let hasEntitlement):
             return .success(hasEntitlement)