diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 72d2198df7..24454f9b80 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9198,8 +9198,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 85.0.2; + branch = "sam/add-netp-subscription-auth-support"; + kind = branch; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f9c0196d58..040cf6b099 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,9 +14,9 @@ "package": "BrowserServicesKit", "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { - "branch": null, - "revision": "88935a6656c7f0bd9dec75a761463347232f68a1", - "version": "85.0.2" + "branch": "sam/add-netp-subscription-auth-support", + "revision": "22506de8f9fcadddf2a949ac922ad4377b0a3188", + "version": null } }, { diff --git a/DuckDuckGo/EventMapping+NetworkProtectionError.swift b/DuckDuckGo/EventMapping+NetworkProtectionError.swift index cefbd105ec..a139b4c9a2 100644 --- a/DuckDuckGo/EventMapping+NetworkProtectionError.swift +++ b/DuckDuckGo/EventMapping+NetworkProtectionError.swift @@ -88,7 +88,8 @@ extension EventMapping where Event == NetworkProtectionError { .wireGuardInvalidState, .wireGuardDnsResolution, .wireGuardSetNetworkSettings, - .startWireGuardBackend: + .startWireGuardBackend, + .failedToRetrieveAuthToken: pixelEvent = .networkProtectionUnhandledError params[PixelParameters.function] = #function params[PixelParameters.line] = String(#line) diff --git a/DuckDuckGoTests/NetworkProtectionInviteViewModelTests.swift b/DuckDuckGoTests/NetworkProtectionInviteViewModelTests.swift index 1d63a15faf..08c396103b 100644 --- a/DuckDuckGoTests/NetworkProtectionInviteViewModelTests.swift +++ b/DuckDuckGoTests/NetworkProtectionInviteViewModelTests.swift @@ -133,8 +133,15 @@ final class NetworkProtectionInviteViewModelTests: XCTestCase { } private class MockRedemptionCoordinator: NetworkProtectionCodeRedeeming { + var callCount = 0 func redeem(_ code: String) async throws { callCount += 1 } + + var exchangeCallCount = 0 + func exchange(accessToken: String) async throws { + exchangeCallCount += 1 + } + } diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift index 4943d79eb3..63809c0af8 100644 --- a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift +++ b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift @@ -140,6 +140,8 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider { params[PixelParameters.function] = function params[PixelParameters.line] = String(line) pixelError = error + case .failedToRetrieveAuthToken: + return case .failedToFetchLocationList: return case .failedToParseLocationListResponse: