lint ad restore commented code

DuckDuckGo.xcodeproj/project.pbxproj

@@ -73,7 +73,6 @@
 		1E4F4A5A297193DE00625985 /* MainViewController+CookiesManaged.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E4F4A59297193DE00625985 /* MainViewController+CookiesManaged.swift */; };
 		1E4FAA6427D8DFB900ADC5B3 /* OngoingDownloadRowViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E4FAA6327D8DFB900ADC5B3 /* OngoingDownloadRowViewModel.swift */; };
 		1E4FAA6627D8DFC800ADC5B3 /* CompleteDownloadRowViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E4FAA6527D8DFC800ADC5B3 /* CompleteDownloadRowViewModel.swift */; };
-		1E53508F2C7C9A1F00818DAA /* DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E53508E2C7C9A1F00818DAA /* DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift */; };
 		1E5918472CA422A7008ED2B3 /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = 1E5918462CA422A7008ED2B3 /* Navigation */; };
 		1E60989B290009C700A508F9 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 1E7060BD28F88EE200E4CCDB /* Common */; };
 		1E60989D290011E600A508F9 /* ContentBlocking in Frameworks */ = {isa = PBXBuildFile; productRef = 1E60989C290011E600A508F9 /* ContentBlocking */; };
@@ -1377,7 +1376,6 @@
 		1E4F4A59297193DE00625985 /* MainViewController+CookiesManaged.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainViewController+CookiesManaged.swift"; sourceTree = "<group>"; };
 		1E4FAA6327D8DFB900ADC5B3 /* OngoingDownloadRowViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OngoingDownloadRowViewModel.swift; sourceTree = "<group>"; };
 		1E4FAA6527D8DFC800ADC5B3 /* CompleteDownloadRowViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompleteDownloadRowViewModel.swift; sourceTree = "<group>"; };
-		1E53508E2C7C9A1F00818DAA /* DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift"; sourceTree = "<group>"; };
 		1E61BC2927074BED00B2854D /* TextSizeUserScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextSizeUserScript.swift; sourceTree = "<group>"; };
 		1E6A4D682984208800A371D3 /* LocaleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocaleExtension.swift; sourceTree = "<group>"; };
 		1E7A71162934EB6400B7EA19 /* OmniBarNotificationAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OmniBarNotificationAnimator.swift; sourceTree = "<group>"; };
@@ -5331,7 +5329,6 @@
 				BDE91CD42C6292BF0005CB74 /* Feedback */,
 				F1FDC92F2BF4E0B3006B1435 /* SubscriptionEnvironment+Default.swift */,
 				D60170BB2BA32DD6001911B5 /* Subscription.swift */,
-				1E53508E2C7C9A1F00818DAA /* DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift */,
 				D6D95CE42B6DA3F200960317 /* AsyncHeadlessWebview */,
 				D664C7932B289AA000CBFA76 /* ViewModel */,
 				D664C7AC2B289AA000CBFA76 /* Views */,
@@ -7754,7 +7751,6 @@
 				9820EAF522613CD30089094D /* WebProgressWorker.swift in Sources */,
 				1EEF387D285B1A1100383393 /* TrackerImageCache.swift in Sources */,
 				3151F0EC27357FEE00226F58 /* VoiceSearchFeedbackViewModel.swift in Sources */,
-				1E53508F2C7C9A1F00818DAA /* DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift in Sources */,
 				1DDF402D2BA09482006850D9 /* SettingsMainSettingsView.swift in Sources */,
 				85010502292FB1000033978F /* FireproofFaviconUpdater.swift in Sources */,
 				F1C4A70E1E57725800A6CA1B /* OmniBar.swift in Sources */,

DuckDuckGo/AppDelegate.swift

@@ -558,12 +558,11 @@ import os.log
             }
         }
 
-        // TODO: restore but limit the number of parallel subscription fetches
-//        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
-//            if isSubscriptionActive {
-//                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
-//            }
-//        }
+        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
+            if isSubscriptionActive {
+                DailyPixel.fire(pixel: .privacyProSubscriptionActive)
+            }
+        }
 
         let importPasswordsStatusHandler = ImportPasswordsStatusHandler(syncService: syncService)
         importPasswordsStatusHandler.checkSyncSuccessStatus()

DuckDuckGo/AppDependencyProvider.swift

@@ -101,17 +101,6 @@ final class AppDependencyProvider: DependencyProvider {
         let subscriptionEnvironment = DefaultSubscriptionManager.getSavedOrDefaultEnvironment(userDefaults: subscriptionUserDefaults)
         vpnSettings.alignTo(subscriptionEnvironment: subscriptionEnvironment)
 
-//        let entitlementsCache = UserDefaultsCache<[Entitlement]>(userDefaults: subscriptionUserDefaults,
-//                                                                 key: UserDefaultsCacheKey.subscriptionEntitlements,
-//                                                                 settings: UserDefaultsCacheSettings(defaultExpirationInterval: .minutes(20)))
-//        let accessTokenStorage = SubscriptionTokenKeychainStorage(keychainType: .dataProtection(.named(subscriptionAppGroup)))
-//        let subscriptionService = DefaultSubscriptionEndpointService(currentServiceEnvironment: subscriptionEnvironment.serviceEnvironment)
-//        let authService = DefaultAuthEndpointService(currentServiceEnvironment: subscriptionEnvironment.serviceEnvironment)
-//        let accountManager = DefaultAccountManager(accessTokenStorage: accessTokenStorage,
-//                                                   entitlementsCache: entitlementsCache,
-//                                                   subscriptionEndpointService: subscriptionService,
-//                                                   authEndpointService: authService)
-
         let configuration = URLSessionConfiguration.default
         configuration.httpCookieStorage = nil
         configuration.requestCachePolicy = .reloadIgnoringLocalCacheData

DuckDuckGo/NetworkProtectionVisibilityForTunnelProvider.swift

@@ -23,15 +23,8 @@ import Networking
 
 // struct NetworkProtectionVisibilityForTunnelProvider: NetworkProtectionFeatureVisibility {
 //
-//    private let oAuthClient: any OAuthClient
-//
-//    init(oAuthClient: any OAuthClient) {
-//        self.oAuthClient = oAuthClient
-//    }
-//
 //    func isPrivacyProLaunched() -> Bool {
-//        let tokensContainer = oAuthClient.getStoredTokens()
-//        return tokensContainer?.accessToken != nil
+//        return true
 //    }
 //    
 //    func shouldMonitorEntitlement() -> Bool {

DuckDuckGo/RemoteMessagingConfigMatcherProvider.swift

@@ -84,7 +84,7 @@ final class RemoteMessagingConfigMatcherProvider: RemoteMessagingConfigMatcherPr
 
         let surveyActionMapper: DefaultRemoteMessagingSurveyURLBuilder
 
-        if let subscription = try? await subscriptionManager.currentSubscription(refresh: false) { // TODO: mmmm, review errors handling
+        if let subscription = try? await subscriptionManager.currentSubscription(refresh: false) {
             privacyProDaysSinceSubscribed = Calendar.current.numberOfDaysBetween(subscription.startedAt, and: Date()) ?? -1
             privacyProDaysUntilExpiry = Calendar.current.numberOfDaysBetween(Date(), and: subscription.expiresOrRenewsAt) ?? -1
             privacyProPurchasePlatform = subscription.platform.rawValue

DuckDuckGo/SettingsViewModel.swift

@@ -723,18 +723,8 @@ extension SettingsViewModel {
             state.subscription.platform = subscription.platform
             state.subscription.hasActiveSubscription = subscription.isActive
 
-            // TODO: check the logic here
             // Check entitlements and update state
             state.subscription.entitlements = subscriptionManager.entitlements
-
-            /*var currentEntitlements: [Entitlement.ProductName] = []
-             let entitlementsToCheck: [Entitlement.ProductName] = [.networkProtection, .dataBrokerProtection, .identityTheftRestoration]
-             for entitlement in entitlementsToCheck {
-             if case .success(true) = await subscriptionManager.accountManager.hasEntitlement(forProductName: entitlement) {
-             currentEntitlements.append(entitlement)
-             }
-             }
-             self.state.subscription.entitlements = currentEntitlements*/
         } catch SubscriptionEndpointServiceError.noData {
             // Auth successful but no Subscription is available
             Logger.subscription.log("Subscription not present")

PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift

@@ -52,7 +52,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
     private static var vpnLogger = VPNLogger()
     private static let persistentPixel: PersistentPixelFiring = PersistentPixel()
     private var cancellables = Set<AnyCancellable>()
-//    private let accountManager: AccountManager
+    private let subscriptionManager: any SubscriptionManager
 
     private let configurationStore = ConfigurationStore()
     private let configurationManager: ConfigurationManager
@@ -440,32 +440,50 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
         }
 
         // MARK: - Configure Subscription
-//        let entitlementsCache = UserDefaultsCache<[Entitlement]>(userDefaults: UserDefaults.standard,
-//                                                                 key: UserDefaultsCacheKey.subscriptionEntitlements,
-//                                                                 settings: UserDefaultsCacheSettings(defaultExpirationInterval: .minutes(20)))
-
-        let subscriptionAppGroup = Bundle.main.appGroup(bundle: .subs)
-//        let accessTokenStorage = SubscriptionTokenKeychainStorage(keychainType: .dataProtection(.named(subscriptionAppGroup)))
-//        let subscriptionService = DefaultSubscriptionEndpointService(currentServiceEnvironment: subscriptionEnvironment.serviceEnvironment)
-//        let authService = DefaultAuthEndpointService(currentServiceEnvironment: subscriptionEnvironment.serviceEnvironment)
-//        let accountManager = DefaultAccountManager(accessTokenStorage: accessTokenStorage,
-//                                                   entitlementsCache: entitlementsCache,
-//                                                   subscriptionEndpointService: subscriptionService,
-//                                                   authEndpointService: authService)
-//        self.accountManager = accountManager
-
-//        let featureVisibility = NetworkProtectionVisibilityForTunnelProvider(oAuthClient: <#T##any OAuthClient#>)
+        let configuration = URLSessionConfiguration.default
+        configuration.httpCookieStorage = nil
+        configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
+        let urlSession = URLSession(configuration: configuration,
+                                    delegate: SessionDelegate(),
+                                    delegateQueue: nil)
+        let apiService = DefaultAPIService(urlSession: urlSession)
+        let authEnvironment: OAuthEnvironment = subscriptionEnvironment.serviceEnvironment == .production ? .production : .staging
+
+        let authService = DefaultOAuthService(baseURL: authEnvironment.url, apiService: apiService)
+        let keychainManager = SubscriptionKeychainManager()
+        let legacyAccountStorage = AccountKeychainStorage()
+        let authClient = DefaultOAuthClient(tokensStorage: keychainManager,
+                                            legacyTokenStorage: legacyAccountStorage,
+                                            authService: authService)
+
+        apiService.authorizationRefresherCallback = { _ in
+            guard let tokensContainer = keychainManager.tokensContainer else {
+                throw OAuthClientError.internalError("Missing refresh token")
+            }
+
+            if tokensContainer.decodedAccessToken.isExpired() {
+                Logger.OAuth.debug("Refreshing tokens")
+                let tokens = try await authClient.refreshTokens()
+                return tokens.accessToken
+            } else {
+                Logger.general.debug("Trying to refresh valid token, using the old one")
+                return tokensContainer.accessToken
+            }
+        }
+        let storePurchaseManager = DefaultStorePurchaseManager()
+        let subscriptionEndpointService = DefaultSubscriptionEndpointService(apiService: apiService,
+                                                                             baseURL: subscriptionEnvironment.serviceEnvironment.url)
+        let subscriptionManager = DefaultSubscriptionManager(storePurchaseManager: storePurchaseManager,
+                                                             oAuthClient: authClient,
+                                                             subscriptionEndpointService: subscriptionEndpointService,
+                                                             subscriptionEnvironment: subscriptionEnvironment)
+        self.subscriptionManager = subscriptionManager
         let accessTokenProvider: () -> String? = {
-//            if featureVisibility.shouldMonitorEntitlement() {
-                return {
-//                    accountManager.accessToken
-                    "" // TODO: :(
-                }
-//            }
-            return { nil }
+            return {
+                authClient.currentTokensContainer?.accessToken
+            }
         }()
         let tokenStore = NetworkProtectionKeychainTokenStore(accessTokenProvider: accessTokenProvider)
-
         let errorStore = NetworkProtectionTunnelErrorStore()
         let notificationsPresenter = NetworkProtectionUNNotificationPresenter()
 
@@ -475,6 +493,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
             wrappee: notificationsPresenter
         )
         notificationsPresenter.requestAuthorization()
+
         super.init(notificationsPresenter: notificationsPresenterDecorator,
                    tunnelHealthStore: NetworkProtectionTunnelHealthStore(),
                    controllerErrorStore: errorStore,
@@ -486,10 +505,12 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
                    providerEvents: Self.packetTunnelProviderEvents,
                    settings: settings,
                    defaults: .networkProtectionGroupDefaults,
-                   entitlementCheck: { return await Self.entitlementCheck() }
+                   entitlementCheck: {
+            let hasEntitlement = subscriptionManager.entitlements.contains(.networkProtection)
+            return .success(hasEntitlement)
+        }
         )
 
-//        accountManager.delegate = self
         startMonitoringMemoryPressureEvents()
         observeServerChanges()
         APIRequest.Headers.setUserAgent(DefaultUserAgentManager.duckDuckGoUserAgent)
@@ -537,19 +558,9 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
         WidgetCenter.shared.reloadTimelines(ofKind: "VPNStatusWidget")
     }
 
-    private static func entitlementCheck() async -> Result<Bool, Error> {
-        return .success(true) // TODO: WTF?
-//        guard NetworkProtectionVisibilityForTunnelProvider(accountManager: accountManager).shouldMonitorEntitlement() else {
-//            return .success(true)
-//        }
-//
-//        let result = await accountManager.hasEntitlement(forProductName: .networkProtection)
-//        switch result {
-//        case .success(let hasEntitlement):
-//            return .success(hasEntitlement)
-//        case .failure(let error):
-//            return .failure(error)
-//        }
+    private func entitlementCheck() async -> Result<Bool, Error> {
+        let hasEntitlement = subscriptionManager.entitlements.contains(.networkProtection)
+        return .success(hasEntitlement)
     }
 }