@capgo/native-purchases 8.0.4 → 8.0.6

package/android/build.gradle

@@ -50,7 +50,7 @@ repositories {
 
 dependencies {
     implementation "com.google.guava:guava:33.5.0-android"
-    def billing_version = "8.2.0"
+    def billing_version = "8.2.1"
     implementation "com.android.billingclient:billing:$billing_version"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')

package/android/src/main/java/ee/forgr/nativepurchases/NativePurchasesPlugin.java

@@ -42,7 +42,7 @@ import org.json.JSONArray;
 @CapacitorPlugin(name = "NativePurchases")
 public class NativePurchasesPlugin extends Plugin {
 
-    private final String pluginVersion = "8.0.4";
+    private final String pluginVersion = "8.0.6";
     public static final String TAG = "NativePurchases";
     private static final Phaser semaphoreReady = new Phaser(1);
     private BillingClient billingClient;

package/ios/Sources/NativePurchasesPlugin/NativePurchasesPlugin.swift

@@ -2,10 +2,6 @@ import Foundation
 import Capacitor
 import StoreKit
 
-/**
- * Please read the Capacitor iOS Plugin Development Guide
- * here: https://capacitorjs.com/docs/plugins/ios
- */
 @objc(NativePurchasesPlugin)
 public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
     public let identifier = "NativePurchasesPlugin"
@@ -24,7 +20,7 @@ public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isEntitledToOldBusinessModel", returnType: CAPPluginReturnPromise)
     ]
 
-    private let pluginVersion: String = "8.0.4"
+    private let pluginVersion: String = "8.0.6"
     private var transactionUpdatesTask: Task<Void, Never>?
 
     @objc func getPluginVersion(_ call: CAPPluginCall) {
@@ -33,38 +29,28 @@ public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
 
     override public func load() {
         super.load()
-        // Start listening to StoreKit transaction updates as early as possible
-        if #available(iOS 15.0, *) {
-            startTransactionUpdatesListener()
-        }
+        startTransactionUpdatesListener()
     }
 
     deinit {
-        if #available(iOS 15.0, *) { cancelTransactionUpdatesListener() }
-    }
-
-    private func cancelTransactionUpdatesListener() {
-        self.transactionUpdatesTask?.cancel()
-        self.transactionUpdatesTask = nil
+        transactionUpdatesTask?.cancel()
+        transactionUpdatesTask = nil
     }
 
-    @available(iOS 15.0, *)
     private func startTransactionUpdatesListener() {
-        // Ensure only one listener is running
-        cancelTransactionUpdatesListener()
-        let task = Task.detached { [weak self] in
+        transactionUpdatesTask?.cancel()
+        transactionUpdatesTask = Task.detached { [weak self] in
             for await result in Transaction.updates {
                 guard !Task.isCancelled else { break }
                 switch result {
                 case .verified(let transaction):
-                    // Build payload similar to purchase response
-                    let payload = await TransactionHelpers.buildTransactionResponse(from: transaction, jwsRepresentation: result.jwsRepresentation, alwaysIncludeWillCancel: true)
-
-                    // Finish the transaction to avoid blocking future purchases
+                    let payload = await TransactionHelpers.buildTransactionResponse(
+                        from: transaction,
+                        jwsRepresentation: result.jwsRepresentation,
+                        alwaysIncludeWillCancel: true
+                    )
                     await transaction.finish()
-
-                    // Notify JS listeners on main thread, after slight delay
-                    try? await Task.sleep(nanoseconds: 500_000_000) // 0.5s delay
+                    try? await Task.sleep(nanoseconds: 500_000_000)
                     await MainActor.run {
                         self?.notifyListeners("transactionUpdated", data: payload)
                     }
@@ -78,93 +64,70 @@ public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
             }
         }
-        transactionUpdatesTask = task
     }
 
-    // MARK: - Plugin Methods
-
     @objc func isBillingSupported(_ call: CAPPluginCall) {
-        if #available(iOS 15, *) {
-            call.resolve([
-                "isBillingSupported": true
-            ])
-        } else {
-            call.resolve([
-                "isBillingSupported": false
-            ])
-        }
+        call.resolve(["isBillingSupported": true])
     }
 
     @objc func purchaseProduct(_ call: CAPPluginCall) {
-        if #available(iOS 15, *) {
-            print("purchaseProduct")
-            let productIdentifier = call.getString("productIdentifier", "")
-            let quantity = call.getInt("quantity", 1)
-            let appAccountToken = call.getString("appAccountToken")
-            let autoAcknowledge = call.getBool("autoAcknowledgePurchases") ?? true
-
-            if productIdentifier.isEmpty {
-                call.reject("productIdentifier is Empty, give an id")
-                return
-            }
-
-            print("Auto-acknowledge enabled: \(autoAcknowledge)")
-
-            Task { @MainActor in
-                do {
-                    let products = try await Product.products(for: [productIdentifier])
-                    guard let product = products.first else {
-                        call.reject("Cannot find product for id \(productIdentifier)")
-                        return
-                    }
+        print("purchaseProduct")
+        let productIdentifier = call.getString("productIdentifier", "")
+        let quantity = call.getInt("quantity", 1)
+        let appAccountToken = call.getString("appAccountToken")
+        let autoAcknowledge = call.getBool("autoAcknowledgePurchases") ?? true
+
+        if productIdentifier.isEmpty {
+            call.reject("productIdentifier is Empty, give an id")
+            return
+        }
 
-                    let purchaseOptions = self.buildPurchaseOptions(quantity: quantity, appAccountToken: appAccountToken)
-                    let result = try await product.purchase(options: purchaseOptions)
-                    print("purchaseProduct result \(result)")
+        print("Auto-acknowledge enabled: \(autoAcknowledge)")
 
-                    await self.handlePurchaseResult(result, call: call, autoFinish: autoAcknowledge)
-                } catch {
-                    print(error)
-                    call.reject(error.localizedDescription)
+        Task { @MainActor in
+            do {
+                let products = try await Product.products(for: [productIdentifier])
+                guard let product = products.first else {
+                    call.reject("Cannot find product for id \(productIdentifier)")
+                    return
                 }
-            }
-        } else {
-            print("Not implemented under ios 15")
-            call.reject("Not implemented under ios 15")
-        }
-    }
 
-    @available(iOS 15.0, *)
-    private func buildPurchaseOptions(quantity: Int, appAccountToken: String?) -> Set<Product.PurchaseOption> {
-        var purchaseOptions = Set<Product.PurchaseOption>()
-        purchaseOptions.insert(Product.PurchaseOption.quantity(quantity))
+                var purchaseOptions = Set<Product.PurchaseOption>()
+                purchaseOptions.insert(.quantity(quantity))
+                if let token = appAccountToken, !token.isEmpty, let uuid = UUID(uuidString: token) {
+                    purchaseOptions.insert(.appAccountToken(uuid))
+                }
 
-        if let accountToken = appAccountToken, !accountToken.isEmpty, let tokenData = UUID(uuidString: accountToken) {
-            purchaseOptions.insert(Product.PurchaseOption.appAccountToken(tokenData))
+                let result = try await product.purchase(options: purchaseOptions)
+                print("purchaseProduct result \(result)")
+                await self.handlePurchaseResult(result, call: call, autoFinish: autoAcknowledge)
+            } catch {
+                print(error)
+                call.reject(error.localizedDescription)
+            }
         }
-
-        return purchaseOptions
     }
 
-    @available(iOS 15.0, *)
     @MainActor
-    private func handlePurchaseResult(_ result: Product.PurchaseResult, call: CAPPluginCall, autoFinish: Bool) async {
+    private func handlePurchaseResult(
+        _ result: Product.PurchaseResult,
+        call: CAPPluginCall,
+        autoFinish: Bool
+    ) async {
         switch result {
         case let .success(verificationResult):
             switch verificationResult {
             case .verified(let transaction):
-                let response = await TransactionHelpers.buildTransactionResponse(from: transaction, jwsRepresentation: verificationResult.jwsRepresentation)
-
+                let response = await TransactionHelpers.buildTransactionResponse(
+                    from: transaction,
+                    jwsRepresentation: verificationResult.jwsRepresentation
+                )
                 if autoFinish {
                     print("Auto-finishing transaction: \(transaction.id)")
                     await transaction.finish()
                 } else {
                     print("Manual finish required for transaction: \(transaction.id)")
-                    print("Transaction will remain unfinished until acknowledgePurchase() is called")
-                    // Don't finish - transaction remains in StoreKit's queue
-                    // Can be retrieved later via Transaction.all
                 }
-
                 call.resolve(response)
             case .unverified(_, let error):
                 call.reject(error.localizedDescription)
@@ -179,237 +142,136 @@ public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc func restorePurchases(_ call: CAPPluginCall) {
-        if #available(iOS 15.0, *) {
-            print("restorePurchases")
-            Task {
-                do {
-                    try await AppStore.sync()
-                    // make finish() calls for all transactions and consume all consumables
-                    for transaction in SKPaymentQueue.default().transactions {
-                        SKPaymentQueue.default().finishTransaction(transaction)
-                    }
-                    await MainActor.run {
-                        call.resolve()
-                    }
-                } catch {
-                    await MainActor.run {
-                        call.reject(error.localizedDescription)
-                    }
+        print("restorePurchases")
+        Task {
+            do {
+                try await AppStore.sync()
+                for transaction in SKPaymentQueue.default().transactions {
+                    SKPaymentQueue.default().finishTransaction(transaction)
                 }
+                await MainActor.run { call.resolve() }
+            } catch {
+                await MainActor.run { call.reject(error.localizedDescription) }
             }
-        } else {
-            print("Not implemented under ios 15")
-            call.reject("Not implemented under ios 15")
         }
     }
 
     @objc func getProducts(_ call: CAPPluginCall) {
-        if #available(iOS 15.0, *) {
-            let productIdentifiers = call.getArray("productIdentifiers", String.self) ?? []
-            print("productIdentifiers \(productIdentifiers)")
-            Task {
-                do {
-                    let products = try await Product.products(for: productIdentifiers)
-                    print("products \(products)")
-                    let productsJson: [[String: Any]] = products.map { $0.dictionary }
-                    await MainActor.run {
-                        call.resolve([
-                            "products": productsJson
-                        ])
-                    }
-                } catch {
-                    print("error \(error)")
-                    await MainActor.run {
-                        call.reject(error.localizedDescription)
-                    }
-                }
+        let productIdentifiers = call.getArray("productIdentifiers", String.self) ?? []
+        print("productIdentifiers \(productIdentifiers)")
+        Task {
+            do {
+                let products = try await Product.products(for: productIdentifiers)
+                print("products \(products)")
+                let productsJson: [[String: Any]] = products.map { $0.dictionary }
+                await MainActor.run { call.resolve(["products": productsJson]) }
+            } catch {
+                print("error \(error)")
+                await MainActor.run { call.reject(error.localizedDescription) }
             }
-        } else {
-            print("Not implemented under ios 15")
-            call.reject("Not implemented under ios 15")
         }
     }
 
     @objc func getProduct(_ call: CAPPluginCall) {
-        if #available(iOS 15.0, *) {
-            let productIdentifier = call.getString("productIdentifier") ?? ""
-            print("productIdentifier \(productIdentifier)")
-            if productIdentifier.isEmpty {
-                call.reject("productIdentifier is empty")
-                return
-            }
+        let productIdentifier = call.getString("productIdentifier") ?? ""
+        print("productIdentifier \(productIdentifier)")
+        if productIdentifier.isEmpty {
+            call.reject("productIdentifier is empty")
+            return
+        }
 
-            Task {
-                do {
-                    let products = try await Product.products(for: [productIdentifier])
-                    print("products \(products)")
-                    if let product = products.first {
-                        let productJson = product.dictionary
-                        await MainActor.run {
-                            call.resolve(["product": productJson])
-                        }
-                    } else {
-                        await MainActor.run {
-                            call.reject("Product not found")
-                        }
-                    }
-                } catch {
-                    print(error)
-                    await MainActor.run {
-                        call.reject(error.localizedDescription)
-                    }
+        Task {
+            do {
+                let products = try await Product.products(for: [productIdentifier])
+                print("products \(products)")
+                if let product = products.first {
+                    await MainActor.run { call.resolve(["product": product.dictionary]) }
+                } else {
+                    await MainActor.run { call.reject("Product not found") }
                 }
+            } catch {
+                print(error)
+                await MainActor.run { call.reject(error.localizedDescription) }
             }
-        } else {
-            print("Not implemented under iOS 15")
-            call.reject("Not implemented under iOS 15")
         }
     }
 
     @objc func getPurchases(_ call: CAPPluginCall) {
+        print("getPurchases")
         let appAccountTokenFilter = call.getString("appAccountToken")
-        if #available(iOS 15.0, *) {
-            print("getPurchases")
-            Task {
-                let allPurchases = await TransactionHelpers.collectAllPurchases(appAccountTokenFilter: appAccountTokenFilter)
-                await MainActor.run {
-                    call.resolve(["purchases": allPurchases])
-                }
-            }
-        } else {
-            print("Not implemented under iOS 15")
-            call.reject("Not implemented under iOS 15")
+        Task {
+            let allPurchases = await TransactionHelpers.collectAllPurchases(
+                appAccountTokenFilter: appAccountTokenFilter
+            )
+            await MainActor.run { call.resolve(["purchases": allPurchases]) }
         }
     }
 
     @objc func manageSubscriptions(_ call: CAPPluginCall) {
-        if #available(iOS 15.0, *) {
-            print("manageSubscriptions")
-            Task { @MainActor in
-                do {
-                    // Get the current window scene
-                    guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene else {
-                        call.reject("Unable to get window scene")
-                        return
-                    }
-                    // Open the App Store subscription management page
-                    try await AppStore.showManageSubscriptions(in: windowScene)
-                    call.resolve()
-                } catch {
-                    print("manageSubscriptions error: \(error)")
-                    call.reject(error.localizedDescription)
+        print("manageSubscriptions")
+        Task { @MainActor in
+            do {
+                guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene else {
+                    call.reject("Unable to get window scene")
+                    return
                 }
+                try await AppStore.showManageSubscriptions(in: windowScene)
+                call.resolve()
+            } catch {
+                print("manageSubscriptions error: \(error)")
+                call.reject(error.localizedDescription)
             }
-        } else {
-            print("Not implemented under iOS 15")
-            call.reject("Not implemented under iOS 15")
         }
     }
 
     @objc func acknowledgePurchase(_ call: CAPPluginCall) {
-        if #available(iOS 15.0, *) {
-            print("acknowledgePurchase called on iOS")
+        print("acknowledgePurchase called on iOS")
 
-            guard let purchaseToken = call.getString("purchaseToken") else {
-                call.reject("purchaseToken is required")
-                return
-            }
-
-            // On iOS, purchaseToken is the transactionId (UInt64 as string)
-            guard let transactionId = UInt64(purchaseToken) else {
-                call.reject("Invalid purchaseToken format")
-                return
-            }
+        guard let purchaseToken = call.getString("purchaseToken") else {
+            call.reject("purchaseToken is required")
+            return
+        }
 
-            Task {
-                // Search for the transaction in StoreKit's unfinished transactions
-                // This works even after app restart because StoreKit persists them
-                var foundTransaction: Transaction?
-
-                for await verificationResult in Transaction.all {
-                    switch verificationResult {
-                    case .verified(let transaction):
-                        if transaction.id == transactionId {
-                            foundTransaction = transaction
-                            break
-                        }
-                    case .unverified:
-                        continue
-                    }
-                    if foundTransaction != nil {
-                        break
-                    }
-                }
+        guard let transactionId = UInt64(purchaseToken) else {
+            call.reject("Invalid purchaseToken format")
+            return
+        }
 
-                guard let transaction = foundTransaction else {
-                    await MainActor.run {
-                        call.reject("Transaction not found or already finished. Transaction ID: \(transactionId)")
-                    }
-                    return
+        Task {
+            var foundTransaction: Transaction?
+            for await verificationResult in Transaction.all {
+                if case .verified(let transaction) = verificationResult, transaction.id == transactionId {
+                    foundTransaction = transaction
+                    break
                 }
+            }
 
-                print("Manually finishing transaction: \(transaction.id)")
-                await transaction.finish()
-
+            guard let transaction = foundTransaction else {
                 await MainActor.run {
-                    print("Transaction finished successfully")
-                    call.resolve()
+                    call.reject("Transaction not found or already finished. Transaction ID: \(transactionId)")
                 }
+                return
+            }
+
+            print("Manually finishing transaction: \(transaction.id)")
+            await transaction.finish()
+            await MainActor.run {
+                print("Transaction finished successfully")
+                call.resolve()
             }
-        } else {
-            call.reject("Not implemented under iOS 15")
         }
     }
 
+}
+
+// MARK: - iOS 16+ App Transaction Methods
+extension NativePurchasesPlugin {
     @objc func getAppTransaction(_ call: CAPPluginCall) {
         if #available(iOS 16.0, *) {
-            print("getAppTransaction called on iOS")
             Task { @MainActor in
-                do {
-                    let verificationResult = try await AppTransaction.shared
-                    switch verificationResult {
-                    case .verified(let appTransaction):
-                        var response: [String: Any] = [:]
-
-                        // originalAppVersion is the CFBundleVersion (build number) at the time of original download
-                        response["originalAppVersion"] = appTransaction.originalAppVersion
-
-                        // Original purchase date
-                        response["originalPurchaseDate"] = ISO8601DateFormatter().string(from: appTransaction.originalPurchaseDate)
-
-                        // Bundle ID
-                        response["bundleId"] = appTransaction.bundleID
-
-                        // Current app version (build number)
-                        response["appVersion"] = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? ""
-
-                        // Environment
-                        switch appTransaction.environment {
-                        case .sandbox:
-                            response["environment"] = "Sandbox"
-                        case .production:
-                            response["environment"] = "Production"
-                        case .xcode:
-                            response["environment"] = "Xcode"
-                        default:
-                            response["environment"] = "Production"
-                        }
-
-                        // JWS representation for server-side verification
-                        response["jwsRepresentation"] = verificationResult.jwsRepresentation
-
-                        call.resolve(["appTransaction": response])
-
-                    case .unverified(_, let error):
-                        call.reject("App transaction verification failed: \(error.localizedDescription)")
-                    }
-                } catch {
-                    print("getAppTransaction error: \(error)")
-                    call.reject("Failed to get app transaction: \(error.localizedDescription)")
-                }
+                await self.handleGetAppTransaction(call)
             }
         } else {
-            print("getAppTransaction not implemented under iOS 16")
             call.reject("App Transaction requires iOS 16.0 or later")
         }
     }
@@ -421,44 +283,78 @@ public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         if #available(iOS 16.0, *) {
-            print("isEntitledToOldBusinessModel called with targetBuildNumber: \(targetBuildNumber)")
             Task { @MainActor in
-                do {
-                    let verificationResult = try await AppTransaction.shared
-                    switch verificationResult {
-                    case .verified(let appTransaction):
-                        let originalBuildNumber = appTransaction.originalAppVersion
-
-                        // Compare build numbers (integers)
-                        let isOlder = self.compareVersions(originalBuildNumber, targetBuildNumber) < 0
-
-                        call.resolve([
-                            "isOlderVersion": isOlder,
-                            "originalAppVersion": originalBuildNumber
-                        ])
-
-                    case .unverified(_, let error):
-                        call.reject("App transaction verification failed: \(error.localizedDescription)")
-                    }
-                } catch {
-                    print("isEntitledToOldBusinessModel error: \(error)")
-                    call.reject("Failed to get app transaction: \(error.localizedDescription)")
-                }
+                await self.handleIsEntitledToOldBusinessModel(call, targetBuildNumber: targetBuildNumber)
             }
         } else {
-            print("isEntitledToOldBusinessModel not implemented under iOS 16")
             call.reject("App Transaction requires iOS 16.0 or later")
         }
     }
 
-    // MARK: - Version Comparison Helper
+    @available(iOS 16.0, *)
+    @MainActor
+    private func handleGetAppTransaction(_ call: CAPPluginCall) async {
+        print("getAppTransaction called on iOS")
+        do {
+            let verificationResult = try await AppTransaction.shared
+            switch verificationResult {
+            case .verified(let appTransaction):
+                let response: [String: Any] = [
+                    "originalAppVersion": appTransaction.originalAppVersion,
+                    "originalPurchaseDate": ISO8601DateFormatter().string(
+                        from: appTransaction.originalPurchaseDate
+                    ),
+                    "bundleId": appTransaction.bundleID,
+                    "appVersion": Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "",
+                    "jwsRepresentation": verificationResult.jwsRepresentation,
+                    "environment": appTransaction.environment.environmentString
+                ]
+                call.resolve(["appTransaction": response])
+            case .unverified(_, let error):
+                call.reject("App transaction verification failed: \(error.localizedDescription)")
+            }
+        } catch {
+            print("getAppTransaction error: \(error)")
+            call.reject("Failed to get app transaction: \(error.localizedDescription)")
+        }
+    }
 
-    /// Compares two build numbers as integers.
-    /// Returns: negative if v1 < v2, zero if v1 == v2, positive if v1 > v2
-    private func compareVersions(_ version1: String, _ version2: String) -> Int {
-        let v1Int = Int(version1) ?? 0
-        let v2Int = Int(version2) ?? 0
-        return v1Int - v2Int
+    @available(iOS 16.0, *)
+    @MainActor
+    private func handleIsEntitledToOldBusinessModel(
+        _ call: CAPPluginCall,
+        targetBuildNumber: String
+    ) async {
+        print("isEntitledToOldBusinessModel called with targetBuildNumber: \(targetBuildNumber)")
+        do {
+            let verificationResult = try await AppTransaction.shared
+            switch verificationResult {
+            case .verified(let appTransaction):
+                let originalBuildNumber = appTransaction.originalAppVersion
+                let originalInt = Int(originalBuildNumber) ?? 0
+                let targetInt = Int(targetBuildNumber) ?? 0
+                call.resolve([
+                    "isOlderVersion": originalInt < targetInt,
+                    "originalAppVersion": originalBuildNumber
+                ])
+            case .unverified(_, let error):
+                call.reject("App transaction verification failed: \(error.localizedDescription)")
+            }
+        } catch {
+            print("isEntitledToOldBusinessModel error: \(error)")
+            call.reject("Failed to get app transaction: \(error.localizedDescription)")
+        }
     }
+}
 
+@available(iOS 16.0, *)
+private extension AppStore.Environment {
+    var environmentString: String {
+        switch self {
+        case .sandbox: return "Sandbox"
+        case .production: return "Production"
+        case .xcode: return "Xcode"
+        default: return "Production"
+        }
+    }
 }

package/ios/Sources/NativePurchasesPlugin/Product+CapacitorPurchasesPlugin.swift

@@ -8,7 +8,6 @@
 import Foundation
 import StoreKit
 
-@available(iOS 15.0, *)
 extension Product {
 
     var dictionary: [String: Any] {

package/ios/Sources/NativePurchasesPlugin/TransactionHelpers.swift

@@ -1,87 +1,61 @@
-//
-//  TransactionHelpers.swift
-//  CapgoNativePurchases
-//
-//  Created by Martin DONADIEU
-//
-
 import Foundation
 import StoreKit
 
-@available(iOS 15.0, *)
 internal class TransactionHelpers {
 
-    static func buildTransactionResponse(from transaction: Transaction, jwsRepresentation: String? = nil, alwaysIncludeWillCancel: Bool = false) async -> [String: Any] {
+    static func buildTransactionResponse(
+        from transaction: Transaction,
+        jwsRepresentation: String? = nil,
+        alwaysIncludeWillCancel: Bool = false
+    ) async -> [String: Any] {
         var response: [String: Any] = ["transactionId": String(transaction.id)]
 
-        // Always include willCancel key with NSNull() default if requested (for transaction listener)
         if alwaysIncludeWillCancel {
             response["willCancel"] = NSNull()
         }
 
-        // Get receipt data (may not exist in Xcode/sandbox testing)
+        addReceiptAndJws(to: &response, jws: jwsRepresentation)
+        addTransactionDetails(to: &response, transaction: transaction)
+
+        if transaction.productType == .autoRenewable {
+            addSubscriptionInfo(to: &response, transaction: transaction)
+            await addRenewalInfo(to: &response, transaction: transaction)
+        }
+
+        return response
+    }
+
+    private static func addReceiptAndJws(to response: inout [String: Any], jws: String?) {
         if let receiptBase64 = getReceiptData() {
             response["receipt"] = receiptBase64
         }
-
-        // Add StoreKit 2 JWS representation (always available when passed from VerificationResult)
-        if let jws = jwsRepresentation {
+        if let jws = jws {
             response["jwsRepresentation"] = jws
         }
+    }
 
-        // Add detailed transaction information
+    private static func addTransactionDetails(to response: inout [String: Any], transaction: Transaction) {
         response["productIdentifier"] = transaction.productID
         response["purchaseDate"] = ISO8601DateFormatter().string(from: transaction.purchaseDate)
         response["productType"] = transaction.productType == .autoRenewable ? "subs" : "inapp"
         response["isUpgraded"] = transaction.isUpgraded
+        response["ownershipType"] = transaction.ownershipType.descriptionString
 
         if let revocationDate = transaction.revocationDate {
             response["revocationDate"] = ISO8601DateFormatter().string(from: revocationDate)
         }
-
         if let revocationReason = transaction.revocationReason {
             response["revocationReason"] = revocationReason.descriptionString
         }
-
         if #available(iOS 17.0, *) {
             response["transactionReason"] = transaction.reason.descriptionString
         }
-
-        // Add ownership type (purchased or familyShared)
-        switch transaction.ownershipType {
-        case .purchased:
-            response["ownershipType"] = "purchased"
-        case .familyShared:
-            response["ownershipType"] = "familyShared"
-        default:
-            response["ownershipType"] = "purchased"
-        }
-
-        // Add environment (Sandbox, Production, or Xcode) - iOS 16.0+
         if #available(iOS 16.0, *) {
-            switch transaction.environment {
-            case .sandbox:
-                response["environment"] = "Sandbox"
-            case .production:
-                response["environment"] = "Production"
-            case .xcode:
-                response["environment"] = "Xcode"
-            default:
-                response["environment"] = "Production"
-            }
+            response["environment"] = transaction.environment.descriptionString
         }
-
         if let token = transaction.appAccountToken {
             response["appAccountToken"] = token.uuidString
         }
-
-        // Add subscription-specific information
-        if transaction.productType == .autoRenewable {
-            addSubscriptionInfo(to: &response, transaction: transaction)
-            await addRenewalInfo(to: &response, transaction: transaction)
-        }
-
-        return response
     }
 
     static func getReceiptData() -> String? {
@@ -94,7 +68,9 @@ internal class TransactionHelpers {
     }
 
     static func addSubscriptionInfo(to response: inout [String: Any], transaction: Transaction) {
-        response["originalPurchaseDate"] = ISO8601DateFormatter().string(from: transaction.originalPurchaseDate)
+        response["originalPurchaseDate"] = ISO8601DateFormatter().string(
+            from: transaction.originalPurchaseDate
+        )
         if let expirationDate = transaction.expirationDate {
             response["expirationDate"] = ISO8601DateFormatter().string(from: expirationDate)
             response["isActive"] = expirationDate > Date()
@@ -102,8 +78,7 @@ internal class TransactionHelpers {
     }
 
     static func addRenewalInfo(to response: inout [String: Any], transaction: Transaction) async {
-        let subscriptionStatus = await transaction.subscriptionStatus
-        guard let subscriptionStatus = subscriptionStatus else {
+        guard let subscriptionStatus = await transaction.subscriptionStatus else {
             response["willCancel"] = NSNull()
             return
         }
@@ -111,11 +86,9 @@ internal class TransactionHelpers {
         response["subscriptionState"] = subscriptionStatus.state.descriptionString
 
         if subscriptionStatus.state == .subscribed {
-            let renewalInfo = subscriptionStatus.renewalInfo
-            switch renewalInfo {
-            case .verified(let value):
+            if case .verified(let value) = subscriptionStatus.renewalInfo {
                 response["willCancel"] = !value.willAutoRenew
-            case .unverified:
+            } else {
                 response["willCancel"] = NSNull()
             }
         } else {
@@ -123,78 +96,49 @@ internal class TransactionHelpers {
         }
     }
 
-    static func shouldFilterTransaction(_ transaction: Transaction, filter: String?) -> Bool {
-        guard let filter = filter else { return false }
-        let transactionAccountToken = transaction.appAccountToken?.uuidString
-        return transactionAccountToken != filter
-    }
-
     static func collectAllPurchases(appAccountTokenFilter: String?) async -> [[String: Any]] {
         var allPurchases: [[String: Any]] = []
+        var seenIds = Set<String>()
 
-        // Get all current entitlements (active subscriptions)
-        await collectCurrentEntitlements(appAccountTokenFilter: appAccountTokenFilter, into: &allPurchases)
-
-        // Also get all transactions (including non-consumables and expired subscriptions)
-        await collectAllTransactions(appAccountTokenFilter: appAccountTokenFilter, into: &allPurchases)
-
-        return allPurchases
-    }
-
-    static func collectCurrentEntitlements(appAccountTokenFilter: String?, into allPurchases: inout [[String: Any]]) async {
         for await result in Transaction.currentEntitlements {
-            guard case .verified(let transaction) = result else {
-                if case .unverified(_, let error) = result {
-                    print("Skipping unverified entitlement: \(error.localizedDescription)")
-                }
-                continue
-            }
-
-            if shouldFilterTransaction(transaction, filter: appAccountTokenFilter) {
-                continue
-            }
+            guard case .verified(let transaction) = result else { continue }
+            if let filter = appAccountTokenFilter,
+               transaction.appAccountToken?.uuidString != filter { continue }
 
-            let purchaseData = await buildTransactionResponse(from: transaction, jwsRepresentation: result.jwsRepresentation)
-            allPurchases.append(purchaseData)
+            let idStr = String(transaction.id)
+            seenIds.insert(idStr)
+            let data = await buildTransactionResponse(
+                from: transaction,
+                jwsRepresentation: result.jwsRepresentation
+            )
+            allPurchases.append(data)
         }
-    }
 
-    static func collectAllTransactions(appAccountTokenFilter: String?, into allPurchases: inout [[String: Any]]) async {
         for await result in Transaction.all {
-            guard case .verified(let transaction) = result else {
-                if case .unverified(_, let error) = result {
-                    print("Skipping unverified transaction: \(error.localizedDescription)")
-                }
-                continue
-            }
+            guard case .verified(let transaction) = result else { continue }
+            if let filter = appAccountTokenFilter,
+               transaction.appAccountToken?.uuidString != filter { continue }
 
-            if shouldFilterTransaction(transaction, filter: appAccountTokenFilter) {
-                continue
-            }
+            let idStr = String(transaction.id)
+            if seenIds.contains(idStr) { continue }
 
-            let transactionIdString = String(transaction.id)
-            let alreadyExists = allPurchases.contains { purchase in
-                (purchase["transactionId"] as? String) == transactionIdString
-            }
-
-            if !alreadyExists {
-                let purchaseData = await buildTransactionResponse(from: transaction, jwsRepresentation: result.jwsRepresentation)
-                allPurchases.append(purchaseData)
-            }
+            let data = await buildTransactionResponse(
+                from: transaction,
+                jwsRepresentation: result.jwsRepresentation
+            )
+            allPurchases.append(data)
         }
+
+        return allPurchases
     }
 }
 
-@available(iOS 15.0, *)
 private extension Transaction.RevocationReason {
     var descriptionString: String {
         switch self {
-        case .developerIssue:
-            return "developerIssue"
-        case .other:
-            return "other"
-        default:
-            return "unknown"
+        case .developerIssue: return "developerIssue"
+        case .other: return "other"
+        default: return "unknown"
         }
     }
 }
@@ -203,32 +147,44 @@ private extension Transaction.RevocationReason {
 private extension Transaction.Reason {
     var descriptionString: String {
         switch self {
-        case .purchase:
-            return "purchase"
-        case .renewal:
-            return "renewal"
-        default:
-            return "unknown"
+        case .purchase: return "purchase"
+        case .renewal: return "renewal"
+        default: return "unknown"
+        }
+    }
+}
+
+private extension Transaction.OwnershipType {
+    var descriptionString: String {
+        switch self {
+        case .purchased: return "purchased"
+        case .familyShared: return "familyShared"
+        default: return "purchased"
+        }
+    }
+}
+
+@available(iOS 16.0, *)
+private extension AppStore.Environment {
+    var descriptionString: String {
+        switch self {
+        case .sandbox: return "Sandbox"
+        case .production: return "Production"
+        case .xcode: return "Xcode"
+        default: return "Production"
         }
     }
 }
 
-@available(iOS 15.0, *)
 private extension Product.SubscriptionInfo.RenewalState {
     var descriptionString: String {
         switch self {
-        case .subscribed:
-            return "subscribed"
-        case .expired:
-            return "expired"
-        case .revoked:
-            return "revoked"
-        case .inGracePeriod:
-            return "inGracePeriod"
-        case .inBillingRetryPeriod:
-            return "inBillingRetryPeriod"
-        default:
-            return "unknown"
+        case .subscribed: return "subscribed"
+        case .expired: return "expired"
+        case .revoked: return "revoked"
+        case .inGracePeriod: return "inGracePeriod"
+        case .inBillingRetryPeriod: return "inBillingRetryPeriod"
+        default: return "unknown"
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-purchases",
-  "version": "8.0.4",
+  "version": "8.0.6",
   "description": "In-app Subscriptions Made Easy",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",