Universal auth v1 and v2 NetworkProtection #1207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| } | ||
| } | ||
|
|
||
| private func loadTokenContainer(from options: StartupOptions) async throws { |
There was a problem hiding this comment.
This is AuthV2 counterpart of loadAuthToken and it's unused.
# Conflicts: # Sources/Subscription/API/SubscriptionEndpointServiceV2.swift # Sources/Subscription/Flows/AppStore/AppStorePurchaseFlowV2.swift # Sources/Subscription/Managers/SubscriptionManagerV2.swift # Sources/Subscription/Storage/V2/SubscriptionTokenKeychainStorageV2.swift # Sources/Subscription/SubscriptionFeatureV2.swift
samsymons
reviewed
Feb 4, 2025
| @@ -55,7 +55,8 @@ final class NetworkProtectionKeychainStore { | |||
|
|
|||
| // MARK: - Keychain Interaction | |||
|
|
|||
| func readData(named name: String) throws -> Data? { | |||
| public func readData(named name: String) throws -> Data? { | |||
| Logger.networkProtectionKeyManagement.debug("Reading key \(name, privacy: .public) from keychain") | |||
There was a problem hiding this comment.
Nice, the new log entries are handy 🙌
There was a problem hiding this comment.
Just to clarify, I added logs that I found useful during my VPN debug sessions
samsymons
reviewed
Feb 4, 2025
...kProtection/Subscription/NetworkProtectionKeychainTokenStore+SubscriptionTokenHandling.swift
Outdated
Show resolved
Hide resolved
samsymons
approved these changes
Feb 4, 2025
federicocappelli
deleted the
fcappelli/authv2/network_protection_2tokens
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/0/72649045549333/1209279739041319/f
iOS PR: duckduckgo/iOS#3914
macOS PR: duckduckgo/macos-browser#3817
What kind of version bump will this require?: Major
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.
Steps to test this PR:
Internal references:
Software Engineering Expectations
Technical Design Template