Use subs token for fetching locations

Sources/NetworkProtection/AppLaunching.swift

@@ -31,6 +31,7 @@ public enum AppLaunchCommand: Codable {
     case stopVPN
     case enableOnDemand
     case moveAppToApplications
+    case showPrivacyPro
 }
 
 public protocol AppLaunching {

Sources/NetworkProtection/Diagnostics/NetworkProtectionEntitlementMonitor.swift

@@ -40,7 +40,7 @@ public actor NetworkProtectionEntitlementMonitor {
 
     // MARK: - Init & deinit
 
-    init() {
+    public init() {
         os_log("[+] %{public}@", log: .networkProtectionMemoryLog, type: .debug, String(describing: self))
     }
 

Sources/NetworkProtection/Networking/NetworkProtectionClient.swift

@@ -182,7 +182,8 @@ final class NetworkProtectionBackendClient: NetworkProtectionClient {
 
     func getLocations(authToken: String) async -> Result<[NetworkProtectionLocation], NetworkProtectionClientError> {
         var request = URLRequest(url: locationsURL)
-        request.setValue("bearer \(authToken)", forHTTPHeaderField: "Authorization")
+        let adaptedToken = adaptTokenIfNeeded(authToken)
+        request.setValue("bearer \(adaptedToken)", forHTTPHeaderField: "Authorization")
         let downloadedData: Data
 
         do {
@@ -209,7 +210,8 @@ final class NetworkProtectionBackendClient: NetworkProtectionClient {
 
     func getServers(authToken: String) async -> Result<[NetworkProtectionServer], NetworkProtectionClientError> {
         var request = URLRequest(url: serversURL)
-        request.setValue("bearer \(authToken)", forHTTPHeaderField: "Authorization")
+        let adaptedToken = adaptTokenIfNeeded(authToken)
+        request.setValue("bearer \(adaptedToken)", forHTTPHeaderField: "Authorization")
         let downloadedData: Data
 
         do {
@@ -245,7 +247,8 @@ final class NetworkProtectionBackendClient: NetworkProtectionClient {
         }
 
         var request = URLRequest(url: registerKeyURL)
-        request.setValue("bearer \(authToken)", forHTTPHeaderField: "Authorization")
+        let adaptedToken = adaptTokenIfNeeded(authToken)
+        request.setValue("bearer \(adaptedToken)", forHTTPHeaderField: "Authorization")
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.httpMethod = "POST"
         request.httpBody = requestBodyData
@@ -342,7 +345,26 @@ final class NetworkProtectionBackendClient: NetworkProtectionClient {
             return .failure(NetworkProtectionClientError.failedToParseRedeemResponse(error))
         }
     }
+}
+
+fileprivate extension NetworkProtectionBackendClient {
+    private static var authTokenPrefix: String { "ddg:" }
 
+    func adaptTokenIfNeeded(_ accessToken: String) -> String {
+        if isSubscriptionEnabled && !Self.isSubscriptionAccessToken(accessToken) {
+            return Self.makeToken(from: accessToken)
+        } else {
+            return accessToken
+        }
+    }
+
+    private static func makeToken(from subscriptionAccessToken: String) -> String {
+        "\(authTokenPrefix)\(subscriptionAccessToken)"
+    }
+
+    private static func isSubscriptionAccessToken(_ token: String) -> Bool {
+        token.hasPrefix(authTokenPrefix)
+    }
 }
 
 extension URL {

Sources/NetworkProtection/Notifications/NetworkProtectionNotification.swift

@@ -107,6 +107,7 @@ public enum NetworkProtectionNotification: String {
     case showConnectedNotification
     case showIssuesNotResolvedNotification
     case showVPNSupersededNotification
+    case showExpiredEntitlementNotification
     case showTestNotification
 
     // Server Selection

Sources/NetworkProtection/Repositories/NetworkProtectionLocationListRepository.swift

@@ -26,7 +26,7 @@ public protocol NetworkProtectionLocationListRepository {
 final public class NetworkProtectionLocationListCompositeRepository: NetworkProtectionLocationListRepository {
     @MainActor private static var locationList: [NetworkProtectionLocation] = []
     private let client: NetworkProtectionClient
-    private let tokenStore: NetworkProtectionTokenStore
+    private let fetchToken: () throws -> String?
     private let errorEvents: EventMapping<NetworkProtectionError>
     private let isSubscriptionEnabled: Bool
 
@@ -36,18 +36,30 @@ final public class NetworkProtectionLocationListCompositeRepository: NetworkProt
                             isSubscriptionEnabled: Bool) {
         self.init(
             client: NetworkProtectionBackendClient(environment: environment, isSubscriptionEnabled: isSubscriptionEnabled),
-            tokenStore: tokenStore,
+            fetchToken: tokenStore.fetchToken,
+            errorEvents: errorEvents,
+            isSubscriptionEnabled: isSubscriptionEnabled
+        )
+    }
+
+    convenience public init(environment: VPNSettings.SelectedEnvironment,
+                            fetchToken: @escaping () throws -> String?,
+                            errorEvents: EventMapping<NetworkProtectionError>,
+                            isSubscriptionEnabled: Bool) {
+        self.init(
+            client: NetworkProtectionBackendClient(environment: environment, isSubscriptionEnabled: isSubscriptionEnabled),
+            fetchToken: fetchToken,
             errorEvents: errorEvents,
             isSubscriptionEnabled: isSubscriptionEnabled
         )
     }
 
     init(client: NetworkProtectionClient,
-         tokenStore: NetworkProtectionTokenStore,
+         fetchToken: @escaping () throws -> String?,
          errorEvents: EventMapping<NetworkProtectionError>,
          isSubscriptionEnabled: Bool) {
         self.client = client
-        self.tokenStore = tokenStore
+        self.fetchToken = fetchToken
         self.errorEvents = errorEvents
         self.isSubscriptionEnabled = isSubscriptionEnabled
     }
@@ -58,7 +70,7 @@ final public class NetworkProtectionLocationListCompositeRepository: NetworkProt
             return Self.locationList
         }
         do {
-            guard let authToken = try tokenStore.fetchToken() else {
+            guard let authToken = try fetchToken() else {
                 throw NetworkProtectionError.noAuthTokenFound
             }
             Self.locationList = try await client.getLocations(authToken: authToken).get()