Check entitlement periodically and while rekeying NetP (iOS)

DuckDuckGo.xcodeproj/project.pbxproj

@@ -13583,8 +13583,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 111.1.1;
+				branch = "anh/netp-check-entitlement-periodically";
+				kind = branch;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "e3140633373b14b3d1fca25b098869cdaa753913",
-        "version" : "111.1.1"
+        "branch" : "anh/netp-check-entitlement-periodically",
+        "revision" : "fad4db675d9821a0c9bc3ba5280db4bbddff9cea"
       }
     },
     {

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift

@@ -98,6 +98,9 @@ extension EventMapping where Event == NetworkProtectionError {
             domainEvent = .networkProtectionUnhandledError(function: function, line: line, error: error)
             frequency = .standard
             return
+        case .vpnAccessRevoked:
+            // todo
+            return
         }
 
         let debugEvent = DebugEvent(eventType: .custom(domainEvent))

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift

@@ -28,7 +28,11 @@ extension NetworkProtectionDeviceManager {
         let settings = VPNSettings(defaults: .netP)
         let keyStore = NetworkProtectionKeychainKeyStore()
         let tokenStore = NetworkProtectionKeychainTokenStore()
-        return NetworkProtectionDeviceManager(environment: settings.selectedEnvironment, tokenStore: tokenStore, keyStore: keyStore, errorEvents: .networkProtectionAppDebugEvents)
+        return NetworkProtectionDeviceManager(environment: settings.selectedEnvironment,
+                                              tokenStore: tokenStore,
+                                              keyStore: keyStore,
+                                              errorEvents: .networkProtectionAppDebugEvents,
+                                              isSubscriptionEnabled: false)
     }
 }
 
@@ -37,14 +41,16 @@ extension NetworkProtectionCodeRedemptionCoordinator {
         let settings = VPNSettings(defaults: .netP)
         self.init(environment: settings.selectedEnvironment,
                   tokenStore: NetworkProtectionKeychainTokenStore(),
-                  errorEvents: .networkProtectionAppDebugEvents)
+                  errorEvents: .networkProtectionAppDebugEvents,
+                  isSubscriptionEnabled: false)
     }
 }
 
 extension NetworkProtectionKeychainTokenStore {
     convenience init() {
         self.init(keychainType: .default,
-                  errorEvents: .networkProtectionAppDebugEvents)
+                  errorEvents: .networkProtectionAppDebugEvents,
+                  isSubscriptionEnabled: false)
     }
 }
 

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift

@@ -242,6 +242,9 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
                 .setDisableRekeying:
             // Intentional no-op as this is handled by the extension or the agent's app delegate
             break
+        case .setShouldShowExpiredEntitlementMessaging:
+            // todo
+            break
         }
     }
 

DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift

@@ -191,7 +191,8 @@ extension NetworkProtectionLocationListCompositeRepository {
         self.init(
             environment: settings.selectedEnvironment,
             tokenStore: NetworkProtectionKeychainTokenStore(),
-            errorEvents: .networkProtectionAppDebugEvents
+            errorEvents: .networkProtectionAppDebugEvents,
+            isSubscriptionEnabled: false
         )
     }
 }

DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift

@@ -45,7 +45,7 @@
 
 /// This class takes care of requesting the presentation of notifications using UNNotificationCenter
 ///
 final class NetworkProtectionUNNotificationsPresenter: NSObject, NetworkProtectionNotificationsPresenter {
     private static let threadIdentifier = "com.duckduckgo.NetworkProtectionNotificationsManager.threadIdentifier"
 
     private let appLauncher: AppLauncher
@@ -140,6 +140,10 @@
         showNotification(.test, content)
     }
 
+    func showExpiredEntitlementNotification() {
+        // todo
+    }
+
     private func showNotification(_ identifier: NetworkProtectionNotificationIdentifier, _ content: UNNotificationContent) {
         let request = UNNotificationRequest(identifier: identifier.rawValue, content: content, trigger: .none)
 

DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift

@@ -123,6 +123,9 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     .failedToParseLocationListResponse:
                 // Needs Privacy triage for macOS Geoswitching pixels
                 return
+            case .vpnAccessRevoked:
+                // todo
+                return
             }
 
             PixelKit.fire(domainEvent, frequency: .dailyAndContinuous, includeAppVersionParameter: true)
@@ -226,7 +229,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         let debugEvents = Self.networkProtectionDebugEvents(controllerErrorStore: controllerErrorStore)
         let tokenStore = NetworkProtectionKeychainTokenStore(keychainType: Bundle.keychainType,
                                                              serviceName: Self.tokenServiceName,
-                                                             errorEvents: debugEvents)
+                                                             errorEvents: debugEvents,
+                                                             isSubscriptionEnabled: false)
         let notificationsPresenter = NetworkProtectionNotificationsPresenterFactory().make(settings: settings)
 
         super.init(notificationsPresenter: notificationsPresenter,
@@ -236,7 +240,9 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                    tokenStore: tokenStore,
                    debugEvents: debugEvents,
                    providerEvents: Self.packetTunnelProviderEvents,
-                   settings: settings)
+                   settings: settings,
+                   isSubscriptionEnabled: false,
+                   entitlementCheck: nil)
 
         observeServerChanges()
         observeStatusUpdateRequests()

DuckDuckGoVPN/NetworkProtectionBouncer.swift

@@ -30,7 +30,7 @@ final class NetworkProtectionBouncer {
     /// current app.
     ///
     func requireAuthTokenOrKillApp() {
-        let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default, errorEvents: nil)
+        let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default, errorEvents: nil, isSubscriptionEnabled: false)
 
         guard keychainStore.isFeatureActivated else {
             os_log(.error, log: .networkProtection, "🔴 Stopping: Network Protection not authorized.")

NetworkProtectionSystemExtension/NetworkProtectionAgentNotificationsPresenter.swift

@@ -51,4 +51,8 @@ final class NetworkProtectionAgentNotificationsPresenter: NetworkProtectionNotif
     func showTestNotification() {
         notificationCenter.post(.showTestNotification)
     }
+
+    func showExpiredEntitlementNotification() {
+        // todo
+    }
 }