Rework the caching logic for subscription and entitlements #741
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
quanganhdo
reviewed
Mar 22, 2024
| entitlementsCache: UserDefaultsCache<[Entitlement]>(subscriptionAppGroup: subscriptionAppGroup, key: UserDefaultsCacheKey.subscriptionEntitlements)) | ||
| entitlementsCache: UserDefaultsCache<[Entitlement]>(subscriptionAppGroup: subscriptionAppGroup, | ||
| key: UserDefaultsCacheKey.subscriptionEntitlements, | ||
| settings: UserDefaultsCacheSettings(defaultExpirationInterval: .minutes(20)))) |
There was a problem hiding this comment.
This should be a configurable param as well.
| if !subscription.isActive { | ||
| signOut() | ||
| } | ||
| } | ||
|
|
||
| _ = await fetchEntitlements(cachePolicy: .reloadIgnoringLocalCacheData) |
There was a problem hiding this comment.
If fetchRemoteEntitlements returns a failure I think we should handle this. Otherwise just blocking the endpoint at router-level would make the refresh meaningless.
| @@ -55,7 +56,9 @@ public final class SubscriptionService: APIService { | |||
|
|
|||
| switch result { | |||
| case .success(let subscriptionResponse): | |||
| subscriptionCache.set(subscriptionResponse) | |||
| let defaultExpiryDate = Date().addingTimeInterval(subscriptionCache.settings.defaultExpirationInterval) | |||
There was a problem hiding this comment.
This relies on system time which can be manipulated. If device time is set to a distance future, any entitlement check that depends on the cache would just succeed. While we do use reloadIgnoringLocalCacheData when refreshing periodically, we don't currently handle the failure.
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.
Required:
Task/Issue URL:
iOS PR: duckduckgo/macos-browser#2485
macOS PR: duckduckgo/iOS#2627
What kind of version bump will this require?: Patch
Description:
Change default staleness time interval for subscription and entitlement cache to 20min
When storing subscription in the cache use the date based on default interval or its date of renewalOrExpiry - whatever is earlier
Make the VPN code use cache and its logic for doing fetch if data is stale
On applicationDidBecomeActive refresh subscription details and entitlements
In the app rely on subscription details and entitlements based on cache logic (cached if still valid else fetch)
Internal references:
Software Engineering Expectations
Technical Design Template