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

Subscriptions: 20 - Subscription Caching #2569

Merged
merged 37 commits into from
Mar 11, 2024
Merged

Subscriptions: 20 - Subscription Caching #2569

merged 37 commits into from
Mar 11, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Mar 9, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/0/1206800657723184/f
BSK PR: duckduckgo/BrowserServicesKit#710

Description:

  • Bumps BSK to use subscription caching:
  • Push Purchase Cancel update to Webview on user cancellation
  • Minor presentation updates for sheets and subscription-related Settings cleanup

Steps to test this PR:

  1. Purchase a subscription
  2. Cancel on Apple Dialog
  3. Purchase subscription
  4. Remove from Device
  5. Restore Subscription

afterxleep added 16 commits March 7, 2024 18:00
@afterxleep
Entitlements caching
7d7b7f7
@afterxleep
Update entitlements check
0cd9e25
@afterxleep
Display errors on Subscription and Restore Flow
201d093
@afterxleep
Avoid showing the back button in the root view
23fa003
@afterxleep
DIsmiss the Subscription Stack from restore (if required)
663cc01
@afterxleep
Remove internal BSK
f8da0bc
@afterxleep
Fix PIR sheet view
461aa58
@afterxleep
Merge branch 'main' into daniel/subscriptions/19.subscription.errors
226f4e1 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@afterxleep
Update to use AccessToken (not authToken)
4068456
@afterxleep
Replace accessToken with AuthToken
00ad77a
@afterxleep
Use accessToken instead of authToken
a84c442
@afterxleep
Revert Certificate match for Alpha
56f07ca
@afterxleep
Hide Back button in root Webview
1f1f259
@afterxleep
Display errors when WebViews Fail to load
5502011
@afterxleep
Missin Subscription Flag
d78c038
@afterxleep
Subscription Caching
85bae13
@afterxleep afterxleep mentioned this pull request Mar 9, 2024
Merged
@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 9, 2024
@afterxleep afterxleep requested a review from miasma13 March 9, 2024 23:34
@afterxleep afterxleep 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 10, 2024
@afterxleep
Merge branch 'daniel/subscriptions/19.subscription.errors' into danie…
7f90cb1 
…l/subscriptions/20.caching

# Conflicts:
#	DuckDuckGo/SettingsSubscriptionView.swift
#	DuckDuckGo/SettingsViewModel.swift
@afterxleep afterxleep changed the title 20. Subscriptions - Subscription Caching Subscriptions: 20. Subscription Caching Mar 10, 2024
@afterxleep afterxleep changed the title Subscriptions: 20. Subscription Caching Subscriptions: 20 - Subscription Caching Mar 10, 2024
afterxleep and others added 8 commits March 10, 2024 23:09
@afterxleep
Removed unnecesary endif
501b9f2
@afterxleep
Removed unneded SUBSCRIPTION
7848425
@afterxleep
Move activeSubscriptionCache outside of compiler flag
fce57fe
@afterxleep
Move wrapped value out
d92dd36
@afterxleep
Merge branch 'main' into daniel/subscriptions/19.subscription.errors
6fb68dd 
# Conflicts:
#	DuckDuckGo/Subscription/Views/SubscriptionFlowView.swift
#	submodules/privacy-reference-tests
@afterxleep
Conflict merge fix
ae5a427
@afterxleep
Merge branch 'daniel/subscriptions/19.subscription.errors' into danie…
00dd83a 
…l/subscriptions/20.caching

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/SettingsViewModel.swift
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
@miasma13
Merge branch 'main' into daniel/subscriptions/20.caching
9f87596
afterxleep added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Mar 11, 2024
@afterxleep
Subscriptions: Implement Caching for Subscription Info (#710)
4042a8e 
Task/Issue URL: https://app.asana.com/0/0/1206800657723184/f
iOS PR: duckduckgo/iOS#2569
macOS PR: duckduckgo/macos-browser#2368
What kind of version bump will this require?: Minor

Description:

Implements basic caching for Subscription info
Maintains current static approach for SubscriptionService
Adds proper UserDefault keys to avoid conflicts
Makes AppGroup optional in UserDefaultsCache
Adds method to reset cache in SubscriptionService and call from Signout
@afterxleep
Bump BSK
857f0be
@afterxleep
Merge branch 'main' into daniel/subscriptions/20.caching
e328502 
# Conflicts:
#	DuckDuckGo/SettingsSubscriptionView.swift
#	submodules/privacy-reference-tests
@afterxleep afterxleep merged commit 454fb21 into main Mar 11, 2024
13 checks passed
@afterxleep afterxleep deleted the daniel/subscriptions/20.caching branch March 11, 2024 22:56
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'main' into sam/vpn-ui-improvements
9f5800b 
* main:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  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)
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…
b73a8c9 
…-lottie-animation

* sam/vpn-ui-improvements:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  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)
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-2-lottie-animation' into sam/vp…
dce136f 
…n-ui-improvements-3-combine-notification-settings

* sam/vpn-ui-improvements-2-lottie-animation:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  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)
samsymons added a commit that referenced this pull request Mar 13, 2024
@samsymons
Merge branch 'sam/vpn-ui-improvements-3-combine-notification-settings…
934502c 
…' into sam/vpn-ui-improvements-4-location-setting-change

# By Mariusz Śpiewak (3) and others
# Via Sam Symons (4) and others
* sam/vpn-ui-improvements-3-combine-notification-settings:
  Subscriptions: 20 - Subscription Caching (#2569)
  Subscriptions: 19. Error handling and minor updates (#2567)
  Use History on iOS (#2539)
  Release 7.112.0-1 (#2573)
  Report on toggle protections off (#2536)
  Release 7.112.0-0 (#2572)
  Update autoconsent to v10.2.0 (#2554)
  update metadata (#2571)
  Subscription pro pixels (#2531)
  Update SwiftSoup and Kingfisher versions (#2566)
  Move vpnFirstEnabled and networkPathChange out of VPNSettings (#2560)
  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)

# 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

@miasma13 miasma13 miasma13 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.
2 participants
@afterxleep @miasma13