Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Subscription oauth v2 #3480

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
Draft

Subscription oauth v2 #3480

wants to merge 48 commits into from

Conversation

federicocappelli
Copy link
Member

Task/Issue URL: https://app.asana.com/0/1205842942115003/1207991044706235/f
CC: @miasma13

Description:

TBC

Steps to test this PR:
1.
2.

Definition of Done (Internal Only):

Copy Testing:

  • Use of correct apostrophes in new copy, ie ’ rather than '

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 15
  • iOS 16
  • iOS 17

Theme Testing:

  • Light theme
  • Dark theme
Internal references:

Software Engineering Expectations
Technical Design Template

@federicocappelli
builds
cc16889
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
8b07ea5 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@federicocappelli
auth and first purchase improved
79faa6b
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
44e00ee 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDependencyProvider.swift
#	DuckDuckGo/NetworkProtectionRootView.swift
#	DuckDuckGo/NetworkProtectionTunnelController.swift
#	DuckDuckGo/Subscription/DefaultSubscriptionManager+AccountManagerKeychainAccessDelegate.swift
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift
#	DuckDuckGo/Subscription/Views/SubscriptionContainerViewFactory.swift
#	PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
@federicocappelli
purchase flow fixed
c6c2bef
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
c640a91 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/AppDependencyProvider.swift
@federicocappelli
purchase fixed
018751a
@federicocappelli
token fixes
de81314
@federicocappelli
loggers improved and restore fixed
b4c661e
@federicocappelli
subscription refresh improved
d123038
@federicocappelli federicocappelli mentioned this pull request Oct 25, 2024
Draft
6 tasks
@federicocappelli
v1 to v2 auth migration
9d90ccf
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
457922c 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 25, 2024 •
edited
Loading

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS against 464e598

@federicocappelli
lint ad restore commented code
60d4012
@federicocappelli
review suggestions applied
07e2cc0
@federicocappelli
tests and logs
bd5bb1b
@federicocappelli
vpn fixed
e92d0db
@federicocappelli
debug menu improved
1406315
@federicocappelli
unit tests and lint
eebbc48
@federicocappelli
unit tests and improvements
8ea3254
@federicocappelli
signout as async
c78a9c2
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
c021b95 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/Feedback/VPNMetadataCollector.swift
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
0f426a1 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@federicocappelli
lint
f06370b
@federicocappelli
BSK points to branch now
5f69e54
@federicocappelli
bsk updated
929e12d
@federicocappelli
Merge branch 'main' of https://github.com/duckduckgo/iOS into fcappel…
386fd70 
…li/subscription_oauth_api_v2

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@federicocappelli
bsk local
b018cce
@federicocappelli
Merge branch 'main' of https://github.com/duckduckgo/iOS into fcappel…
00e55c5 
…li/subscription_oauth_api_v2

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@federicocappelli
BSK
a955a78
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
b67e5d4
@federicocappelli
BSK update
47ac372
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
80be4fe 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDependencyProvider.swift
#	DuckDuckGo/NetworkProtectionTunnelController.swift
@federicocappelli
DI improved
bd51e3f
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
7327d2d 
# Conflicts:
#	.github/workflows/pr.yml
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@federicocappelli
token v1/v2 exchange fixed, token providing improved
67d5d50
@federicocappelli
updates after mac integration
d0c8344
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
60bad87 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDelegate.swift
#	DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift
@federicocappelli
merge
170ed9e
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
32e5de6 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
@federicocappelli
local bsk
87455ba
@federicocappelli
project fix
0191b02
@federicocappelli
unit tests builds
bd5cb7c
@federicocappelli
main merge
f229b65
@federicocappelli
BSK > branch
e4fbf00
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
f8eabd5 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo/SubscriptionDebugViewController.swift
@federicocappelli
packages
a745b49
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
b3482bd 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDependencyProvider.swift
#	DuckDuckGo/NetworkProtectionRootView.swift
#	DuckDuckGo/NetworkProtectionStatusView.swift
#	DuckDuckGo/SettingsOthersView.swift
#	DuckDuckGo/SettingsState.swift
#	DuckDuckGo/SettingsViewModel.swift
#	DuckDuckGo/Subscription/Feedback/UnifiedFeedbackFormViewModel.swift
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/Subscription/Views/SubscriptionSettingsView.swift
#	DuckDuckGoTests/Subscription/SubscriptionContainerViewModelTests.swift
#	DuckDuckGoTests/Subscription/SubscriptionFlowViewModelTests.swift
#	DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift
@federicocappelli
Merge branch 'main' into fcappelli/subscription_oauth_api_v2
464e598 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Do Not Merge includes-BSK-changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@federicocappelli