duckduckgo · federicocappelli · Oct 16, 2024 · Oct 16, 2024 · Oct 21, 2024 · Oct 21, 2024
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -40,7 +40,7 @@ jobs:
     name: Unit Tests
 
     runs-on: macos-14-xlarge
-    timeout-minutes: 20
+    timeout-minutes: 15
 
     outputs:
       commit_author: ${{ steps.fetch_commit_author.outputs.commit_author }}

diff --git a/...tion/Extensions/Logger+Subscription.swift → Core/Logger+Pixel.swift b/...tion/Extensions/Logger+Subscription.swift → Core/Logger+Pixel.swift
@@ -1,5 +1,5 @@
 //
-//  Logger+Subscription.swift
+//  Logger+Pixel.swift
 //  DuckDuckGo
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
@@ -20,9 +20,6 @@
 import Foundation
 import os.log
 
-extension Logger {
-
-    static var subscription: Logger = {
-        Logger(subsystem: Bundle.main.bundleIdentifier ?? "DuckDuckGo", category: "SubscriptionPro")
-    }()
+public extension Logger {
+    static var pixels = { Logger(subsystem: "Pixels", category: "") }()
 }
diff --git a/Core/PersistentPixel.swift b/Core/PersistentPixel.swift
@@ -98,7 +98,7 @@ public final class PersistentPixel: PersistentPixelFiring {
         var additionalParameters = additionalParameters
         additionalParameters[PixelParameters.originalPixelTimestamp] = dateString
 
-        Logger.general.debug("Firing persistent pixel named \(pixel.name)")
+        Logger.pixels.debug("Firing persistent pixel named \(pixel.name)")
 
         pixelFiring.fire(pixel: pixel,
                          error: error,

diff --git a/Core/Pixel.swift b/Core/Pixel.swift
@@ -235,7 +235,7 @@
         }
 
         guard !isDryRun else {
-            Logger.general.debug("Pixel fired \(pixelName.replacingOccurrences(of: "_", with: "."), privacy: .public) \(params.count > 0 ? "\(params)" : "", privacy: .public)")
+            Logger.pixels.debug("Pixel fired \(pixelName.replacingOccurrences(of: "_", with: "."), privacy: .public) \(params.count > 0 ? "\(params)" : "", privacy: .public)")
             // simulate server response time for Dry Run mode
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                 onComplete(nil)
@@ -265,8 +265,8 @@
                                                     allowedQueryReservedCharacters: allowedQueryReservedCharacters,
                                                      headers: headers)
         let request = APIRequest(configuration: configuration, urlSession: .session(useMainThreadCallbackQueue: true))
         request.fetch { _, error in
-            Logger.general.debug("Pixel fired \(pixelName, privacy: .public) \(params, privacy: .public)")
+            Logger.pixels.debug("Pixel fired \(pixelName, privacy: .public) \(params, privacy: .public)")
             onComplete(error)
         }
     }

diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -730,6 +730,7 @@ extension Pixel {
         case privacyProSubscriptionCookieRefreshedWithAccessToken
         case privacyProSubscriptionCookieRefreshedWithEmptyValue
         case privacyProSubscriptionCookieFailedToSetSubscriptionCookie
+        case privacyProDeadTokenDetected
 
         // MARK: Pixel Experiment
         case pixelExperimentEnrollment
@@ -1572,6 +1573,7 @@ extension Pixel.Event {
         case .privacyProSubscriptionCookieRefreshedWithAccessToken: return "m_privacy-pro_subscription-cookie-refreshed_with_access_token"
         case .privacyProSubscriptionCookieRefreshedWithEmptyValue: return "m_privacy-pro_subscription-cookie-refreshed_with_empty_value"
         case .privacyProSubscriptionCookieFailedToSetSubscriptionCookie: return "m_privacy-pro_subscription-cookie-failed_to_set_subscription_cookie"
+        case .privacyProDeadTokenDetected: return "m_privacy-pro_dead_token_detected"
 
         // MARK: Pixel Experiment
         case .pixelExperimentEnrollment: return "pixel_experiment_enrollment"

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "948420e704ea4d9412a4fc3e2c2ab0d5ea5fe5d7",
-        "version" : "209.1.0"
+        "branch" : "fcappelli/subscription_oauth_api_v2",
+        "revision" : "aab97954107399096a9bbe64b6aff8eb49bc648b"
       }
     },
     {
@@ -90,6 +90,15 @@
         "version" : "2.0.0"
       }
     },
+    {
+      "identity" : "jwt-kit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/vapor/jwt-kit.git",
+      "state" : {
+        "revision" : "c2595b9ad7f512d7f334830b4df1fed6e917946a",
+        "version" : "4.13.4"
+      }
+    },
     {
       "identity" : "kingfisher",
       "kind" : "remoteSourceControl",
@@ -144,6 +153,24 @@
         "version" : "1.4.0"
       }
     },
+    {
+      "identity" : "swift-asn1",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-asn1.git",
+      "state" : {
+        "revision" : "7faebca1ea4f9aaf0cda1cef7c43aecd2311ddf6",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-crypto",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-crypto.git",
+      "state" : {
+        "revision" : "06dc63c6d8da54ee11ceb268cde1fa68161afc96",
+        "version" : "3.9.1"
+      }
+    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AdhocDebug.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AdhocDebug.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AtbUITests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/AtbUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Core.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Core.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo-Alpha.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo-Alpha.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/FingerprintingUITests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/FingerprintingUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Instruments.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/Instruments.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/OpenAction.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/OpenAction.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/PacketTunnelProvider.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/PacketTunnelProvider.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/ShareExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -62,7 +62,7 @@ import os.log
     @MainActor
     private lazy var vpnWorkaround: VPNRedditSessionWorkaround = {
         return VPNRedditSessionWorkaround(
-            accountManager: AppDependencyProvider.shared.accountManager,
+            subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
             tunnelController: AppDependencyProvider.shared.networkProtectionTunnelController
         )
     }()
@@ -91,6 +91,7 @@ import os.log
     private var subscriptionCookieManager: SubscriptionCookieManaging!
     private var subscriptionCookieManagerFeatureFlagCancellable: AnyCancellable?
     var privacyProDataReporter: PrivacyProDataReporting!
+    private var tokenBackgroundRefreshTask: TokenBackgroundRefreshTask?
 
     // MARK: - Feature specific app event handlers
 
@@ -101,10 +102,6 @@ import os.log
     @UserDefaultsWrapper(key: .privacyConfigCustomURL, defaultValue: nil)
     private var privacyConfigCustomURL: String?
 
-    var accountManager: AccountManager {
-        AppDependencyProvider.shared.accountManager
-    }
-
     @UserDefaultsWrapper(key: .didCrashDuringCrashHandlersSetUp, defaultValue: false)
     private var didCrashDuringCrashHandlersSetUp: Bool
 
@@ -378,6 +375,9 @@ import os.log
         // Having both in `didBecomeActive` can sometimes cause the exception when running on a physical device, so registration happens here.
         AppConfigurationFetch.registerBackgroundRefreshTaskHandler()
 
+        tokenBackgroundRefreshTask = TokenBackgroundRefreshTask(subscriptionManager: AppDependencyProvider.shared.subscriptionManager)
+        tokenBackgroundRefreshTask?.registerBackgroundRefreshTaskHandler()
+
         UNUserNotificationCenter.current().delegate = self
 
         window?.windowScene?.screenshotService?.delegate = self
@@ -612,7 +612,7 @@ import os.log
             }
         }
 
-        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscriptionAndEntitlements { isSubscriptionActive in
+        AppDependencyProvider.shared.subscriptionManager.refreshCachedSubscription { isSubscriptionActive in
             if isSubscriptionActive {
                 DailyPixel.fire(pixel: .privacyProSubscriptionActive)
             }
@@ -634,7 +634,8 @@ import os.log
 
     private func stopAndRemoveVPNIfNotAuthenticated() async {
         // Only remove the VPN if the user is not authenticated, and it's installed:
-        guard !accountManager.isUserAuthenticated, await AppDependencyProvider.shared.networkProtectionTunnelController.isInstalled else {
+        guard !AppDependencyProvider.shared.subscriptionManager.isUserAuthenticated,
+              await AppDependencyProvider.shared.networkProtectionTunnelController.isInstalled else {
             return
         }
 
@@ -742,6 +743,7 @@ import os.log
         suspendSync()
         syncDataProviders.bookmarksAdapter.cancelFaviconsFetching(application)
         privacyProDataReporter.saveApplicationLastSessionEnded()
+        tokenBackgroundRefreshTask?.scheduleTask()
     }
 
     private func suspendSync() {
@@ -1031,7 +1033,8 @@ import os.log
             return
         }
 
-        if case .success(true) = await accountManager.hasEntitlement(forProductName: .networkProtection, cachePolicy: .returnCacheDataDontLoad) {
+        let entitlements = AppDependencyProvider.shared.subscriptionManager.entitlements
+        if entitlements.contains(.networkProtection) {
             let items = [
                 UIApplicationShortcutItem(type: ShortcutKey.openVPNSettings,
                                           localizedTitle: UserText.netPOpenVPNQuickAction,
@@ -1109,12 +1112,11 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     }
 
     func presentNetworkProtectionStatusSettingsModal() {
-        Task {
-            if case .success(let hasEntitlements) = await accountManager.hasEntitlement(forProductName: .networkProtection), hasEntitlements {
-                (window?.rootViewController as? MainViewController)?.segueToVPN()
-            } else {
-                (window?.rootViewController as? MainViewController)?.segueToPrivacyPro()
-            }
+        let entitlements = AppDependencyProvider.shared.subscriptionManager.entitlements
+        if entitlements.contains(.networkProtection) {
+            (window?.rootViewController as? MainViewController)?.segueToVPN()
+        } else {
+            (window?.rootViewController as? MainViewController)?.segueToPrivacyPro()
         }
     }