Remove VPN at the conclusion of the waitlist test.

duckduckgo · Nov 15, 2023 · 272a93a · 272a93a
1 parent 5c753eb
commit 272a93a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -325,6 +325,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 #if NETWORK_PROTECTION
         widgetRefreshModel.beginObservingVPNStatus()
+        updateVPNAccessFromFeatureFlagState()
 #endif
 
         return true
@@ -794,8 +795,26 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             do {
                 try await NetworkProtectionCodeRedemptionCoordinator().redeem(inviteCode)
                 VPNWaitlist.shared.sendInviteCodeAvailableNotification()
-            } catch {
-                // TODO
+            } catch {}
+        }
+    }
+
+    func updateVPNAccessFromFeatureFlagState() {
+        guard NetworkProtectionKeychainTokenStore().isFeatureActivated else {
+            return
+        }
+
+        let waitlistStorage = VPNWaitlist.shared.waitlistStorage
+        let configManager = ContentBlocking.shared.privacyConfigurationManager
+
+        if !configManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlistBetaActive) {
+            waitlistStorage.deleteWaitlistState()
+            try? NetworkProtectionKeychainTokenStore().deleteToken()
+
+            Task {
+                let controller = NetworkProtectionTunnelController()
+                await controller.stop()
+                await controller.removeVPN()
             }
         }
     }

diff --git a/DuckDuckGo/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtectionTunnelController.swift
@@ -67,6 +67,10 @@ final class NetworkProtectionTunnelController: TunnelController {
         tunnelManager.connection.stopVPNTunnel()
     }
 
+    func removeVPN() async {
+        try? await tunnelManager?.removeFromPreferences()
+    }
+
     // MARK: - Connection Status Querying
 
     /// Queries Network Protection to know if its VPN is connected.