Handle subscription-related iOS use cases

Sources/NetworkProtection/KeyManagement/NetworkProtectionTokenStore.swift

@@ -43,14 +43,16 @@ public final class NetworkProtectionKeychainTokenStore: NetworkProtectionTokenSt
     private let isSubscriptionEnabled: Bool
     private let accessTokenProvider: () -> String?
 
-    private static var authTokenPrefix: String { "ddg:" }
+    public static var authTokenPrefix: String { "ddg:" }
 
     public struct Defaults {
         static let tokenStoreEntryLabel = "DuckDuckGo Network Protection Auth Token"
         public static let tokenStoreService = "com.duckduckgo.networkprotection.authToken"
         static let tokenStoreName = "com.duckduckgo.networkprotection.token"
     }
 
+    /// - isSubscriptionEnabled: Controls whether the subscription access token is used to authenticate with the NetP backend
+    /// - accessTokenProvider: Defines how to actually retrieve the subscription access token
     public init(keychainType: KeychainType,
                 serviceName: String = Defaults.tokenStoreService,
                 errorEvents: EventMapping<NetworkProtectionError>?,
@@ -74,13 +76,13 @@ public final class NetworkProtectionKeychainTokenStore: NetworkProtectionTokenSt
         }
     }
 
-    public func makeToken(from subscriptionAccessToken: String) -> String {
+    private func makeToken(from subscriptionAccessToken: String) -> String {
         Self.authTokenPrefix + subscriptionAccessToken
     }
 
     public func fetchToken() throws -> String? {
-        if isSubscriptionEnabled, let authToken = accessTokenProvider() {
-            return makeToken(from: authToken)
+        if isSubscriptionEnabled {
+            return accessTokenProvider().map { makeToken(from: $0) }
         }
 
         do {
@@ -114,6 +116,3 @@ public final class NetworkProtectionKeychainTokenStore: NetworkProtectionTokenSt
         errorEvents?.fire(error.networkProtectionError)
     }
 }
-
-extension NetworkProtectionTokenStore {
-}

Sources/NetworkProtection/Settings/Extensions/UserDefaults+showEntitlementMessaging.swift → Sources/NetworkProtection/Settings/Extensions/UserDefaults+showMessaging.swift

@@ -1,5 +1,5 @@
 //
-//  UserDefaults+showEntitlementMessaging.swift
+//  UserDefaults+showMessaging.swift
 //
 //  Copyright © 2024 DuckDuckGo. All rights reserved.
 //
@@ -85,3 +85,24 @@ extension UserDefaults {
 public extension Notification.Name {
     static let vpnEntitlementMessagingDidChange = Notification.Name("com.duckduckgo.network-protection.entitlement-messaging-changed")
 }
+
+extension UserDefaults {
+    private var vpnEarlyAccessOverAlertAlreadyShownKey: String {
+        "vpnEarlyAccessOverAlertAlreadyShown"
+    }
+
+    @objc
+    public dynamic var vpnEarlyAccessOverAlertAlreadyShown: Bool {
+        get {
+            value(forKey: vpnEarlyAccessOverAlertAlreadyShownKey) as? Bool ?? false
+        }
+
+        set {
+            set(newValue, forKey: vpnEarlyAccessOverAlertAlreadyShownKey)
+        }
+    }
+
+    public func resetThankYouMessaging() {
+        removeObject(forKey: vpnEarlyAccessOverAlertAlreadyShownKey)
+    }
+}

Sources/NetworkProtection/Settings/Extensions/UserDefaults+subscriptionOverrideEnabled.swift

@@ -0,0 +1,40 @@
+//
+//  UserDefaults+subscriptionOverrideEnabled.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Combine
+import Foundation
+
+extension UserDefaults {
+    private var subscriptionOverrideEnabledKey: String {
+        "subscriptionOverrideEnabled"
+    }
+
+    public var subscriptionOverrideEnabled: Bool? {
+        get {
+            value(forKey: subscriptionOverrideEnabledKey) as? Bool
+        }
+
+        set {
+            set(newValue, forKey: subscriptionOverrideEnabledKey)
+        }
+    }
+
+    public func resetsubscriptionOverrideEnabled() {
+        removeObject(forKey: subscriptionOverrideEnabledKey)
+    }
+}