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

Add support for RoW subscriptions #5327

Merged
merged 20 commits into from
Dec 2, 2024
Merged

Add support for RoW subscriptions #5327

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
94fcebf
update copy
lmac012 Nov 25, 2024
83f550f
add isLaunchedROW FF
lmac012 Nov 25, 2024
8e8521e
remove unused method
lmac012 Nov 22, 2024
968d4f5
rename plan id constants to indicate region
lmac012 Nov 22, 2024
2f79768
add /features endpoint to SubscriptionsService
lmac012 Nov 22, 2024
0a8dcd3
move control over available features into SubscriptionManager
lmac012 Nov 26, 2024
5c438e9
implement storage for subscription features
lmac012 Nov 26, 2024
07b0921
fetch and store subscription features when products are available
lmac012 Nov 26, 2024
59672f9
use subscription features fetched from BE instead of hardcoded values
lmac012 Nov 26, 2024
158fea1
handle FE callbacks that use updated feature values
lmac012 Nov 26, 2024
f5ea784
enable purchasing RoW subscription
lmac012 Nov 26, 2024
c63bb30
update copy in app settings
lmac012 Nov 26, 2024
6d56dd6
hide PIR feedback category for non-US subscription
lmac012 Nov 26, 2024
94c1942
fix typo
lmac012 Nov 27, 2024
64ca81c
move accessing shared prefs to io dispatcher
lmac012 Nov 28, 2024
607e25a
extract hardcoded strings to string resources file
lmac012 Nov 28, 2024
5b3f819
extract method
lmac012 Dec 1, 2024
903458a
add more RealSubscriptionManager tests
lmac012 Dec 1, 2024
5e0b2b4
move to IO dispatcher for reading FF state
lmac012 Dec 1, 2024
79f887e
test SubscriptionFeaturesFetcher
lmac012 Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move accessing shared prefs to io dispatcher
  • Loading branch information
@lmac012
lmac012 committed Dec 1, 2024
commit 64ca81c51f1e7b3672ba4350d0ae04a3f8b80d29
29 changes: 15 additions & 14 deletions ...iptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/repository/AuthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,29 +109,29 @@ internal class RealAuthRepository constructor(
updateSerpPromoCookie()
}

override suspend fun getAccessTokenV2(): AccessToken? {
val jwt = subscriptionsDataStore.accessTokenV2 ?: return null
val expiresAt = subscriptionsDataStore.accessTokenV2ExpiresAt ?: return null
return AccessToken(jwt, expiresAt)
override suspend fun getAccessTokenV2(): AccessToken? = withContext(dispatcherProvider.io()) {
val jwt = subscriptionsDataStore.accessTokenV2 ?: return@withContext null
val expiresAt = subscriptionsDataStore.accessTokenV2ExpiresAt ?: return@withContext null
AccessToken(jwt, expiresAt)
}

override suspend fun setRefreshTokenV2(refreshToken: RefreshToken?) {
override suspend fun setRefreshTokenV2(refreshToken: RefreshToken?) = withContext(dispatcherProvider.io()) {
subscriptionsDataStore.refreshTokenV2 = refreshToken?.jwt
subscriptionsDataStore.refreshTokenV2ExpiresAt = refreshToken?.expiresAt
}

override suspend fun getRefreshTokenV2(): RefreshToken? {
val jwt = subscriptionsDataStore.refreshTokenV2 ?: return null
val expiresAt = subscriptionsDataStore.refreshTokenV2ExpiresAt ?: return null
return RefreshToken(jwt, expiresAt)
override suspend fun getRefreshTokenV2(): RefreshToken? = withContext(dispatcherProvider.io()) {
val jwt = subscriptionsDataStore.refreshTokenV2 ?: return@withContext null
val expiresAt = subscriptionsDataStore.refreshTokenV2ExpiresAt ?: return@withContext null
RefreshToken(jwt, expiresAt)
}

override suspend fun setEntitlements(entitlements: List<Entitlement>) = withContext(dispatcherProvider.io()) {
subscriptionsDataStore.entitlements = moshi.listToJson(entitlements)
}

override suspend fun getEntitlements(): List<Entitlement> {
return subscriptionsDataStore.entitlements?.let { moshi.parseList(it) } ?: emptyList()
override suspend fun getEntitlements(): List<Entitlement> = withContext(dispatcherProvider.io()) {
subscriptionsDataStore.entitlements?.let { moshi.parseList(it) } ?: emptyList()
}

override suspend fun setAccessToken(accessToken: String?) = withContext(dispatcherProvider.io()) {
Expand Down Expand Up @@ -206,7 +206,7 @@ internal class RealAuthRepository constructor(
override suspend fun setFeatures(
basePlanId: String,
features: Set<String>,
) {
) = withContext(dispatcherProvider.io()) {
val featuresMap = subscriptionsDataStore.subscriptionFeatures
?.let(featuresAdapter::fromJson)
?.toMutableMap() ?: mutableMapOf()
Expand All @@ -216,12 +216,13 @@ internal class RealAuthRepository constructor(
subscriptionsDataStore.subscriptionFeatures = featuresAdapter.toJson(featuresMap)
}

override suspend fun getFeatures(basePlanId: String): Set<String> =
override suspend fun getFeatures(basePlanId: String): Set<String> = withContext(dispatcherProvider.io()) {
subscriptionsDataStore.subscriptionFeatures
?.let(featuresAdapter::fromJson)
?.get(basePlanId) ?: emptySet()
}

private suspend fun updateSerpPromoCookie() {
private suspend fun updateSerpPromoCookie() = withContext(dispatcherProvider.io()) {
val accessToken = subscriptionsDataStore.run { accessTokenV2 ?: accessToken }
serpPromo.injectCookie(accessToken)
}
Expand Down