-
Notifications
You must be signed in to change notification settings - Fork 35
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Subscription oauth v2 #1033
Open
federicocappelli
wants to merge
126
commits into
main
Choose a base branch
from
fcappelli/subscription_oauth_api_v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Subscription oauth v2 #1033
+6,642
−3,848
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
# Conflicts: # Sources/Networking/README.md # Sources/Networking/v2/APIRequestErrorV2.swift # Sources/Networking/v2/APIRequestV2.swift # Sources/Networking/v2/APIResponseConstraints.swift # Sources/Networking/v2/APIService.swift # Sources/TestUtils/MockAPIService.swift # Tests/NetworkingTests/v2/APIServiceTests.swift
# Conflicts: # Package.resolved # Package.swift # Sources/MaliciousSiteProtection/Logger+MaliciousSiteProtection.swift # Sources/Networking/v2/APIRequestV2.swift # Sources/Networking/v2/APIResponseV2.swift # Sources/Subscription/SubscriptionFeatureMappingCache.swift # Sources/TestUtils/MockLegacyTokenStorage.swift # Tests/NetworkingTests/v2/APIServiceTests.swift
# Conflicts: # Package.resolved # Package.swift # Sources/MaliciousSiteProtection/API/APIClient.swift # Sources/MaliciousSiteProtection/Model/Match.swift # Sources/Networking/v2/APIRequestV2.swift # Sources/Networking/v2/Extensions/HTTPURLResponse+Cookie.swift # Sources/Subscription/SubscriptionFeatureMappingCache.swift # Sources/TestUtils/MockLegacyTokenStorage.swift # Sources/TestUtils/MockTokenStorage.swift # Tests/MaliciousSiteProtectionTests/MaliciousSiteProtectionAPIClientTests.swift # Tests/NetworkingTests/v2/APIServiceTests.swift # Tests/PhishingDetectionTests/Mocks/PhishingDetectorMock.swift
… into fcappelli/subscription_oauth_api_v2
# Conflicts: # Sources/MaliciousSiteProtection/API/APIClient.swift # Sources/Subscription/Flows/Models/SubscriptionOptions.swift # Sources/Subscription/Managers/StorePurchaseManager/StorePurchaseManager.swift # Sources/SubscriptionTestingUtilities/SubscriptionFeatureMappingCacheMock.swift # Tests/SubscriptionTests/Flows/Models/SubscriptionOptionsTests.swift
# Conflicts: # Sources/Subscription/Flows/AppStore/AppStoreAccountManagementFlow.swift
attempt to clean out tests output in CI reverted
@@ -29,6 +29,7 @@ extension APIClient { | |||
extension APIClient: APIClient.Mockable {} | |||
|
|||
public protocol APIClientEnvironment { | |||
func queryItems(for requestType: APIRequestType) -> QueryItems |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adopting the improved Networking V2
@@ -1,7 +1,7 @@ | |||
// | |||
// DecodableHelper.swift | |||
// HTTPURLResponse+Cookie.swift |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: github is mistaken here, not the same file at all
…com/duckduckgo/BrowserServicesKit into fcappelli/subscription_oauth_api_v2
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/1205842942115003/1207991044706235/f
iOS PR: duckduckgo/iOS#3480
macOS PR: duckduckgo/macos-browser#3580
What kind of version bump will this require?: Major
CC: @miasma13
Description:
This PR introduces the use of OAuth V2 authentication in Privacy Pro Subscription.
The code changes are comprehensive due to the paradigm changes between the old access token lifecycle and the new JWT lifecycle.
The Subscription UI and UX should be unchanged.
Steps to test this PR:
Test all Privacy Pro Subscription features and UX, more details here
Internal references:
Software Engineering Expectations
Technical Design Template