Removed CustomerInfo, offDeviceSubscriptionsDidChange

Author: yusuftor

Examples/Advanced/Advanced/Purchase Controllers/RCPurchaseController.swift

@@ -93,21 +93,4 @@ final class RCPurchaseController: PurchaseController {
       return .failed(error)
     }
   }
-
-  /// An optional function to use if you're using web paywalls. This merges the entitlements from RevenueCat with
-  /// the web entitlements and sets the ``Superwall/subscriptionStatus`` with the merged set.
-  func offDeviceSubscriptionsDidChange(entitlements: Set<Entitlement>) async {
-    var allEntitlements: Set<Entitlement> = entitlements
-
-    if let customerInfo = try? await Purchases.shared.customerInfo() {
-      let revenueCatEntitlements = Set(customerInfo.entitlements.activeInCurrentEnvironment.keys.map {
-        Entitlement(id: $0)
-      })
-      allEntitlements.formUnion(revenueCatEntitlements)
-    }
-
-    await MainActor.run {
-      Superwall.shared.subscriptionStatus = .active(allEntitlements)
-    }
-  }
 }

Examples/Advanced/Advanced/Purchase Controllers/SWPurchaseController.swift

@@ -58,11 +58,4 @@ final class SWPurchaseController: PurchaseController {
     await syncSubscriptionStatus()
     return result
   }
-
-  /// An optional function to use if you're using web paywalls. This sets the `subscriptionStatus`
-  /// with the entitlements returned from `customerInfo`.
-  /// This consists of the existing active entitlements joined with the updated set of web entitlements.
-  func offDeviceSubscriptionsDidChange(entitlements: Set<Entitlement>) async {
-    await syncSubscriptionStatus()
-  }
 }

Sources/SuperwallKit/Delegate/SuperwallDelegate.swift

@@ -109,7 +109,7 @@ public protocol SuperwallDelegate: AnyObject {
   )
 
   @MainActor
-  func didRedeemCode(customerInfo: CustomerInfo, result: RedemptionResult)
+  func didRedeemCode(result: RedemptionResult)
 }
 
 extension SuperwallDelegate {
@@ -145,5 +145,5 @@ extension SuperwallDelegate {
     error: Swift.Error?
   ) {}
 
-  public func didRedeemCode(customerInfo: CustomerInfo, result: RedemptionResult) {}
+  public func didRedeemCode(result: RedemptionResult) {}
 }

Sources/SuperwallKit/Delegate/SuperwallDelegateAdapter.swift

@@ -134,12 +134,9 @@ final class SuperwallDelegateAdapter {
   }
 
   @MainActor
-  func didRedeemCode(customerInfo: CustomerInfo, result: RedemptionResult) {
+  func didRedeemCode(result: RedemptionResult) {
     if let swiftDelegate = swiftDelegate {
-      swiftDelegate.didRedeemCode(
-        customerInfo: customerInfo,
-        result: result
-      )
+      swiftDelegate.didRedeemCode(result: result)
     }
     // TODO: Objective C version
   }

Sources/SuperwallKit/Dependencies/DependencyContainer.swift

@@ -471,7 +471,7 @@ extension DependencyContainer: TriggerFactory {
 }
 
 // MARK: - Purchase Controller Factory
-extension DependencyContainer: ExternalPurchaseControllerFactory {
+extension DependencyContainer: HasExternalPurchaseControllerFactory {
   func makeHasExternalPurchaseController() -> Bool {
     return purchaseController.isInternal == false
   }

Sources/SuperwallKit/Dependencies/FactoryProtocols.swift

@@ -98,9 +98,8 @@ protocol DeviceHelperFactory: AnyObject {
   func makeSessionDeviceAttributes() async -> [String: Any]
 }
 
-protocol ExternalPurchaseControllerFactory: AnyObject {
+protocol HasExternalPurchaseControllerFactory: AnyObject {
   func makeHasExternalPurchaseController() -> Bool
-  func makeExternalPurchaseController() -> PurchaseController
 }
 
 struct DummyDecodable: Decodable {}

Sources/SuperwallKit/Models/Web2App/CustomerInfo.swift

@@ -21,7 +21,6 @@ class Cache {
   private let memCache = NSCache<AnyObject, AnyObject>()
   private let ioQueue: DispatchQueue
   private let fileManager: FileManager
-  private unowned let factory: ExternalPurchaseControllerFactory
 
   /// Life time of disk cache, in second. Default is a week
   private var maxCachePeriodInSecond = Cache.defaultMaxCachePeriodInSecond
@@ -32,10 +31,8 @@ class Cache {
   /// Specify distinct name param, it represents folder name for disk cache
   init(
     fileManager: FileManager = FileManager(),
-    ioQueue: DispatchQueue = DispatchQueue(label: Cache.ioQueuePrefix),
-    factory: ExternalPurchaseControllerFactory
+    ioQueue: DispatchQueue = DispatchQueue(label: Cache.ioQueuePrefix)
   ) {
-    self.factory = factory
     self.fileManager = fileManager
     cacheUrl = fileManager
       .urls(for: .cachesDirectory, in: .userDomainMask)
@@ -377,14 +374,12 @@ extension Cache {
     if let redeemResponse = read(LatestRedeemResponse.self) {
       let existingWebEntitlements = redeemResponse.entitlements
       var deviceResults: [RedemptionResult] = []
-      var webEntitlementsToKeep: Set<Entitlement> = []
 
       for result in redeemResponse.results {
         switch result {
         case .success(_, let redemptionInfo):
           if case .device = redemptionInfo.ownership {
             deviceResults.append(result)
-            webEntitlementsToKeep.formUnion(redemptionInfo.entitlements)
           }
         case .expiredSubscription(_, let redemptionInfo):
           if case .device = redemptionInfo.ownership {
@@ -397,16 +392,14 @@ extension Cache {
 
       let newRedeemResponse = RedeemResponse(
         results: deviceResults,
-        entitlements: webEntitlementsToKeep
+        entitlements: []
       )
 
       write(newRedeemResponse, forType: LatestRedeemResponse.self)
 
-      if existingWebEntitlements != webEntitlementsToKeep {
-        Task {
-          let purchaseController = factory.makeExternalPurchaseController()
-          await purchaseController.offDeviceSubscriptionsDidChange(entitlements: webEntitlementsToKeep)
-        }
+      if !existingWebEntitlements.isEmpty {
+        let deviceEntitlements = Superwall.shared.entitlements.activeDeviceEntitlements
+        Superwall.shared.internallySetSubscriptionStatus(to: .active(deviceEntitlements))
       }
     }
   }

Sources/SuperwallKit/Storage/Cache/Cache.swift

@@ -73,16 +73,16 @@ class Storage {
   /// The disk cache.
   private let cache: Cache
 
-  private unowned let factory: DeviceHelperFactory & ExternalPurchaseControllerFactory
+  private unowned let factory: DeviceHelperFactory & HasExternalPurchaseControllerFactory
 
   // MARK: - Configuration
 
   init(
-    factory: DeviceHelperFactory & ExternalPurchaseControllerFactory,
-    cache: Cache? = nil,
+    factory: DeviceHelperFactory & HasExternalPurchaseControllerFactory,
+    cache: Cache = Cache(),
     coreDataManager: CoreDataManager = CoreDataManager()
   ) {
-    self.cache = cache ?? Cache(factory: factory)
+    self.cache = cache
     self.coreDataManager = coreDataManager
     self._didTrackFirstSeen = self.cache.read(DidTrackFirstSeen.self) == true
 

Sources/SuperwallKit/Storage/Storage.swift

@@ -60,14 +60,6 @@ extension AutomaticPurchaseController: PurchaseController {
 
     return result
   }
-
-  @MainActor
-  func offDeviceSubscriptionsDidChange(entitlements: Set<Entitlement>) async {
-    let deviceEntitlements = entitlementsInfo.activeDeviceEntitlements
-    let allEntitlements = deviceEntitlements.union(entitlements)
-
-    Superwall.shared.internallySetSubscriptionStatus(to: .active(allEntitlements))
-  }
 }
 
 // MARK: - InternalPurchaseController

Sources/SuperwallKit/StoreKit/Purchase Controller/AutomaticPurchaseController.swift

@@ -40,17 +40,4 @@ public protocol PurchaseController: AnyObject {
   /// **Note**: `restored` does not imply the user has an active subscription, it just mean the restore had no errors.
   @MainActor
   func restorePurchases() async -> RestorationResult
-
-  /// Called when web entitlements changed.
-  ///
-  /// If you are using web paywalls, make sure to add this method.
-  /// You must merge the entitlements returned here with your local entitlements and set the ``Superwall/subscriptionStatus``
-  /// with the merged set.
-  /// - Parameter entitlements: A `Set` of web ``Entitlement``s.
-  @MainActor
-  func offDeviceSubscriptionsDidChange(entitlements: Set<Entitlement>) async
-}
-
-extension PurchaseController {
-  public func offDeviceSubscriptionsDidChange(entitlements: Set<Entitlement>) async {}
 }

Sources/SuperwallKit/StoreKit/Purchase Controller/PurchaseController.swift

@@ -16,7 +16,7 @@ final class PurchaseManager: Purchasing {
   let coordinator: PurchasingCoordinator
   let purchaser: Purchasing
   private unowned let factory: Factory
-  typealias Factory = ExternalPurchaseControllerFactory
+  typealias Factory = HasExternalPurchaseControllerFactory
     & StoreTransactionFactory
     & OptionsFactory
     & TransactionManagerFactory

Sources/SuperwallKit/StoreKit/Transactions/Purchasing/PurchaseManager.swift

@@ -32,7 +32,7 @@ final class ProductPurchaserSK1: NSObject, Purchasing {
   private let identityManager: IdentityManager
   private let storage: Storage
   private let factory:
-    ExternalPurchaseControllerFactory
+    HasExternalPurchaseControllerFactory
       & StoreTransactionFactory
       & OptionsFactory
       & TransactionManagerFactory
@@ -48,7 +48,7 @@ final class ProductPurchaserSK1: NSObject, Purchasing {
     identityManager: IdentityManager,
     coordinator: PurchasingCoordinator,
     storage: Storage,
-    factory: ExternalPurchaseControllerFactory
+    factory: HasExternalPurchaseControllerFactory
       & StoreTransactionFactory
       & OptionsFactory
       & TransactionManagerFactory

Sources/SuperwallKit/StoreKit/Transactions/Purchasing/StoreKit 1/ProductPurchaserSK1.swift

@@ -14,7 +14,7 @@ final class ProductPurchaserSK2: Purchasing {
   private unowned let receiptManager: ReceiptManager
   private let coordinator: PurchasingCoordinator
   private unowned let factory: Factory
-  typealias Factory = ExternalPurchaseControllerFactory
+  typealias Factory = HasExternalPurchaseControllerFactory
     & OptionsFactory
     & TransactionManagerFactory
     & PurchasedTransactionsFactory

Sources/SuperwallKit/StoreKit/Transactions/Purchasing/StoreKit 2/ProductPurchaserSK2.swift

@@ -12,7 +12,7 @@ import StoreKit
 actor SK2TransactionListener {
   private(set) var taskHandle: Task<Void, Never>?
   private let shouldFinishTransactions: Bool
-  private let factory: ExternalPurchaseControllerFactory
+  private let factory: HasExternalPurchaseControllerFactory
   private unowned let receiptManager: ReceiptManager
 
   deinit {
@@ -23,7 +23,7 @@ actor SK2TransactionListener {
   init(
     shouldFinishTransactions: Bool,
     receiptManager: ReceiptManager,
-    factory: ExternalPurchaseControllerFactory
+    factory: HasExternalPurchaseControllerFactory
   ) {
     self.shouldFinishTransactions = shouldFinishTransactions
     self.receiptManager = receiptManager

Sources/SuperwallKit/StoreKit/Transactions/Purchasing/StoreKit 2/SK2TransactionListener.swift

@@ -23,7 +23,7 @@ final class TransactionManager {
     & PurchasedTransactionsFactory
     & StoreTransactionFactory
     & DeviceHelperFactory
-    & ExternalPurchaseControllerFactory
+    & HasExternalPurchaseControllerFactory
     & RestoreAccessFactory
   enum State {
     case observing

Sources/SuperwallKit/StoreKit/Transactions/TransactionManager.swift

@@ -150,8 +150,11 @@ public final class Superwall: NSObject, ObservableObject {
   }
 
   /// Gets web entitlements and merges them with device entitlements before
-  /// setting the status.
+  /// setting the status if no external purchase controller.
   func internallySetSubscriptionStatus(to status: SubscriptionStatus) {
+    if dependencyContainer.makeHasExternalPurchaseController() {
+      return
+    }
     let webEntitlements = dependencyContainer.entitlementsInfo.web
 
     switch status {

Sources/SuperwallKit/Superwall.swift

@@ -123,24 +123,16 @@ actor WebEntitlementRedeemer {
 
       storage.save(response, forType: LatestRedeemResponse.self)
 
-      // Either sets the subscription status internally using
-      // automatic purchase controller or calls the external
-      // purchase controller.
-      await purchaseController.offDeviceSubscriptionsDidChange(entitlements: response.entitlements)
+      // Sets the subscription status internally if no external PurchaseController
+      let deviceEntitlements = entitlementsInfo.activeDeviceEntitlements
+      let allEntitlements = deviceEntitlements.union(response.entitlements)
+
+      Superwall.shared.internallySetSubscriptionStatus(to: .active(allEntitlements))
 
       // Call the delegate if user try to redeem a code
       if case let .code(code) = type {
         if let codeResult = response.results.first(where: { $0.code == code }) {
-          let allEntitlements = Superwall.shared.entitlements.activeDeviceEntitlements.union(response.entitlements)
-          let customerInfo = CustomerInfo(
-            entitlements: allEntitlements,
-            redemptions: response.results
-          )
-
-          await delegate.didRedeemCode(
-            customerInfo: customerInfo,
-            result: codeResult
-          )
+          await delegate.didRedeemCode(result: codeResult)
         }
       }
     } catch {
@@ -160,15 +152,7 @@ actor WebEntitlementRedeemer {
         )
         redemptions.append(errorResult)
 
-        let customerInfo = CustomerInfo(
-          entitlements: entitlements,
-          redemptions: redemptions
-        )
-
-        await delegate.didRedeemCode(
-          customerInfo: customerInfo,
-          result: errorResult
-        )
+        await delegate.didRedeemCode(result: errorResult)
       }
 
       Logger.debug(
@@ -216,7 +200,11 @@ actor WebEntitlementRedeemer {
       storage.save(Date(), forType: LastWebEntitlementsFetchDate.self)
 
       if existingWebEntitlements != entitlements {
-        await purchaseController.offDeviceSubscriptionsDidChange(entitlements: entitlements)
+        // Sets the subscription status internally if no external PurchaseController
+        let deviceEntitlements = entitlementsInfo.activeDeviceEntitlements
+        let allEntitlements = deviceEntitlements.union(entitlements)
+
+        Superwall.shared.internallySetSubscriptionStatus(to: .active(allEntitlements))
       }
     } catch {
       Logger.debug(

Sources/SuperwallKit/Web/WebEntitlementRedeemer.swift

@@ -8,7 +8,7 @@
 import Foundation
 @testable import SuperwallKit
 
-final class MockExternalPurchaseControllerFactory: ExternalPurchaseControllerFactory {
+final class MockExternalPurchaseControllerFactory: HasExternalPurchaseControllerFactory {
   let purchaseController: PurchaseController
 
   init(purchaseController: PurchaseController) {

Tests/SuperwallKitTests/Storage/Cache/MockExternalPurchaseControllerFactory.swift

@@ -9,7 +9,6 @@ import Foundation
 @testable import SuperwallKit
 
 final class MockPurchaseController: PurchaseController {
-  var didCallOffDeviceSubscriptionsDidChange = false
 
   func purchase(product: SuperwallKit.StoreProduct) async -> SuperwallKit.PurchaseResult {
     return .purchased
@@ -18,8 +17,4 @@ final class MockPurchaseController: PurchaseController {
   func restorePurchases() async -> SuperwallKit.RestorationResult {
     return .restored
   }
-
-  func offDeviceSubscriptionsDidChange(entitlements: Set<Entitlement>) async {
-    didCallOffDeviceSubscriptionsDidChange = true
-  }
 }