Further refactor

RevenueCat.xcodeproj/project.pbxproj

@@ -201,6 +201,8 @@
 		42F1DF385E3C1F9903A07FBF /* ProductsFetcherSK1.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFB3CBAA73855779FE828CE2 /* ProductsFetcherSK1.swift */; };
 		4F69EB092A14406E00ED6D4B /* Matchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F69EB082A14406E00ED6D4B /* Matchers.swift */; };
 		4F69EB0A2A14406E00ED6D4B /* Matchers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F69EB082A14406E00ED6D4B /* Matchers.swift */; };
+		4F8A58172A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8A58162A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift */; };
+		4F8A58182A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F8A58162A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift */; };
 		4FA4C8DA2A168956007D2803 /* OfflineCustomerInfoCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FA4C8D92A168956007D2803 /* OfflineCustomerInfoCreator.swift */; };
 		4FA4C9732A16D3AC007D2803 /* MockBackendConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FA4C9722A16D3AC007D2803 /* MockBackendConfiguration.swift */; };
 		4FA4C9742A16D3AC007D2803 /* MockBackendConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FA4C9722A16D3AC007D2803 /* MockBackendConfiguration.swift */; };
@@ -870,6 +872,7 @@
 		37E35F783903362B65FB7AF3 /* MockProductsRequestFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockProductsRequestFactory.swift; sourceTree = "<group>"; };
 		37E35FDA0A44EA03EA12DAA2 /* DateFormatter+ExtensionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DateFormatter+ExtensionsTests.swift"; sourceTree = "<group>"; };
 		4F69EB082A14406E00ED6D4B /* Matchers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Matchers.swift; sourceTree = "<group>"; };
+		4F8A58162A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockOfflineCustomerInfoCreator.swift; sourceTree = "<group>"; };
 		4FA4C8D92A168956007D2803 /* OfflineCustomerInfoCreator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfflineCustomerInfoCreator.swift; sourceTree = "<group>"; };
 		4FA4C9722A16D3AC007D2803 /* MockBackendConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockBackendConfiguration.swift; sourceTree = "<group>"; };
 		4FA696A329FC43C600D228B1 /* ReceiptParserTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ReceiptParserTests-Info.plist"; sourceTree = "<group>"; };
@@ -1691,6 +1694,7 @@
 				578DAA492948EF4F001700FD /* TestClock.swift */,
 				5791FBD1299184EF00F1FEDA /* MockAsyncSequence.swift */,
 				57CB2A7B29CCC91800C91439 /* MockProductEntitlementMappingFetcher.swift */,
+				4F8A58162A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift */,
 			);
 			path = Mocks;
 			sourceTree = "<group>";
@@ -2906,6 +2910,7 @@
 				57488B2B29CA803F0000EE7E /* MockSandboxEnvironmentDetector.swift in Sources */,
 				F55FFA5D27634E1900995146 /* MockTransactionsManager.swift in Sources */,
 				4FA4C9742A16D3AC007D2803 /* MockBackendConfiguration.swift in Sources */,
+				4F8A58182A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift in Sources */,
 				57554CC2282AE1E3009A7E58 /* TestCase.swift in Sources */,
 				2D90F8B826FD20AA009B9142 /* MockReceiptFetcher.swift in Sources */,
 				2D90F8B626FD2099009B9142 /* MockSubscriberAttributesManager.swift in Sources */,
@@ -3167,6 +3172,7 @@
 				4FA4C9732A16D3AC007D2803 /* MockBackendConfiguration.swift in Sources */,
 				5766C620282DA3D50067D886 /* GetIntroEligibilityDecodingTests.swift in Sources */,
 				57C381E2279627B7009E3940 /* MockStoreProductDiscount.swift in Sources */,
+				4F8A58172A16EE3500EF97AD /* MockOfflineCustomerInfoCreator.swift in Sources */,
 				2DDF41E824F6F61B005BC22D /* MockSKProductDiscount.swift in Sources */,
 				579189B728F4747700BF4963 /* EitherTests.swift in Sources */,
 				5753EE00294B8C0C00CBAB54 /* AttributionFetcherTests.swift in Sources */,

Sources/Logging/Strings/OfflineEntitlementsStrings.swift

@@ -16,9 +16,10 @@ import StoreKit
 
 // swiftlint:disable identifier_name
 
-@available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
 enum OfflineEntitlementsStrings {
 
+    case offline_entitlements_not_available
+
     case product_entitlement_mapping_stale_updating
     case product_entitlement_mapping_updated_from_network
     case product_entitlement_mapping_fetching_error(BackendError)
@@ -31,11 +32,13 @@ enum OfflineEntitlementsStrings {
 
 }
 
-@available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
 extension OfflineEntitlementsStrings: CustomStringConvertible {
 
     var description: String {
         switch self {
+        case .offline_entitlements_not_available:
+            return "OS version does not support offline entitlements."
+
         case .product_entitlement_mapping_stale_updating:
             return "ProductEntitlementMapping cache is stale, updating from network."
 

Sources/Logging/Strings/Strings.swift

@@ -23,7 +23,6 @@ enum Strings {
     static let identity = IdentityStrings.self
     static let network = NetworkStrings.self
     static let offering = OfferingStrings.self
-    @available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
     static let offlineEntitlements = OfflineEntitlementsStrings.self
     static let purchase = PurchaseStrings.self
     static let receipt = ReceiptStrings.self

Sources/Networking/Backend.swift

@@ -30,8 +30,7 @@ class Backend {
         eTagManager: ETagManager,
         operationDispatcher: OperationDispatcher,
         attributionFetcher: AttributionFetcher,
-        productEntitlementMappingFetcher: ProductEntitlementMappingFetcher,
-        purchasedProductsFetcher: PurchasedProductsFetcherType = Backend.createDefaultProductFetcher(),
+        offlineCustomerInfoCreator: OfflineCustomerInfoCreator?,
         dateProvider: DateProvider = DateProvider()
     ) {
         let httpClient = HTTPClient(apiKey: apiKey,
@@ -42,8 +41,7 @@ class Backend {
                                           operationDispatcher: operationDispatcher,
                                           operationQueue: QueueProvider.createBackendQueue(),
                                           systemInfo: systemInfo,
-                                          productEntitlementMappingFetcher: productEntitlementMappingFetcher,
-                                          purchasedProductsFetcher: purchasedProductsFetcher,
+                                          offlineCustomerInfoCreator: offlineCustomerInfoCreator,
                                           dateProvider: dateProvider)
         self.init(backendConfig: config, attributionFetcher: attributionFetcher)
     }
@@ -191,8 +189,4 @@ extension Backend {
 
     }
 
-    static func createDefaultProductFetcher() -> PurchasedProductsFetcherType {
-        return PurchasedProductsFetcher()
-    }
-
 }

Sources/Networking/BackendConfiguration.swift

@@ -21,22 +21,18 @@ class BackendConfiguration {
     let operationQueue: OperationQueue
     let dateProvider: DateProvider
     let systemInfo: SystemInfo
-
-    private let productEntitlementMappingFetcher: ProductEntitlementMappingFetcher
-    private let purchasedProductsFetcher: PurchasedProductsFetcherType
+    let offlineCustomerInfoCreator: OfflineCustomerInfoCreator?
 
     init(httpClient: HTTPClient,
          operationDispatcher: OperationDispatcher,
          operationQueue: OperationQueue,
          systemInfo: SystemInfo,
-         productEntitlementMappingFetcher: ProductEntitlementMappingFetcher,
-         purchasedProductsFetcher: PurchasedProductsFetcherType,
+         offlineCustomerInfoCreator: OfflineCustomerInfoCreator?,
          dateProvider: DateProvider = DateProvider()) {
         self.httpClient = httpClient
         self.operationDispatcher = operationDispatcher
         self.operationQueue = operationQueue
-        self.productEntitlementMappingFetcher = productEntitlementMappingFetcher
-        self.purchasedProductsFetcher = purchasedProductsFetcher
+        self.offlineCustomerInfoCreator = offlineCustomerInfoCreator
         self.dateProvider = dateProvider
         self.systemInfo = systemInfo
     }
@@ -45,11 +41,6 @@ class BackendConfiguration {
         self.httpClient.clearCaches()
     }
 
-    func createOfflineCustomerInfoCreator() -> OfflineCustomerInfoCreator {
-        return .init(purchasedProductsFetcher: self.purchasedProductsFetcher,
-                     productEntitlementMapping: self.productEntitlementMappingFetcher.productEntitlementMapping)
-    }
-
 }
 
 extension BackendConfiguration: NetworkConfiguration {}

Sources/Networking/CustomerAPI.swift

@@ -39,7 +39,7 @@ final class CustomerAPI {
             configuration: config,
             customerInfoCallbackCache: self.customerInfoCallbackCache,
             offlineCreator: allowComputingOffline
-                ? self.backendConfig.createOfflineCustomerInfoCreator()
+                ? self.backendConfig.offlineCustomerInfoCreator
                 : nil
         )
 
@@ -123,7 +123,7 @@ final class CustomerAPI {
             configuration: config,
             postData: postData,
             customerInfoCallbackCache: self.customerInfoCallbackCache,
-            offlineCustomerInfoCreator: self.backendConfig.createOfflineCustomerInfoCreator()
+            offlineCustomerInfoCreator: self.backendConfig.offlineCustomerInfoCreator
         )
 
         let callbackObject = CustomerInfoCallback(cacheKey: factory.cacheKey,

Sources/Networking/Operations/Handling/CustomerInfoResponseHandler.swift

@@ -18,7 +18,7 @@ class CustomerInfoResponseHandler {
     private let offlineCreator: OfflineCustomerInfoCreator?
     private let userID: String
 
-    /// - Parameter offlineCreator: can be `nil` if offline ``CustomerInfo`` shouldn't be computed.
+    /// - Parameter offlineCreator: can be `nil` if offline ``CustomerInfo`` shouldn't or can't be computed.
     init(offlineCreator: OfflineCustomerInfoCreator?, userID: String) {
         self.offlineCreator = offlineCreator
         self.userID = userID

Sources/Networking/Operations/PostReceiptDataOperation.swift

@@ -37,7 +37,7 @@ final class PostReceiptDataOperation: CacheableNetworkOperation {
         configuration: UserSpecificConfiguration,
         postData: PostData,
         customerInfoCallbackCache: CallbackCache<CustomerInfoCallback>,
-        offlineCustomerInfoCreator: OfflineCustomerInfoCreator
+        offlineCustomerInfoCreator: OfflineCustomerInfoCreator?
     ) -> CacheableNetworkOperationFactory<PostReceiptDataOperation> {
         return Self.createFactory(
             configuration: configuration,

Sources/OfflineEntitlements/OfflineCustomerInfoCreator.swift

@@ -14,21 +14,35 @@
 import Foundation
 
 /// Holds the necessary dependencies to create a `CustomerInfo` while offline.
-final class OfflineCustomerInfoCreator {
+class OfflineCustomerInfoCreator {
 
     typealias Creator = @Sendable ([PurchasedSK2Product],
                                    ProductEntitlementMapping,
                                    String) -> CustomerInfo
 
     private let purchasedProductsFetcher: PurchasedProductsFetcherType
-    private let productEntitlementMapping: ProductEntitlementMapping?
+    private let productEntitlementMappingFetcher: ProductEntitlementMappingFetcher
     private let creator: Creator
 
+    static func createDefault(
+        productEntitlementMappingFetcher: ProductEntitlementMappingFetcher
+    ) -> OfflineCustomerInfoCreator? {
+        if #available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *) {
+            return .init(
+                purchasedProductsFetcher: PurchasedProductsFetcher(),
+                productEntitlementMappingFetcher: productEntitlementMappingFetcher
+            )
+        } else {
+            Logger.debug(Strings.offlineEntitlements.offline_entitlements_not_available)
+            return nil
+        }
+    }
+
     convenience init(purchasedProductsFetcher: PurchasedProductsFetcherType,
-                     productEntitlementMapping: ProductEntitlementMapping?) {
+                     productEntitlementMappingFetcher: ProductEntitlementMappingFetcher) {
         self.init(
             purchasedProductsFetcher: purchasedProductsFetcher,
-            productEntitlementMapping: productEntitlementMapping,
+            productEntitlementMappingFetcher: productEntitlementMappingFetcher,
             creator: { products, mapping, userID in
                 CustomerInfo(from: products, mapping: mapping, userID: userID)
             }
@@ -37,19 +51,20 @@ final class OfflineCustomerInfoCreator {
 
     init(
         purchasedProductsFetcher: PurchasedProductsFetcherType,
-        productEntitlementMapping: ProductEntitlementMapping?,
+        productEntitlementMappingFetcher: ProductEntitlementMappingFetcher,
         creator: @escaping Creator
     ) {
         self.purchasedProductsFetcher = purchasedProductsFetcher
-        self.productEntitlementMapping = productEntitlementMapping
+        self.productEntitlementMappingFetcher = productEntitlementMappingFetcher
         self.creator = creator
     }
 
     @available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
     func create(for userID: String) async throws -> CustomerInfo {
         Logger.info(Strings.offlineEntitlements.computing_offline_customer_info)
 
-        guard let mapping = self.productEntitlementMapping, !mapping.entitlementsByProduct.isEmpty else {
+        guard let mapping = self.productEntitlementMappingFetcher.productEntitlementMapping,
+              !mapping.entitlementsByProduct.isEmpty else {
             Logger.warn(Strings.offlineEntitlements.computing_offline_customer_info_with_no_entitlement_mapping)
             throw Error.noEntitlementMappingAvailable
         }

Sources/OfflineEntitlements/PurchasedProductsFetcher.swift

@@ -22,6 +22,7 @@ protocol PurchasedProductsFetcherType {
 }
 
 /// A type that can fetch purchased products from StoreKit 2.
+@available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
 class PurchasedProductsFetcher: PurchasedProductsFetcherType {
 
     private let sandboxDetector: SandboxEnvironmentDetector
@@ -30,7 +31,6 @@ class PurchasedProductsFetcher: PurchasedProductsFetcherType {
         self.sandboxDetector = sandboxDetector
     }
 
-    @available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
     func fetchPurchasedProducts() async throws -> [PurchasedSK2Product] {
         var result: [PurchasedSK2Product] = []
 
@@ -52,7 +52,6 @@ class PurchasedProductsFetcher: PurchasedProductsFetcherType {
         return result
     }
 
-    @available(iOS 15.0, tvOS 15.0, watchOS 8.0, macOS 12.0, *)
     private static func forceSyncToEnsureAllTransactionsAreAccountedFor() async throws {
         try await AppStore.sync()
     }

Sources/Purchasing/Purchases/Purchases.swift

@@ -285,7 +285,7 @@ public typealias StartPurchaseBlock = (@escaping PurchaseCompletedBlock) -> Void
                               eTagManager: eTagManager,
                               operationDispatcher: operationDispatcher,
                               attributionFetcher: attributionFetcher,
-                              productEntitlementMappingFetcher: deviceCache)
+                              offlineCustomerInfoCreator: .createDefault(productEntitlementMappingFetcher: deviceCache))
 
         let paymentQueueWrapper: EitherPaymentQueueWrapper = systemInfo.storeKit2Setting.shouldOnlyUseStoreKit2
             ? .right(.init())

Tests/UnitTests/Mocks/MockBackendConfiguration.swift

@@ -28,8 +28,7 @@ class MockBackendConfiguration: BackendConfiguration {
             operationDispatcher: MockOperationDispatcher(),
             operationQueue: Backend.QueueProvider.createBackendQueue(),
             systemInfo: systemInfo,
-            productEntitlementMappingFetcher: MockProductEntitlementMappingFetcher(),
-            purchasedProductsFetcher: MockPurchasedProductsFetcher(),
+            offlineCustomerInfoCreator: MockOfflineCustomerInfoCreator(),
             dateProvider: MockDateProvider(stubbedNow: MockBackend.referenceDate)
         )
     }

Tests/UnitTests/Mocks/MockOfflineCustomerInfoCreator.swift

@@ -0,0 +1,26 @@
+//
+//  Copyright RevenueCat Inc. All Rights Reserved.
+//
+//  Licensed under the MIT License (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      https://opensource.org/licenses/MIT
+//
+//  MockOfflineCustomerInfoCreator.swift
+//
+//  Created by Nacho Soto on 5/18/23.
+
+@testable import RevenueCat
+
+class MockOfflineCustomerInfoCreator: OfflineCustomerInfoCreator {
+
+    init() {
+        super.init(
+            purchasedProductsFetcher: MockPurchasedProductsFetcher(),
+            productEntitlementMappingFetcher: MockProductEntitlementMappingFetcher(),
+            creator: { CustomerInfo(from: $0, mapping: $1, userID: $2) }
+        )
+    }
+
+}

Tests/UnitTests/Networking/Backend/BaseBackendTest.swift

@@ -55,8 +55,7 @@ class BaseBackendTests: TestCase {
             operationDispatcher: self.operationDispatcher,
             operationQueue: MockBackend.QueueProvider.createBackendQueue(),
             systemInfo: self.systemInfo,
-            productEntitlementMappingFetcher: self.mockProductEntitlementMappingFetcher,
-            purchasedProductsFetcher: self.mockPurchasedProductsFetcher,
+            offlineCustomerInfoCreator: MockOfflineCustomerInfoCreator(),
             dateProvider: MockDateProvider(stubbedNow: MockBackend.referenceDate)
         )
 

Tests/UnitTests/OfflineEntitlements/CustomerInfoResponseHandlerTests.swift

@@ -256,11 +256,15 @@ class OfflineCustomerInfoResponseHandlerTests: BaseCustomerInfoResponseHandlerTe
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
 private extension BaseCustomerInfoResponseHandlerTests {
 
+    private struct MappingFetcher: ProductEntitlementMappingFetcher {
+        let productEntitlementMapping: ProductEntitlementMapping?
+    }
+
     private func create(_ mapping: ProductEntitlementMapping?) -> CustomerInfoResponseHandler {
         return .init(
             offlineCreator: .init(
                 purchasedProductsFetcher: self.fetcher,
-                productEntitlementMapping: mapping,
+                productEntitlementMappingFetcher: MappingFetcher(productEntitlementMapping: mapping),
                 creator: self.factory.create
             ),
             userID: self.userID

Tests/UnitTests/Purchasing/Purchases/BasePurchasesTests.swift

@@ -58,8 +58,7 @@ class BasePurchasesTests: TestCase {
                                           operationDispatcher: self.mockOperationDispatcher,
                                           operationQueue: MockBackend.QueueProvider.createBackendQueue(),
                                           systemInfo: self.systemInfo,
-                                          productEntitlementMappingFetcher: self.mockProductEntitlementMappingFetcher,
-                                          purchasedProductsFetcher: self.mockPurchasedProductsFetcher,
+                                          offlineCustomerInfoCreator: MockOfflineCustomerInfoCreator(),
                                           dateProvider: MockDateProvider(stubbedNow: MockBackend.referenceDate))
         self.backend = MockBackend(backendConfig: config, attributionFetcher: self.attributionFetcher)
         self.subscriberAttributesManager = MockSubscriberAttributesManager(

Tests/UnitTests/SubscriberAttributes/BackendSubscriberAttributesTests.swift

@@ -59,8 +59,7 @@ class BackendSubscriberAttributesTests: TestCase {
                                           operationDispatcher: MockOperationDispatcher(),
                                           operationQueue: MockBackend.QueueProvider.createBackendQueue(),
                                           systemInfo: self.systemInfo,
-                                          productEntitlementMappingFetcher: MockProductEntitlementMappingFetcher(),
-                                          purchasedProductsFetcher: MockPurchasedProductsFetcher(),
+                                          offlineCustomerInfoCreator: MockOfflineCustomerInfoCreator(),
                                           dateProvider: self.dateProvider)
 
         self.backend = Backend(backendConfig: config, attributionFetcher: attributionFetcher)