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.

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

Handle expired entitlement in NetP #692

Merged
merged 27 commits into from
Mar 7, 2024

Conversation

quanganhdo
Copy link
Member

@quanganhdo quanganhdo commented Mar 1, 2024

Task/Issue URL: https://app.asana.com/0/0/1206409081785857/f
iOS PR: duckduckgo/iOS#2525
macOS PR:duckduckgo/macos-browser#2331
What kind of version bump will this require?: Minor

Optional:

Tech Design URL:
CC:

Description:

This PR adds proper entitlement expiration handling and addresses some tech debts with VPNSettings.

Steps to test this PR:

See platform-specific PRs.

<!—
Before submitting a PR, please ensure you have tested the combinations you expect the reviewer to test, then delete configurations you know do not need explicit testing.

Using a simulator where a physical device is unavailable is acceptable.
—>

OS Testing:

  • iOS 14
  • iOS 15
  • iOS 16
  • macOS 10.15
  • macOS 11
  • macOS 12

Internal references:

Software Engineering Expectations
Technical Design Template

@quanganhdo quanganhdo force-pushed the anh/netp-handle-expired-entitlement branch 3 times, most recently from a582de9 to c2504ab Compare March 4, 2024 05:43
@quanganhdo quanganhdo force-pushed the anh/netp-handle-expired-entitlement branch from c88f953 to 1ab1e29 Compare March 6, 2024 03:48
@quanganhdo quanganhdo requested a review from graeme March 6, 2024 03:55
@quanganhdo quanganhdo marked this pull request as ready for review March 6, 2024 03:55
Copy link
Contributor

@graeme graeme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and looks good!

# Conflicts:
#	Sources/Subscription/AccountManager.swift
#	Sources/Subscription/Flows/AppStore/AppStoreAccountManagementFlow.swift
#	Sources/Subscription/Flows/AppStore/AppStorePurchaseFlow.swift
#	Sources/Subscription/Flows/AppStore/AppStoreRestoreFlow.swift
#	Sources/Subscription/Flows/Stripe/StripePurchaseFlow.swift
@quanganhdo quanganhdo merged commit 9bafa02 into main Mar 7, 2024
7 checks passed
@quanganhdo quanganhdo deleted the anh/netp-handle-expired-entitlement branch March 7, 2024 03:54
samsymons added a commit that referenced this pull request Mar 8, 2024
* main:
  Changes to 114.1.0-1 hotfix branch (#706)
  Navigation: Improve same-document navigation handling (#702)
  Add pixels for our main VPN funnels (#698)
  Remove Autoconsent subfeature (#697)
  #URL macro (#657)
  Handle expired entitlement in NetP (#692)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#701)
  Remove CGNAT range. (#691)
  Subscription keychain sharing for access token (#690)
  Integrate confirm entitlements endpoint (#700)
  fix bundle name in breakByRaisingSigInt (#699)
  Adds support for deleting all logins (#672)
  Bump C-S-S to 5.2.0 (#695)
  Update xcode-version to 15.2. (#688)
  Bump Tests/BrowserServicesKitTests/Resources/privacy-reference-tests (#687)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants