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

Handle expired entitlement in NetP #2525

Merged
merged 25 commits into from
Mar 7, 2024
Merged

Handle expired entitlement in NetP #2525

merged 25 commits into from
Mar 7, 2024

Conversation

quanganhdo
Copy link
Member

@quanganhdo quanganhdo commented Mar 1, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/0/1206409081785857/f
Tech Design URL:
CC:

Description:

This PR adds proper entitlement expiration handling to NetP.

Steps to test this PR:

  1. Go through the subscription flow
  2. With the VPN on, wait till the subscription expires. You should encounter the messaging & tunnel shutdown
  3. Resubscribe. Keep the VPN off. Once the subscription expires, try to reconnect. Again you should see the messaging.

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 14
  • iOS 15
  • iOS 16

Theme Testing:

  • Light theme
  • Dark theme
Internal references:

Software Engineering Expectations
Technical Design Template

@quanganhdo quanganhdo mentioned this pull request Mar 4, 2024
Merged
6 tasks
@quanganhdo quanganhdo force-pushed the anh/netp-handle-expired-entitlement branch from 30633c0 to 23d70db Compare March 4, 2024 17:07
@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Mar 4, 2024
quanganhdo and others added 16 commits March 5, 2024 22:31
@quanganhdo
Use notification to show messaging
938f623
@quanganhdo
Refactor
81f9384
@quanganhdo
Use Darwin notification instead
1410f31
@quanganhdo
Refactoring
55d685e
@quanganhdo
Navigate to sub flow
8593074
@quanganhdo
Block all traffic
9bc5650
@afterxleep @quanganhdo
15. Subscription sign-out notification observers and Design Feedback (#…
97990ec 
…2528)

Task/Issue URL: https://app.asana.com/0/414235014887631/1206458412095677/f

Description:
- Design review feedback updates (copy, layout fixes, etc)
- Removes debug flags on alpha builds (cc @graeme)
- Add notification observers for signOut on notifications
@samsymons @quanganhdo
Remove local BSK reference (#2529)
73ed614 
Task/Issue URL: https://app.asana.com/0/414235014887631/1206742300407972/f
Tech Design URL:
CC:

Description:

This PR removes a local BSK reference.
@quanganhdo
Add keychain access group support
6bd07ba
@quanganhdo
Use staging environment for packet tunnel provider
f060473
@quanganhdo
Update BSK
92b59be
@quanganhdo
Fix Swiftlint
a893f38
@quanganhdo
Remove code accidentally merged
cee5a23
@quanganhdo
Add app group
0ad7b41
@quanganhdo
Remove traffic blocking
0897a62
@quanganhdo
Update BSK
779d7b4
@quanganhdo quanganhdo force-pushed the anh/netp-handle-expired-entitlement branch from ab806a6 to 779d7b4 Compare March 6, 2024 03:50
@quanganhdo quanganhdo removed the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Mar 6, 2024
@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
@quanganhdo
Merge branch 'main' into anh/netp-handle-expired-entitlement
1f1f3a5 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/SettingsViewModel.swift
#	DuckDuckGo/Subscription/UserScripts/IdentityTheftRestorationPagesFeature.swift
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift
#	PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
@quanganhdo
Update BSK
fb39f1e
@quanganhdo
Fix merging issues
5174253
@quanganhdo
Update BSK
90f65bc
@quanganhdo
Update BSK
e45b9fd
@quanganhdo
Revert "Update BSK"
73dc1ec 
This reverts commit e45b9fd.
@quanganhdo
Merge branch 'main' into anh/netp-handle-expired-entitlement
80a32c3 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
quanganhdo added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Mar 7, 2024
@quanganhdo
Handle expired entitlement in NetP (#692)
9bafa02 
Task/Issue URL: https://app.asana.com/0/0/1206409081785857/f
iOS PR: duckduckgo/iOS#2525
macOS PR:duckduckgo/macos-browser#2331
@quanganhdo quanganhdo merged commit da0450e into main Mar 7, 2024
13 checks passed
@quanganhdo quanganhdo deleted the anh/netp-handle-expired-entitlement branch March 7, 2024 04:18
samsymons added a commit that referenced this pull request Mar 8, 2024
@samsymons
Merge branch 'main' into sam/vpn-ui-improvements
e2464c1 
* main:
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  fix opening tabs with transitional (#2542)
  Integrate confirm entitlements endpoint (#2541)
  Makes dbSaveBloomFilterError daily and count (#2526)
  16. Subscription: Display "Activation in progress" message (#2535)
  Autofill support for deleting all passwords  (#2497)
  Bump BrowserServicesKit (#2532)
  Release 7.111.0-0 (#2534)
  if dax dialogs are showing then dismiss (#2506)
samsymons added a commit that referenced this pull request Mar 8, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…
112b37e 
…-lottie-animation

* sam/vpn-ui-improvements:
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  fix opening tabs with transitional (#2542)
  Integrate confirm entitlements endpoint (#2541)
  Makes dbSaveBloomFilterError daily and count (#2526)
  16. Subscription: Display "Activation in progress" message (#2535)
  Autofill support for deleting all passwords  (#2497)
  Bump BrowserServicesKit (#2532)
  Release 7.111.0-0 (#2534)
  if dax dialogs are showing then dismiss (#2506)
samsymons added a commit that referenced this pull request Mar 8, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-2-lottie-animation' into sam/vp…
70ec49d 
…n-ui-improvements-3-combine-notification-settings

* sam/vpn-ui-improvements-2-lottie-animation: (22 commits)
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Add dark mode animation.
  Allow the animation intro to be skipped
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  fix opening tabs with transitional (#2542)
  Integrate confirm entitlements endpoint (#2541)
  Makes dbSaveBloomFilterError daily and count (#2526)
  16. Subscription: Display "Activation in progress" message (#2535)
  Autofill support for deleting all passwords  (#2497)
  Bump BrowserServicesKit (#2532)
  ...
samsymons added a commit that referenced this pull request Mar 8, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-3-combine-notification-settings…
9f89201 
…' into sam/vpn-ui-improvements-4-location-setting-change

# By Sam Symons (4) and others
# Via Sam Symons (3) and others
* sam/vpn-ui-improvements-3-combine-notification-settings: (22 commits)
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Add dark mode animation.
  Allow the animation intro to be skipped
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  fix opening tabs with transitional (#2542)
  Integrate confirm entitlements endpoint (#2541)
  Makes dbSaveBloomFilterError daily and count (#2526)
  16. Subscription: Display "Activation in progress" message (#2535)
  Autofill support for deleting all passwords  (#2497)
  Bump BrowserServicesKit (#2532)
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Mar 11, 2024
@samsymons
Merge branch 'main' into sam/improve-vpn-metadata
b11d103 
* main: (28 commits)
  Fix VPN view model memory leak (#2570)
  Bump submodules/privacy-reference-tests from `40ce868` to `a603ff9` (#2500)
  18. Subscription Entitlements caching (#2556)
  Release 7.111.0-2 (#2563)
  Revert "Report Apple Ad attribution using pixel (#2510)" (#2562)
  Vanilla browser integration (#2550)
  Fix blank space after URL bar hides (#2549)
  Release 7.111.0-1 (#2561)
  Point to BSK hotfix (#2558)
  Prevent redeeming invite codes after the VPN test ends (#2559)
  Updates Kingfisher to 7.11.0 (#2545)
  Makes network path metadata description anonymous (#2544)
  Adds pixels to track main VPN funnels (#2543)
  Cleanup after rolling out autoconsent enabled by default (#2537)
  Add #URL macro (#2540)
  Handle expired entitlement in NetP (#2525)
  Remove isSubscriptionEnabled check when attempting to delete NetP token (#2548)
  Validate correct environment (#2546)
  Remove CGNAT range (#2524)
  Add preliminary support for subscription keychain sharing (#2538)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@graeme graeme graeme approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@quanganhdo @graeme @afterxleep @samsymons