Universal auth v1 and v2 NetworkProtection (#3914)

Task/Issue URL: https://app.asana.com/0/72649045549333/1209279739041319/f **Description**: This PR introduces a few changes and some unused code in network protection allowing the future adoption of Auth V2. All code related to Auth V2 is not used; instead, Auth V1 is maintained.
duckduckgo · Feb 4, 2025 · 1154ab5 · 1154ab5
1 parent 48d9366
commit 1154ab5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/DuckDuckGo-iOS.xcodeproj/project.pbxproj b/DuckDuckGo-iOS.xcodeproj/project.pbxproj
@@ -11987,7 +11987,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit.git";
 			requirement = {
 				kind = exactVersion;
-				version = 234.0.0;
+				version = 235.0.0;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit.git",
       "state" : {
-        "revision" : "4376de073a92ca6c69fcf31c28cfcfaf6b9727d0",
-        "version" : "234.0.0"
+        "revision" : "8ea6cdb74fed2e9ff9d60aafe636291dff8024dc",
+        "version" : "235.0.0"
       }
     },
     {

diff --git a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
@@ -71,7 +71,7 @@ extension NetworkProtectionLocationListCompositeRepository {
         let settings = AppDependencyProvider.shared.vpnSettings
         self.init(
             environment: settings.selectedEnvironment,
-            tokenStore: AppDependencyProvider.shared.networkProtectionKeychainTokenStore,
+            tokenHandler: AppDependencyProvider.shared.networkProtectionKeychainTokenStore,
             errorEvents: .networkProtectionAppDebugEvents
         )
     }

diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
@@ -475,7 +475,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
                    snoozeTimingStore: NetworkProtectionSnoozeTimingStore(userDefaults: .networkProtectionGroupDefaults),
                    wireGuardInterface: DefaultWireGuardInterface(),
                    keychainType: .dataProtection(.unspecified),
-                   tokenStore: tokenStore,
+                   tokenHandler: tokenStore,
                    debugEvents: Self.networkProtectionDebugEvents(controllerErrorStore: errorStore),
                    providerEvents: Self.packetTunnelProviderEvents,
                    settings: settings,