Fix the convenience init not to omit the subscriptionAppGroup paramet…

…er (#755) * Change the convenience init * Get rid of default param value
duckduckgo · Mar 27, 2024 · dfb3574 · dfb3574
1 parent 8a48f30
commit dfb3574
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Sources/Subscription/AccountManager.swift b/Sources/Subscription/AccountManager.swift
@@ -54,9 +54,10 @@ public class AccountManager: AccountManaging {
         return accessToken != nil
     }
 
-    public convenience init(accessTokenStorage: SubscriptionTokenStorage) {
+    public convenience init(subscriptionAppGroup: String, accessTokenStorage: SubscriptionTokenStorage) {
         self.init(accessTokenStorage: accessTokenStorage,
-                  entitlementsCache: UserDefaultsCache<[Entitlement]>(key: UserDefaultsCacheKey.subscriptionEntitlements,
+                  entitlementsCache: UserDefaultsCache<[Entitlement]>(subscriptionAppGroup: subscriptionAppGroup,
+                                                                      key: UserDefaultsCacheKey.subscriptionEntitlements,
                                                                       settings: UserDefaultsCacheSettings(defaultExpirationInterval: .minutes(20))))
     }
 

diff --git a/Sources/Subscription/Services/SubscriptionService.swift b/Sources/Subscription/Services/SubscriptionService.swift
@@ -35,7 +35,8 @@ public final class SubscriptionService: APIService {
         }
     }
 
-    private static let subscriptionCache = UserDefaultsCache<Subscription>(key: UserDefaultsCacheKey.subscription,
+    private static let subscriptionCache = UserDefaultsCache<Subscription>(subscriptionAppGroup: nil,
+                                                                           key: UserDefaultsCacheKey.subscription,
                                                                            settings: UserDefaultsCacheSettings(defaultExpirationInterval: .minutes(20)))
 
     public enum CachePolicy {

diff --git a/Sources/Subscription/UserDefaultsCache.swift b/Sources/Subscription/UserDefaultsCache.swift
@@ -48,7 +48,7 @@ public class UserDefaultsCache<ObjectType: Codable> {
 
     private let key: UserDefaultsCacheKey
 
-    public init(subscriptionAppGroup: String? = nil, key: UserDefaultsCacheKey,
+    public init(subscriptionAppGroup: String?, key: UserDefaultsCacheKey,
                 settings: UserDefaultsCacheSettings) {
         self.subscriptionAppGroup = subscriptionAppGroup
         self.key = key