react-native-iap 8.6.2 → 9.0.0-beta11

package/android/build.gradle

@@ -155,10 +155,10 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-  testImplementation "junit:junit:4.13.1"
+  testImplementation "junit:junit:4.13.2"
   testImplementation "io.mockk:mockk:1.12.4"
 
-  playImplementation "com.android.billingclient:billing:4.0.0"
+  playImplementation "com.android.billingclient:billing-ktx:5.0.0"
   playImplementation "com.google.android.gms:play-services-base:$playServicesVersion"
 
   amazonImplementation fileTree(dir: "libs", include: ["*.jar"])

package/android/src/amazon/java/com/dooboolab/RNIap/RNIapAmazonListener.kt

@@ -245,7 +245,10 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                 sendEvent(reactContext, "purchase-error", error)
                 DoobooUtils.instance
                     .rejectPromisesForKey(
-                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM, errorCode, debugMessage, null
+                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM,
+                        errorCode,
+                        debugMessage,
+                        null
                     )
             }
             PurchaseResponse.RequestStatus.FAILED -> {
@@ -259,7 +262,10 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                 sendEvent(reactContext, "purchase-error", error)
                 DoobooUtils.instance
                     .rejectPromisesForKey(
-                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM, errorCode, debugMessage, null
+                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM,
+                        errorCode,
+                        debugMessage,
+                        null
                     )
             }
             PurchaseResponse.RequestStatus.INVALID_SKU -> {
@@ -272,7 +278,10 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                 sendEvent(reactContext, "purchase-error", error)
                 DoobooUtils.instance
                     .rejectPromisesForKey(
-                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM, errorCode, debugMessage, null
+                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM,
+                        errorCode,
+                        debugMessage,
+                        null
                     )
             }
             PurchaseResponse.RequestStatus.NOT_SUPPORTED -> {
@@ -285,7 +294,10 @@ class RNIapAmazonListener(private val reactContext: ReactContext) : PurchasingLi
                 sendEvent(reactContext, "purchase-error", error)
                 DoobooUtils.instance
                     .rejectPromisesForKey(
-                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM, errorCode, debugMessage, null
+                        RNIapAmazonModule.Companion.PROMISE_BUY_ITEM,
+                        errorCode,
+                        debugMessage,
+                        null
                     )
             }
         }

package/android/src/play/java/com/dooboolab/RNIap/RNIapModule.kt

@@ -9,10 +9,13 @@ import com.android.billingclient.api.BillingFlowParams.SubscriptionUpdateParams
 import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.ConsumeParams
 import com.android.billingclient.api.ConsumeResponseListener
+import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.PurchaseHistoryRecord
 import com.android.billingclient.api.PurchasesUpdatedListener
-import com.android.billingclient.api.SkuDetails
-import com.android.billingclient.api.SkuDetailsParams
+import com.android.billingclient.api.QueryProductDetailsParams
+import com.android.billingclient.api.QueryPurchaseHistoryParams
+import com.android.billingclient.api.QueryPurchasesParams
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
@@ -23,13 +26,13 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
+import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import java.math.BigDecimal
 import java.util.ArrayList
 
 class RNIapModule(
@@ -41,12 +44,12 @@ class RNIapModule(
     PurchasesUpdatedListener {
 
     private var billingClientCache: BillingClient? = null
-    private val skus: MutableMap<String, SkuDetails> = mutableMapOf()
+    private val skus: MutableMap<String, ProductDetails> = mutableMapOf()
     override fun getName(): String {
         return TAG
     }
 
-    internal fun ensureConnection(
+    fun ensureConnection(
         promise: Promise,
         callback: (billingClient: BillingClient) -> Unit
     ) {
@@ -71,7 +74,8 @@ class RNIapModule(
                 {
                     if (it.size > 1 && it[0] is String && it[1] is String) {
                         promise.safeReject(
-                            it[0] as String, it[1] as String
+                            it[0] as String,
+                            it[1] as String
                         )
                     } else {
                         Log.i(TAG, "Incorrect parameters in reject")
@@ -83,7 +87,7 @@ class RNIapModule(
     }
 
     @ReactMethod
-    fun initConnection(promise: Promise) {
+     fun initConnection(promise: Promise) {
         if (googleApiAvailability.isGooglePlayServicesAvailable(reactContext)
             != ConnectionResult.SUCCESS
         ) {
@@ -104,21 +108,22 @@ class RNIapModule(
             billingClientCache = it
             it.startConnection(
                 object : BillingClientStateListener {
-                    override fun onBillingSetupFinished(billingResult: BillingResult) {
+                     override fun onBillingSetupFinished(billingResult: BillingResult) {
                         if (!isValidResult(billingResult, promise)) return
 
                         promise.safeResolve(true)
                     }
 
-                    override fun onBillingServiceDisconnected() {
+                     override fun onBillingServiceDisconnected() {
                         Log.i(TAG, "Billing service disconnected")
                     }
-                })
+                }
+            )
         }
     }
 
     @ReactMethod
-    fun endConnection(promise: Promise) {
+     fun endConnection(promise: Promise) {
         billingClientCache?.endConnection()
         billingClientCache = null
         promise.safeResolve(true)
@@ -155,12 +160,14 @@ class RNIapModule(
     }
 
     @ReactMethod
-    fun flushFailedPurchasesCachedAsPending(promise: Promise) {
+     fun flushFailedPurchasesCachedAsPending(promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
             billingClient.queryPurchasesAsync(
-                BillingClient.SkuType.INAPP
+                QueryPurchasesParams.newBuilder().setProductType(
+                    BillingClient.ProductType.INAPP
+                ).build()
             ) { billingResult: BillingResult, list: List<Purchase>? ->
                 if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 if (list == null) {
@@ -186,77 +193,96 @@ class RNIapModule(
     }
 
     @ReactMethod
-    fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
+     fun getItemsByType(type: String, skuArr: ReadableArray, promise: Promise) {
         ensureConnection(
             promise
         ) { billingClient ->
-            val skuList = ArrayList<String>()
+            val skuList = ArrayList<QueryProductDetailsParams.Product>()
             for (i in 0 until skuArr.size()) {
                 if (skuArr.getType(i) == ReadableType.String) {
                     val sku = skuArr.getString(i)
-                    skuList.add(sku)
+                    sku?.let {
+                        skuList.add(
+                            QueryProductDetailsParams.Product.newBuilder().setProductId(sku)
+                                .setProductType(type).build()
+                        )
+                    }
                 }
             }
-            val params = SkuDetailsParams.newBuilder()
-            params.setSkusList(skuList).setType(type)
-            billingClient.querySkuDetailsAsync(
+            val params = QueryProductDetailsParams.newBuilder().setProductList(skuList)
+            billingClient.queryProductDetailsAsync(
                 params.build()
-            ) { billingResult: BillingResult, skuDetailsList: List<SkuDetails>? ->
-                if (!isValidResult(billingResult, promise)) return@querySkuDetailsAsync
+            ) { billingResult: BillingResult, skuDetailsList: List<ProductDetails> ->
+                if (!isValidResult(billingResult, promise)) return@queryProductDetailsAsync
 
                 val items = Arguments.createArray()
-                if (skuDetailsList != null) {
-                    for (skuDetails in skuDetailsList) {
-                        skus[skuDetails.sku] = skuDetails
-
-                        val item = Arguments.createMap()
-                        item.putString("productId", skuDetails.sku)
-                        val introductoryPriceMicros = skuDetails.introductoryPriceAmountMicros
-                        val priceAmountMicros = skuDetails.priceAmountMicros
-                        // Use valueOf instead of constructors.
-                        // See:
-                        // https://www.javaworld.com/article/2073176/caution--double-to-bigdecimal-in-java.html
-                        val priceAmount = BigDecimal.valueOf(priceAmountMicros)
-                        val introductoryPriceAmount =
-                            BigDecimal.valueOf(introductoryPriceMicros)
-                        val microUnitsDivisor = BigDecimal.valueOf(1000000)
-                        val price = priceAmount.divide(microUnitsDivisor).toString()
-                        val introductoryPriceAsAmountAndroid =
-                            introductoryPriceAmount.divide(microUnitsDivisor).toString()
-                        item.putString("price", price)
-                        item.putString("currency", skuDetails.priceCurrencyCode)
-                        item.putString("type", skuDetails.type)
-                        item.putString("localizedPrice", skuDetails.price)
-                        item.putString("title", skuDetails.title)
-                        item.putString("description", skuDetails.description)
-                        item.putString("introductoryPrice", skuDetails.introductoryPrice)
-                        item.putString("typeAndroid", skuDetails.type)
-                        item.putString("packageNameAndroid", skuDetails.zzc())
-                        item.putString("originalPriceAndroid", skuDetails.originalPrice)
-                        item.putString(
-                            "subscriptionPeriodAndroid",
-                            skuDetails.subscriptionPeriod
-                        )
-                        item.putString("freeTrialPeriodAndroid", skuDetails.freeTrialPeriod)
-                        item.putString(
-                            "introductoryPriceCyclesAndroid",
-                            skuDetails.introductoryPriceCycles.toString()
+                for (skuDetails in skuDetailsList) {
+                    skus[skuDetails.productId] = skuDetails
+
+                    val item = Arguments.createMap()
+                    item.putString("productId", skuDetails.productId)
+                    item.putString("title", skuDetails.title)
+                    item.putString("description", skuDetails.description)
+                    item.putString("productType", skuDetails.productType)
+                    item.putString("name", skuDetails.name)
+                    val oneTimePurchaseOfferDetails = Arguments.createMap()
+                    skuDetails.oneTimePurchaseOfferDetails?.let {
+                        oneTimePurchaseOfferDetails.putString(
+                            "priceCurrencyCode",
+                            it.priceCurrencyCode
                         )
-                        item.putString(
-                            "introductoryPricePeriodAndroid", skuDetails.introductoryPricePeriod
+                        oneTimePurchaseOfferDetails.putString("formattedPrice", it.formattedPrice)
+                        oneTimePurchaseOfferDetails.putString(
+                            "priceAmountMicros",
+                            it.priceAmountMicros.toString()
                         )
-                        item.putString(
-                            "introductoryPriceAsAmountAndroid", introductoryPriceAsAmountAndroid
+                    }
+                    item.putMap("oneTimePurchaseOfferDetails", oneTimePurchaseOfferDetails)
+
+                    val subscriptionOfferDetails = Arguments.createArray()
+                    skuDetails.subscriptionOfferDetails?.forEach { subscriptionOfferDetailsItem ->
+                        val offerDetails = Arguments.createMap()
+                        offerDetails.putString(
+                            "offerToken",
+                            subscriptionOfferDetailsItem.offerToken
                         )
-                        item.putString("iconUrl", skuDetails.iconUrl)
-                        item.putString("originalJson", skuDetails.originalJson)
-                        val originalPriceAmountMicros =
-                            BigDecimal.valueOf(skuDetails.originalPriceAmountMicros)
-                        val originalPrice =
-                            originalPriceAmountMicros.divide(microUnitsDivisor).toString()
-                        item.putString("originalPrice", originalPrice)
-                        items.pushMap(item)
+                        val offerTags = Arguments.createArray()
+                        subscriptionOfferDetailsItem.offerTags.forEach { offerTag ->
+                            offerTags.pushString(offerTag)
+                        }
+                        offerDetails.putArray("offerTags", offerTags)
+
+                        val pricingPhasesList = Arguments.createArray()
+                        subscriptionOfferDetailsItem.pricingPhases.pricingPhaseList.forEach { pricingPhaseItem ->
+                            val pricingPhase = Arguments.createMap()
+                            pricingPhase.putString(
+                                "formattedPrice",
+                                pricingPhaseItem.formattedPrice
+                            )
+                            pricingPhase.putString(
+                                "priceCurrencyCode",
+                                pricingPhaseItem.priceCurrencyCode
+                            )
+                            pricingPhase.putString("billingPeriod", pricingPhaseItem.billingPeriod)
+                            pricingPhase.putInt(
+                                "billingCycleCount",
+                                pricingPhaseItem.billingCycleCount
+                            )
+                            pricingPhase.putString(
+                                "priceAmountMicros",
+                                pricingPhaseItem.priceAmountMicros.toString()
+                            )
+                            pricingPhase.putInt("recurrenceMode", pricingPhaseItem.recurrenceMode)
+
+                            pricingPhasesList.pushMap(pricingPhase)
+                        }
+                        val pricingPhases = Arguments.createMap()
+                        pricingPhases.putArray("pricingPhaseList", pricingPhasesList)
+                        offerDetails.putMap("pricingPhases", pricingPhases)
+                        subscriptionOfferDetails.pushMap(offerDetails)
                     }
+                    item.putArray("subscriptionOfferDetails", subscriptionOfferDetails)
+                    items.pushMap(item)
                 }
                 promise.safeResolve(items)
             }
@@ -286,14 +312,19 @@ class RNIapModule(
         ) { billingClient ->
             val items = WritableNativeArray()
             billingClient.queryPurchasesAsync(
-                if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
+                QueryPurchasesParams.newBuilder().setProductType(
+                    if (type == "subs") BillingClient.ProductType.SUBS else BillingClient.ProductType.INAPP
+                ).build()
             ) { billingResult: BillingResult, purchases: List<Purchase>? ->
                 if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 if (purchases != null) {
                     for (i in purchases.indices) {
                         val purchase = purchases[i]
                         val item = WritableNativeMap()
-                        item.putString("productId", purchase.skus[0])
+                        item.putString("productId", purchase.products[0])// kept for convenience/backward-compatibility. productIds has the complete list
+                        val products = Arguments.createArray()
+                        purchase.products.forEach { products.pushString(it) }
+                        item.putArray("productIds", products)
                         item.putString("transactionId", purchase.orderId)
                         item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                         item.putString("transactionReceipt", purchase.originalJson)
@@ -312,7 +343,7 @@ class RNIapModule(
                             "obfuscatedProfileIdAndroid",
                             purchase.accountIdentifiers?.obfuscatedProfileId
                         )
-                        if (type == BillingClient.SkuType.SUBS) {
+                        if (type == BillingClient.ProductType.SUBS) {
                             item.putBoolean("autoRenewingAndroid", purchase.isAutoRenewing)
                         }
                         items.pushMap(item)
@@ -329,15 +360,22 @@ class RNIapModule(
             promise
         ) { billingClient ->
             billingClient.queryPurchaseHistoryAsync(
-                if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
-            ) { billingResult, purchaseHistoryRecordList ->
+                QueryPurchaseHistoryParams.newBuilder().setProductType(
+                    if (type == "subs") BillingClient.ProductType.SUBS else BillingClient.ProductType.INAPP
+                ).build()
+            ) {
+                    billingResult: BillingResult, purchaseHistoryRecordList: MutableList<PurchaseHistoryRecord>? ->
+
                 if (!isValidResult(billingResult, promise)) return@queryPurchaseHistoryAsync
 
                 Log.d(TAG, purchaseHistoryRecordList.toString())
                 val items = Arguments.createArray()
                 purchaseHistoryRecordList?.forEach { purchase ->
                     val item = Arguments.createMap()
-                    item.putString("productId", purchase.skus[0])
+                    item.putString("productId", purchase.products[0])
+                    val products = Arguments.createArray()
+                    purchase.products.forEach { products.pushString(it) }
+                    item.putArray("productIds", products)
                     item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                     item.putString("transactionReceipt", purchase.originalJson)
                     item.putString("purchaseToken", purchase.purchaseToken)
@@ -354,11 +392,12 @@ class RNIapModule(
     @ReactMethod
     fun buyItemByType(
         type: String,
-        sku: String,
+        skuArr: ReadableArray,
         purchaseToken: String?,
-        prorationMode: Int?,
+        prorationMode: Int,
         obfuscatedAccountId: String?,
         obfuscatedProfileId: String?,
+        selectedOfferIndexArr: ReadableArray, // New optional parameter in V5
         promise: Promise
     ) {
         val activity = currentActivity
@@ -370,26 +409,42 @@ class RNIapModule(
             promise
         ) { billingClient ->
             DoobooUtils.instance.addPromiseForKey(
-                PROMISE_BUY_ITEM, promise
+                PROMISE_BUY_ITEM,
+                promise
             )
-            val builder = BillingFlowParams.newBuilder()
-            val selectedSku: SkuDetails? = skus[sku]
-            if (selectedSku == null) {
-                val debugMessage =
-                    "The sku was not found. Please fetch products first by calling getItems"
-                val error = Arguments.createMap()
-                error.putString("debugMessage", debugMessage)
-                error.putString("code", PROMISE_BUY_ITEM)
-                error.putString("message", debugMessage)
-                error.putString("productId", sku)
-                sendEvent(reactContext, "purchase-error", error)
-                promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
-                return@ensureConnection
+            val productParamsList =
+            skuArr.toArrayList().map { it.toString() }.mapIndexed{ index,sku ->
+                val selectedSku: ProductDetails? = skus[sku]
+                if (selectedSku == null) {
+                    val debugMessage =
+                        "The sku was not found. Please fetch products first by calling getItems"
+                    val error = Arguments.createMap()
+                    error.putString("debugMessage", debugMessage)
+                    error.putString("code", PROMISE_BUY_ITEM)
+                    error.putString("message", debugMessage)
+                    error.putString("productId", sku)
+                    sendEvent(reactContext, "purchase-error", error)
+                    promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
+                    return@ensureConnection
+                }
+                var productParams = BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(selectedSku)
+                val selectedOfferIndex = selectedOfferIndexArr.getInt(index)
+                if (selectedOfferIndex > -1 && (
+                    selectedSku.subscriptionOfferDetails?.size
+                        ?: 0
+                    ) > selectedOfferIndex
+                ) {
+                    val offerToken =
+                        selectedSku.subscriptionOfferDetails?.get(selectedOfferIndex)?.offerToken
+                    offerToken?.let { productParams = productParams.setOfferToken(offerToken) }
+                }
+                productParams.build()
             }
-            builder.setSkuDetails(selectedSku)
+            val builder = BillingFlowParams.newBuilder()
+            builder.setProductDetailsParamsList(productParamsList)
             val subscriptionUpdateParamsBuilder = SubscriptionUpdateParams.newBuilder()
             if (purchaseToken != null) {
-                subscriptionUpdateParamsBuilder.setOldSkuPurchaseToken(purchaseToken)
+                subscriptionUpdateParamsBuilder.setOldPurchaseToken(purchaseToken)
             }
             if (obfuscatedAccountId != null) {
                 builder.setObfuscatedAccountId(obfuscatedAccountId)
@@ -397,14 +452,14 @@ class RNIapModule(
             if (obfuscatedProfileId != null) {
                 builder.setObfuscatedProfileId(obfuscatedProfileId)
             }
-            if (prorationMode != null && prorationMode != -1) {
+            if (prorationMode != -1) {
                 if (prorationMode
                     == BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE
                 ) {
-                    subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode(
+                    subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_PRORATED_PRICE
                     )
-                    if (type != BillingClient.SkuType.SUBS) {
+                    if (type != BillingClient.ProductType.SUBS) {
                         val debugMessage =
                             (
                                 "IMMEDIATE_AND_CHARGE_PRORATED_PRICE for proration mode only works in" +
@@ -414,7 +469,7 @@ class RNIapModule(
                         error.putString("debugMessage", debugMessage)
                         error.putString("code", PROMISE_BUY_ITEM)
                         error.putString("message", debugMessage)
-                        error.putString("productId", sku)
+                        error.putArray("productIds", skuArr)
                         sendEvent(reactContext, "purchase-error", error)
                         promise.safeReject(PROMISE_BUY_ITEM, debugMessage)
                         return@ensureConnection
@@ -422,27 +477,27 @@ class RNIapModule(
                 } else if (prorationMode
                     == BillingFlowParams.ProrationMode.IMMEDIATE_WITHOUT_PRORATION
                 ) {
-                    subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode(
+                    subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.IMMEDIATE_WITHOUT_PRORATION
                     )
                 } else if (prorationMode == BillingFlowParams.ProrationMode.DEFERRED) {
-                    subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode(
+                    subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.DEFERRED
                     )
                 } else if (prorationMode
                     == BillingFlowParams.ProrationMode.IMMEDIATE_WITH_TIME_PRORATION
                 ) {
-                    subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode(
+                    subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.IMMEDIATE_WITHOUT_PRORATION
                     )
                 } else if (prorationMode
                     == BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_FULL_PRICE
                 ) {
-                    subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode(
+                    subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.IMMEDIATE_AND_CHARGE_FULL_PRICE
                     )
                 } else {
-                    subscriptionUpdateParamsBuilder.setReplaceSkusProrationMode(
+                    subscriptionUpdateParamsBuilder.setReplaceProrationMode(
                         BillingFlowParams.ProrationMode.UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY
                     )
                 }
@@ -452,7 +507,7 @@ class RNIapModule(
                 builder.setSubscriptionUpdateParams(subscriptionUpdateParams)
             }
             val flowParams = builder.build()
-            val billingResultCode = billingClient.launchBillingFlow(activity, flowParams)?.responseCode ?: BillingClient.BillingResponseCode.ERROR
+            val billingResultCode = billingClient.launchBillingFlow(activity, flowParams).responseCode
             if (billingResultCode == BillingClient.BillingResponseCode.OK) {
                 promise.safeResolve(true)
                 return@ensureConnection
@@ -516,6 +571,7 @@ class RNIapModule(
                     .getBillingResponseData(billingResult.responseCode)
                 map.putString("code", errorData[0])
                 map.putString("message", errorData[1])
+                map.putString("purchaseToken",purchaseToken)
                 promise.safeResolve(map)
             }
         }
@@ -536,11 +592,13 @@ class RNIapModule(
             return
         }
         if (purchases != null) {
-            var promiseItem: WritableMap? = null
-            for (i in purchases.indices) {
+            val promiseItems: WritableArray = Arguments.createArray()
+            purchases.forEach { purchase ->
                 val item = Arguments.createMap()
-                val purchase = purchases[i]
-                item.putString("productId", purchase.skus[0])
+                item.putString("productId", purchase.products[0])
+                val products = Arguments.createArray()
+                purchase.products.forEach { products.pushString(it) }
+                item.putArray("productIds", products)
                 item.putString("transactionId", purchase.orderId)
                 item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                 item.putString("transactionReceipt", purchase.originalJson)
@@ -563,13 +621,10 @@ class RNIapModule(
                         accountIdentifiers.obfuscatedProfileId
                     )
                 }
-                promiseItem = WritableNativeMap()
-                promiseItem.merge(item)
+                promiseItems.pushMap(item)
                 sendEvent(reactContext, "purchase-updated", item)
             }
-            if (promiseItem != null) {
-                DoobooUtils.instance.resolvePromisesForKey(PROMISE_BUY_ITEM, promiseItem)
-            }
+            DoobooUtils.instance.resolvePromisesForKey(PROMISE_BUY_ITEM, promiseItems)
         } else {
             val result = Arguments.createMap()
             result.putInt("responseCode", billingResult.responseCode)
@@ -588,10 +643,12 @@ class RNIapModule(
         ensureConnection(
             promise
         ) { billingClient ->
-            val types = arrayOf(BillingClient.SkuType.INAPP, BillingClient.SkuType.SUBS)
+            val types = arrayOf(BillingClient.ProductType.INAPP, BillingClient.ProductType.SUBS)
             for (type in types) {
                 billingClient.queryPurchasesAsync(
-                    type
+                    QueryPurchasesParams.newBuilder().setProductType(
+                        type
+                    ).build()
                 ) { billingResult: BillingResult, list: List<Purchase> ->
                     if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
 
@@ -642,6 +699,7 @@ class RNIapModule(
             override fun onHostPause() {}
             override fun onHostDestroy() {
                 billingClientCache?.endConnection()
+                billingClientCache = null
             }
         }
         reactContext.addLifecycleEventListener(lifecycleEventListener)