react-native-iap 8.2.1 → 8.4.0

package/RNIap.podspec

@@ -11,6 +11,11 @@ Pod::Spec.new do |s|
   s.platforms     = { :ios => "9.0", :tvos => "9.0" }
   s.source        = { :git => "https://github.com/dooboolab/react-native-iap.git", :tag => "#{s.version}" }
   s.source_files  = "ios/*.{h,m,swift}"
+  s.script_phase = {
+    :name => 'Copy Swift Header',
+    :script => 'ditto "${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h" "${PODS_ROOT}/Headers/Public/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}-Swift.h"',
+    :execution_position => :after_compile 
+  }
   s.swift_version = "4.2"
   s.requires_arc  = true
 

package/android/build.gradle

@@ -66,7 +66,7 @@ repositories {
 
 dependencies {
   implementation 'com.facebook.react:react-native:+'
-  testImplementation 'junit:junit:4.12'
+  testImplementation 'junit:junit:4.13.1'
   testImplementation "io.mockk:mockk:1.12.4"
   playImplementation 'com.android.billingclient:billing:4.0.0'
   def playServicesVersion = safeExtGet('playServicesVersion', DEFAULT_PLAY_SERVICES_VERSION)

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

@@ -2,6 +2,7 @@ package com.dooboolab.RNIap
 
 import com.amazon.device.iap.PurchasingService
 import com.amazon.device.iap.model.FulfillmentResult
+import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -10,9 +11,8 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.WritableNativeArray
 import java.util.HashSet
 
-class RNIapAmazonModule(reactContext: ReactApplicationContext?) :
+class RNIapAmazonModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
-    val TAG = "RNIapAmazonModule"
     override fun getName(): String {
         return TAG
     }
@@ -127,5 +127,23 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext?) :
         const val PROMISE_QUERY_PURCHASES = "PROMISE_QUERY_PURCHASES"
         const val PROMISE_QUERY_AVAILABLE_ITEMS = "PROMISE_QUERY_AVAILABLE_ITEMS"
         const val PROMISE_GET_USER_DATA = "PROMISE_GET_USER_DATA"
+
+        const val TAG = "RNIapAmazonModule"
+    }
+    init {
+        val lifecycleEventListener: LifecycleEventListener = object : LifecycleEventListener {
+            /**
+             * From https://developer.amazon.com/docs/in-app-purchasing/iap-implement-iap.html#getpurchaseupdates-responses
+             * We should fetch updates on resume
+             */
+            override fun onHostResume() {
+                PurchasingService.getUserData()
+                PurchasingService.getPurchaseUpdates(false)
+            }
+            override fun onHostPause() {}
+            override fun onHostDestroy() {
+            }
+        }
+        reactContext.addLifecycleEventListener(lifecycleEventListener)
     }
 }

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

@@ -22,6 +22,7 @@ import com.facebook.react.bridge.ReactContext
 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.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
@@ -39,21 +40,30 @@ class RNIapModule(
     ReactContextBaseJavaModule(reactContext),
     PurchasesUpdatedListener {
 
-    private var billingClient: BillingClient = builder.setListener(this).build()
+    private var billingClientCache: BillingClient? = null
     private val skus: MutableMap<String, SkuDetails> = mutableMapOf()
     override fun getName(): String {
-        return "RNIapModule"
+        return TAG
     }
 
-    internal fun ensureConnection(promise: Promise, callback: () -> Unit) {
-        if (billingClient.isReady) {
-            callback()
+    internal fun ensureConnection(
+        promise: Promise,
+        callback: (billingClient: BillingClient) -> Unit
+    ) {
+        val billingClient = billingClientCache
+        if (billingClient?.isReady == true) {
+            callback(billingClient)
             return
         } else {
             val nested = PromiseImpl(
                 {
                     if (it.isNotEmpty() && it[0] is Boolean && it[0] as Boolean) {
-                        callback()
+                        val connectedBillingClient = billingClientCache
+                        if (connectedBillingClient?.isReady == true) {
+                            callback(connectedBillingClient)
+                        } else {
+                            promise.safeReject(DoobooUtils.E_NOT_PREPARED, "Unable to auto-initialize connection")
+                        }
                     } else {
                         Log.i(TAG, "Incorrect parameter in resolve")
                     }
@@ -74,14 +84,6 @@ class RNIapModule(
 
     @ReactMethod
     fun initConnection(promise: Promise) {
-        if (billingClient.isReady) {
-            Log.i(
-                TAG,
-                "Already initialized, you should only call initConnection() once when your app starts"
-            )
-            promise.safeResolve(true)
-            return
-        }
         if (googleApiAvailability.isGooglePlayServicesAvailable(reactContext)
             != ConnectionResult.SUCCESS
         ) {
@@ -90,30 +92,35 @@ class RNIapModule(
             return
         }
 
-        billingClient = builder.setListener(this).build()
-
-        billingClient.startConnection(
-            object : BillingClientStateListener {
-                override fun onBillingSetupFinished(billingResult: BillingResult) {
-                    val responseCode = billingResult.responseCode
+        if (billingClientCache?.isReady == true) {
+            Log.i(
+                TAG,
+                "Already initialized, you should only call initConnection() once when your app starts"
+            )
+            promise.safeResolve(true)
+            return
+        }
+        builder.setListener(this).build().also {
+            billingClientCache = it
+            it.startConnection(
+                object : BillingClientStateListener {
+                    override fun onBillingSetupFinished(billingResult: BillingResult) {
+                        if (!isValidResult(billingResult, promise)) return
 
-                    if (responseCode == BillingClient.BillingResponseCode.OK) {
                         promise.safeResolve(true)
-                    } else {
-                        PlayUtils.instance
-                            .rejectPromiseWithBillingError(promise, responseCode)
                     }
-                }
 
-                override fun onBillingServiceDisconnected() {
-                    Log.i(TAG, "Billing service disconnected")
-                }
-            })
+                    override fun onBillingServiceDisconnected() {
+                        Log.i(TAG, "Billing service disconnected")
+                    }
+                })
+        }
     }
 
     @ReactMethod
     fun endConnection(promise: Promise) {
-        billingClient.endConnection()
+        billingClientCache?.endConnection()
+        billingClientCache = null
         promise.safeResolve(true)
     }
 
@@ -125,7 +132,7 @@ class RNIapModule(
         for (purchase in purchases) {
             ensureConnection(
                 promise
-            ) {
+            ) { billingClient ->
                 val consumeParams =
                     ConsumeParams.newBuilder().setPurchaseToken(purchase.purchaseToken)
                         .build()
@@ -151,10 +158,11 @@ class RNIapModule(
     fun flushFailedPurchasesCachedAsPending(promise: Promise) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             billingClient.queryPurchasesAsync(
                 BillingClient.SkuType.INAPP
-            ) { _: BillingResult?, list: List<Purchase>? ->
+            ) { billingResult: BillingResult, list: List<Purchase>? ->
+                if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 if (list == null) {
                     // No purchases found
                     promise.safeResolve(false)
@@ -178,97 +186,109 @@ 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>()
             for (i in 0 until skuArr.size()) {
-                val sku = skuArr.getString(i)
-                if (sku is String) {
+                if (skuArr.getType(i) == ReadableType.String) {
+                    val sku = skuArr.getString(i)
                     skuList.add(sku)
                 }
             }
             val params = SkuDetailsParams.newBuilder()
-            params.setSkusList(skuList).setType(type!!)
+            params.setSkusList(skuList).setType(type)
             billingClient.querySkuDetailsAsync(
                 params.build()
             ) { billingResult: BillingResult, skuDetailsList: List<SkuDetails>? ->
-                Log.d(TAG, "responseCode: " + billingResult.responseCode)
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                    return@querySkuDetailsAsync
-                }
+                if (!isValidResult(billingResult, promise)) return@querySkuDetailsAsync
+
+                val items = Arguments.createArray()
                 if (skuDetailsList != null) {
-                    for (sku in skuDetailsList) {
-                        skus[sku.sku] = sku
+                    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()
+                        )
+                        item.putString(
+                            "introductoryPricePeriodAndroid", skuDetails.introductoryPricePeriod
+                        )
+                        item.putString(
+                            "introductoryPriceAsAmountAndroid", introductoryPriceAsAmountAndroid
+                        )
+                        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 items = WritableNativeArray()
-                for (skuDetails in skuDetailsList!!) {
-                    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()
-                    )
-                    item.putString(
-                        "introductoryPricePeriodAndroid", skuDetails.introductoryPricePeriod
-                    )
-                    item.putString(
-                        "introductoryPriceAsAmountAndroid", introductoryPriceAsAmountAndroid
-                    )
-                    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)
-                }
                 promise.safeResolve(items)
             }
         }
     }
 
+    /**
+     * Rejects promise with billing code if BillingResult is not OK
+     */
+    private fun isValidResult(
+        billingResult: BillingResult,
+        promise: Promise
+    ): Boolean {
+        Log.d(TAG, "responseCode: " + billingResult.responseCode)
+        if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
+            PlayUtils.instance
+                .rejectPromiseWithBillingError(promise, billingResult.responseCode)
+            return false
+        }
+        return true
+    }
+
     @ReactMethod
     fun getAvailableItemsByType(type: String, promise: Promise) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             val items = WritableNativeArray()
             billingClient.queryPurchasesAsync(
                 if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
-            ) { billingResult: BillingResult?, purchases: List<Purchase>? ->
+            ) { billingResult: BillingResult, purchases: List<Purchase>? ->
+                if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
                 if (purchases != null) {
                     for (i in purchases.indices) {
                         val purchase = purchases[i]
@@ -286,11 +306,11 @@ class RNIapModule(
                         item.putString("packageNameAndroid", purchase.packageName)
                         item.putString(
                             "obfuscatedAccountIdAndroid",
-                            purchase.accountIdentifiers!!.obfuscatedAccountId
+                            purchase.accountIdentifiers?.obfuscatedAccountId
                         )
                         item.putString(
                             "obfuscatedProfileIdAndroid",
-                            purchase.accountIdentifiers!!.obfuscatedProfileId
+                            purchase.accountIdentifiers?.obfuscatedProfileId
                         )
                         if (type == BillingClient.SkuType.SUBS) {
                             item.putBoolean("autoRenewingAndroid", purchase.isAutoRenewing)
@@ -307,20 +327,16 @@ class RNIapModule(
     fun getPurchaseHistoryByType(type: String, promise: Promise) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             billingClient.queryPurchaseHistoryAsync(
                 if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
             ) { billingResult, purchaseHistoryRecordList ->
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                    return@queryPurchaseHistoryAsync
-                }
+                if (!isValidResult(billingResult, promise)) return@queryPurchaseHistoryAsync
+
                 Log.d(TAG, purchaseHistoryRecordList.toString())
                 val items = Arguments.createArray()
-                for (i in purchaseHistoryRecordList!!.indices) {
+                purchaseHistoryRecordList?.forEach { purchase ->
                     val item = Arguments.createMap()
-                    val purchase = purchaseHistoryRecordList[i]
                     item.putString("productId", purchase.skus[0])
                     item.putDouble("transactionDate", purchase.purchaseTime.toDouble())
                     item.putString("transactionReceipt", purchase.originalJson)
@@ -352,7 +368,7 @@ class RNIapModule(
         }
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             DoobooUtils.instance.addPromiseForKey(
                 PROMISE_BUY_ITEM, promise
             )
@@ -436,32 +452,36 @@ class RNIapModule(
                 builder.setSubscriptionUpdateParams(subscriptionUpdateParams)
             }
             val flowParams = builder.build()
-            val billingResult = billingClient.launchBillingFlow(activity, flowParams)
-            val errorData: Array<String?> =
-                PlayUtils.instance.getBillingResponseData(billingResult.responseCode)
+            val billingResultCode = billingClient.launchBillingFlow(activity, flowParams)?.responseCode ?: BillingClient.BillingResponseCode.ERROR
+            if (billingResultCode == BillingClient.BillingResponseCode.OK) {
+                promise.safeResolve(true)
+                return@ensureConnection
+            } else {
+                val errorData: Array<String?> =
+                    PlayUtils.instance.getBillingResponseData(billingResultCode)
+                promise.safeReject(errorData[0], errorData[1])
+            }
         }
     }
 
     @ReactMethod
     fun acknowledgePurchase(
-        token: String?,
+        token: String,
         developerPayLoad: String?,
         promise: Promise
     ) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             val acknowledgePurchaseParams =
                 AcknowledgePurchaseParams.newBuilder().setPurchaseToken(
-                    token!!
+                    token
                 ).build()
             billingClient.acknowledgePurchase(
                 acknowledgePurchaseParams
             ) { billingResult: BillingResult ->
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                }
+                if (!isValidResult(billingResult, promise)) return@acknowledgePurchase
+
                 val map = Arguments.createMap()
                 map.putInt("responseCode", billingResult.responseCode)
                 map.putString("debugMessage", billingResult.debugMessage)
@@ -476,21 +496,18 @@ class RNIapModule(
 
     @ReactMethod
     fun consumeProduct(
-        token: String?,
+        token: String,
         developerPayLoad: String?,
         promise: Promise
     ) {
-        val params = ConsumeParams.newBuilder().setPurchaseToken(token!!).build()
+        val params = ConsumeParams.newBuilder().setPurchaseToken(token).build()
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             billingClient.consumeAsync(
                 params
             ) { billingResult: BillingResult, purchaseToken: String? ->
-                if (billingResult.responseCode != BillingClient.BillingResponseCode.OK) {
-                    PlayUtils.instance
-                        .rejectPromiseWithBillingError(promise, billingResult.responseCode)
-                }
+                if (!isValidResult(billingResult, promise)) return@consumeAsync
 
                 val map = Arguments.createMap()
                 map.putInt("responseCode", billingResult.responseCode)
@@ -570,19 +587,15 @@ class RNIapModule(
     private fun sendUnconsumedPurchases(promise: Promise) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             val types = arrayOf(BillingClient.SkuType.INAPP, BillingClient.SkuType.SUBS)
             for (type in types) {
                 billingClient.queryPurchasesAsync(
                     type
-                ) { billingResult: BillingResult, list: List<Purchase>? ->
-                    val unacknowledgedPurchases = ArrayList<Purchase>()
+                ) { billingResult: BillingResult, list: List<Purchase> ->
+                    if (!isValidResult(billingResult, promise)) return@queryPurchasesAsync
 
-                    for (purchase in list!!) {
-                        if (!purchase.isAcknowledged) {
-                            unacknowledgedPurchases.add(purchase)
-                        }
-                    }
+                    val unacknowledgedPurchases = list.filter { !it.isAcknowledged }
                     onPurchasesUpdated(billingResult, unacknowledgedPurchases)
                 }
             }
@@ -605,9 +618,8 @@ class RNIapModule(
         // Keep: Required for RN built-in Event Emitter Calls.
     }
 
-    @get:ReactMethod
-    val packageName: String
-        get() = reactApplicationContext.packageName
+    @ReactMethod
+    fun getPackageName(promise: Promise) = promise.resolve(reactApplicationContext.packageName)
 
     private fun sendEvent(
         reactContext: ReactContext,
@@ -629,7 +641,7 @@ class RNIapModule(
             override fun onHostResume() {}
             override fun onHostPause() {}
             override fun onHostDestroy() {
-                billingClient.endConnection()
+                billingClientCache?.endConnection()
             }
         }
         reactContext.addLifecycleEventListener(lifecycleEventListener)

package/android/src/testPlay/java/com/dooboolab/RNIap/RNIapModuleTest.kt

@@ -6,16 +6,26 @@ import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.ConsumeResponseListener
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesResponseListener
+import com.android.billingclient.api.SkuDetailsResponseListener
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+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.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.runs
 import io.mockk.slot
 import io.mockk.verify
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -24,10 +34,13 @@ class RNIapModuleTest {
 
     @MockK
     lateinit var context: ReactApplicationContext
+
     @MockK
     lateinit var builder: BillingClient.Builder
+
     @MockK
     lateinit var billingClient: BillingClient
+
     @MockK
     lateinit var availability: GoogleApiAvailability
 
@@ -43,9 +56,13 @@ class RNIapModuleTest {
 
     @Test
     fun `initConnection Already connected should resolve to true`() {
+        every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
+        module.initConnection(mockk())
+
         every { billingClient.isReady } returns true
-        val promise = mockk<Promise>(relaxed = true)
 
+        val promise = mockk<Promise>(relaxed = true)
+        // Already connected
         module.initConnection(promise)
         verify(exactly = 0) { promise.reject(any(), any<String>()) }
         verify { promise.resolve(true) }
@@ -67,7 +84,10 @@ class RNIapModuleTest {
         every { billingClient.isReady } returns false
         val listener = slot<BillingClientStateListener>()
         every { billingClient.startConnection(capture(listener)) } answers {
-            listener.captured.onBillingSetupFinished(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK).build())
+            listener.captured.onBillingSetupFinished(
+                BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK)
+                    .build()
+            )
         }
         every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         val promise = mockk<Promise>(relaxed = true)
@@ -82,7 +102,10 @@ class RNIapModuleTest {
         every { billingClient.isReady } returns false
         val listener = slot<BillingClientStateListener>()
         every { billingClient.startConnection(capture(listener)) } answers {
-            listener.captured.onBillingSetupFinished(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ERROR).build())
+            listener.captured.onBillingSetupFinished(
+                BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ERROR)
+                    .build()
+            )
         }
         every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         val promise = mockk<Promise>(relaxed = true)
@@ -94,8 +117,10 @@ class RNIapModuleTest {
 
     @Test
     fun `endConnection resolves`() {
+        every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         val promise = mockk<Promise>(relaxed = true)
 
+        module.initConnection(mockk())
         module.endConnection(promise)
 
         verify { billingClient.endConnection() }
@@ -105,12 +130,14 @@ class RNIapModuleTest {
 
     @Test
     fun `flushFailedPurchasesCachedAsPending resolves to false if no pending purchases`() {
+        every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         every { billingClient.isReady } returns true
         val promise = mockk<Promise>(relaxed = true)
         val listener = slot<PurchasesResponseListener>()
         every { billingClient.queryPurchasesAsync(any(), capture(listener)) } answers {
             listener.captured.onQueryPurchasesResponse(BillingResult.newBuilder().build(), listOf())
         }
+        module.initConnection(mockk())
         module.flushFailedPurchasesCachedAsPending(promise)
 
         verify(exactly = 0) { promise.reject(any(), any<String>()) }
@@ -119,6 +146,7 @@ class RNIapModuleTest {
 
     @Test
     fun `flushFailedPurchasesCachedAsPending resolves to true if pending purchases`() {
+        every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         every { billingClient.isReady } returns true
         val promise = mockk<Promise>(relaxed = true)
         val listener = slot<PurchasesResponseListener>()
@@ -137,9 +165,13 @@ class RNIapModuleTest {
         }
         val consumeListener = slot<ConsumeResponseListener>()
         every { billingClient.consumeAsync(any(), capture(consumeListener)) } answers {
-            consumeListener.captured.onConsumeResponse(BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.ITEM_NOT_OWNED).build(), "")
+            consumeListener.captured.onConsumeResponse(
+                BillingResult.newBuilder()
+                    .setResponseCode(BillingClient.BillingResponseCode.ITEM_NOT_OWNED).build(),
+                ""
+            )
         }
-
+        module.initConnection(mockk())
         module.flushFailedPurchasesCachedAsPending(promise)
 
         verify(exactly = 0) { promise.reject(any(), any<String>()) }
@@ -151,12 +183,20 @@ class RNIapModuleTest {
         every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
         val promise = mockk<Promise>(relaxed = true)
         var isCallbackCalled = false
-        val callback = {
+        val callback = { _: BillingClient ->
             isCallbackCalled = true
             promise.resolve(true)
         }
 
-        every { billingClient.isReady } returns false andThen true
+        every { billingClient.isReady } returns true
+        val listener = slot<BillingClientStateListener>()
+        every { billingClient.startConnection(capture(listener)) } answers {
+            listener.captured.onBillingSetupFinished(
+                BillingResult.newBuilder().setResponseCode(BillingClient.BillingResponseCode.OK)
+                    .build()
+            )
+        }
+
         module.ensureConnection(promise, callback)
         verify { promise.resolve(true) } // at least one pending transactions
         assertTrue("Should call callback", isCallbackCalled)
@@ -164,6 +204,57 @@ class RNIapModuleTest {
 
     @Test
     fun getItemsByType() {
+        every { availability.isGooglePlayServicesAvailable(any()) } returns ConnectionResult.SUCCESS
+        every { billingClient.isReady } returns true
+        val promise = mockk<Promise>(relaxed = true)
+        val listener = slot<SkuDetailsResponseListener>()
+        every { billingClient.querySkuDetailsAsync(any(), capture(listener)) } answers {
+            listener.captured.onSkuDetailsResponse(
+                BillingResult.newBuilder().build(),
+                listOf(
+                    mockk {
+                        every { sku } returns "sku1"
+                        every { introductoryPriceAmountMicros } returns 0
+                        every { priceAmountMicros } returns 1
+                        every { priceCurrencyCode } returns "USD"
+                        every { type } returns "sub"
+                        every { price } returns "$10.0"
+                        every { title } returns "My product"
+                        every { description } returns "My desc"
+                        every { introductoryPrice } returns "$5.0"
+                        every { zzc() } returns "com.mypackage"
+                        every { originalPrice } returns "$13.0"
+                        every { subscriptionPeriod } returns "3 months"
+                        every { freeTrialPeriod } returns "1 week"
+                        every { introductoryPriceCycles } returns 1
+                        every { introductoryPricePeriod } returns "1"
+                        every { iconUrl } returns "http://myicon.com/icon"
+                        every { originalJson } returns "{}"
+                        every { originalPriceAmountMicros } returns 2
+                    }
+                )
+            )
+        }
+        val skus = mockk<ReadableArray>() {
+            every { size() } returns 1
+            every { getString(0) } returns "sku0"
+            every { getType(0) } returns ReadableType.String
+        }
+        mockkStatic(Arguments::class)
+
+        val itemsMap = mockk<WritableMap>()
+        val itemsArr = mockk<WritableArray>()
+        every { Arguments.createMap() } returns itemsMap
+        every { Arguments.createArray() } returns itemsArr
+        every { itemsMap.putString(any(), any()) } just runs
+        var itemsSize = 0
+        every { itemsArr.pushMap(any()) } answers {
+            itemsSize++
+        }
+        module.initConnection(mockk())
+        module.getItemsByType("subs", skus, promise)
+        verify { promise.resolve(any()) }
+        assertEquals(itemsSize, 1)
     }
 
     @Test

package/ios/RNIapIos.m

@@ -18,6 +18,7 @@ RCT_EXTERN_METHOD(getAvailableItems:
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(buyProduct:
                   (NSString*)sku
+                  appAccountToken:(NSString*)appAccountToken
                   andDangerouslyFinishTransactionAutomatically:(BOOL)andDangerouslyFinishTransactionAutomatically
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)

package/ios/RNIapIos.swift

@@ -178,6 +178,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     
     @objc public func buyProduct(
         _ sku:String,
+        appAccountToken:String,
         andDangerouslyFinishTransactionAutomatically: Bool,
         resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
@@ -197,6 +198,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
             addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
             
             let payment = SKMutablePayment(product: prod)
+            payment.applicationUsername = appAccountToken 
             SKPaymentQueue.default().add(payment)
         } else{
             if hasListeners {
@@ -341,7 +343,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
         print("\n\n\n  ***  get promoted product. \n\n.")
-        resolve(promotedProduct )
+        resolve((promotedProduct != nil) ? getProductObject(promotedProduct!) : nil)
     }
     
     @objc public func  buyPromotedProduct(

package/ios/RNIapQueue.swift

@@ -10,12 +10,13 @@ import StoreKit
 
 // Temporarily stores payment information since it is sent by the OS before RN instantiates the RNModule
 @objc(RNIapQueue)
-class RNIapQueue: NSObject, SKPaymentTransactionObserver {
-    func paymentQueue(_ queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
+public class RNIapQueue: NSObject, SKPaymentTransactionObserver {
+    public func paymentQueue(_ queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
         //No-op
     }
     
-    static let shared = RNIapQueue()
+    @objc
+    public static let shared = RNIapQueue()
     
     var queue: SKPaymentQueue? = nil;
     var payment: SKPayment? = nil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "8.2.1",
+  "version": "8.4.0",
   "packageManager": "yarn@3.2.0",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",

package/src/hooks/useIAP.d.ts

@@ -9,6 +9,7 @@ declare type IAP_STATUS = {
     availablePurchases: Purchase[];
     currentPurchase?: Purchase;
     currentPurchaseError?: PurchaseError;
+    initConnectionError?: Error;
     finishTransaction: (purchase: Purchase, isConsumable?: boolean, developerPayloadAndroid?: string) => Promise<string | void>;
     getAvailablePurchases: () => Promise<void>;
     getPurchaseHistories: () => Promise<void>;

package/src/hooks/useIAP.js

@@ -39,7 +39,7 @@ import { useCallback } from 'react';
 import { useIAPContext } from './withIAPContext';
 export function useIAP() {
     var _this = this;
-    var _a = useIAPContext(), connected = _a.connected, products = _a.products, promotedProductsIOS = _a.promotedProductsIOS, subscriptions = _a.subscriptions, purchaseHistories = _a.purchaseHistories, availablePurchases = _a.availablePurchases, currentPurchase = _a.currentPurchase, currentPurchaseError = _a.currentPurchaseError, setProducts = _a.setProducts, setSubscriptions = _a.setSubscriptions, setAvailablePurchases = _a.setAvailablePurchases, setPurchaseHistories = _a.setPurchaseHistories, setCurrentPurchase = _a.setCurrentPurchase, setCurrentPurchaseError = _a.setCurrentPurchaseError;
+    var _a = useIAPContext(), connected = _a.connected, products = _a.products, promotedProductsIOS = _a.promotedProductsIOS, subscriptions = _a.subscriptions, purchaseHistories = _a.purchaseHistories, availablePurchases = _a.availablePurchases, currentPurchase = _a.currentPurchase, currentPurchaseError = _a.currentPurchaseError, initConnectionError = _a.initConnectionError, setProducts = _a.setProducts, setSubscriptions = _a.setSubscriptions, setAvailablePurchases = _a.setAvailablePurchases, setPurchaseHistories = _a.setPurchaseHistories, setCurrentPurchase = _a.setCurrentPurchase, setCurrentPurchaseError = _a.setCurrentPurchaseError;
     var getProducts = useCallback(function (skus) { return __awaiter(_this, void 0, void 0, function () {
         var _a;
         return __generator(this, function (_b) {
@@ -129,6 +129,7 @@ export function useIAP() {
         availablePurchases: availablePurchases,
         currentPurchase: currentPurchase,
         currentPurchaseError: currentPurchaseError,
+        initConnectionError: initConnectionError,
         finishTransaction: finishTransaction,
         getProducts: getProducts,
         getSubscriptions: getSubscriptions,

package/src/hooks/withIAPContext.d.ts

@@ -9,6 +9,7 @@ declare type IAPContextType = {
     availablePurchases: Purchase[];
     currentPurchase?: Purchase;
     currentPurchaseError?: PurchaseError;
+    initConnectionError?: Error;
     setProducts: (products: Product[]) => void;
     setSubscriptions: (subscriptions: Subscription[]) => void;
     setPurchaseHistories: (purchaseHistories: Purchase[]) => void;

package/src/hooks/withIAPContext.js

@@ -68,6 +68,7 @@ export function withIAPContext(Component) {
         var _f = useState([]), availablePurchases = _f[0], setAvailablePurchases = _f[1];
         var _g = useState(), currentPurchase = _g[0], setCurrentPurchase = _g[1];
         var _h = useState(), currentPurchaseError = _h[0], setCurrentPurchaseError = _h[1];
+        var _j = useState(), initConnectionError = _j[0], setInitConnectionError = _j[1];
         var context = useMemo(function () { return ({
             connected: connected,
             products: products,
@@ -77,6 +78,7 @@ export function withIAPContext(Component) {
             availablePurchases: availablePurchases,
             currentPurchase: currentPurchase,
             currentPurchaseError: currentPurchaseError,
+            initConnectionError: initConnectionError,
             setProducts: setProducts,
             setSubscriptions: setSubscriptions,
             setPurchaseHistories: setPurchaseHistories,
@@ -92,6 +94,7 @@ export function withIAPContext(Component) {
             availablePurchases,
             currentPurchase,
             currentPurchaseError,
+            initConnectionError,
             setProducts,
             setSubscriptions,
             setPurchaseHistories,
@@ -100,7 +103,12 @@ export function withIAPContext(Component) {
             setCurrentPurchaseError,
         ]);
         useEffect(function () {
-            initConnection().then(setConnected);
+            initConnection()
+                .then(function (value) {
+                setInitConnectionError(undefined);
+                setConnected(value);
+            })
+                .catch(setInitConnectionError);
         }, []);
         useEffect(function () {
             if (!connected) {

package/src/iap.d.ts

@@ -44,12 +44,13 @@ export declare const getAvailablePurchases: () => Promise<(InAppPurchase | Subsc
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID
+ * @param {string} [appAccountToken] The purchaser's user ID
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
  * @returns {Promise<InAppPurchase>}
  */
-export declare const requestPurchase: (sku: string, andDangerouslyFinishTransactionAutomaticallyIOS?: boolean, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined) => Promise<InAppPurchase>;
+export declare const requestPurchase: (sku: string, appAccountToken: string, andDangerouslyFinishTransactionAutomaticallyIOS?: boolean, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined) => Promise<InAppPurchase>;
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} [sku] The product's sku/ID

package/src/iap.js

@@ -135,13 +135,13 @@ var fillProductsAdditionalData = function (products) { return __awaiter(void 0,
 export var getProducts = function (skus) {
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
-            var items;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getIosModule().getItems(skus)];
-                    case 1:
-                        items = _a.sent();
-                        return [2 /*return*/, items.filter(function (item) { return skus.includes(item.productId); })];
+                    case 0: return [4 /*yield*/, getIosModule()
+                            .getItems(skus)
+                            .filter(function (item) { return skus.includes(item.productId); })
+                            .filter(function (item) { return item.type === 'iap'; })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         }); },
@@ -166,15 +166,13 @@ export var getProducts = function (skus) {
 export var getSubscriptions = function (skus) {
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
-            var items;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, getIosModule().getItems(skus)];
-                    case 1:
-                        items = _a.sent();
-                        return [2 /*return*/, items.filter(function (item) {
-                                return skus.includes(item.productId);
-                            })];
+                    case 0: return [4 /*yield*/, getIosModule()
+                            .getItems(skus)
+                            .filter(function (item) { return skus.includes(item.productId); })
+                            .filter(function (item) { return item.type === 'subs'; })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         }); },
@@ -256,12 +254,13 @@ export var getAvailablePurchases = function () {
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID
+ * @param {string} [appAccountToken] The purchaser's user ID
  * @param {boolean} [andDangerouslyFinishTransactionAutomaticallyIOS] You should set this to false and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.
  * @param {string} [obfuscatedAccountIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
  * @returns {Promise<InAppPurchase>}
  */
-export var requestPurchase = function (sku, andDangerouslyFinishTransactionAutomaticallyIOS, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid) {
+export var requestPurchase = function (sku, appAccountToken, andDangerouslyFinishTransactionAutomaticallyIOS, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid) {
     if (andDangerouslyFinishTransactionAutomaticallyIOS === void 0) { andDangerouslyFinishTransactionAutomaticallyIOS = false; }
     if (obfuscatedAccountIdAndroid === void 0) { obfuscatedAccountIdAndroid = undefined; }
     if (obfuscatedProfileIdAndroid === void 0) { obfuscatedProfileIdAndroid = undefined; }
@@ -274,7 +273,7 @@ export var requestPurchase = function (sku, andDangerouslyFinishTransactionAutom
                     // eslint-disable-next-line max-len
                     'You are dangerously allowing react-native-iap to finish your transaction automatically. You should set andDangerouslyFinishTransactionAutomatically to false when calling requestPurchase and call finishTransaction manually when you have delivered the purchased goods to the user. It defaults to true to provide backwards compatibility. Will default to false in version 4.0.0.');
                 }
-                return [2 /*return*/, getIosModule().buyProduct(sku, andDangerouslyFinishTransactionAutomaticallyIOS)];
+                return [2 /*return*/, getIosModule().buyProduct(sku, appAccountToken, andDangerouslyFinishTransactionAutomaticallyIOS)];
             });
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -400,10 +399,19 @@ export var acknowledgePurchaseAndroid = function (token, developerPayload) {
  * @param {string} sku The product's SKU (on Android)
  * @returns {Promise<void>}
  */
-export var deepLinkToSubscriptionsAndroid = function (sku) {
-    checkNativeAndroidAvailable();
-    return Linking.openURL("https://play.google.com/store/account/subscriptions?package=".concat(RNIapModule.getPackageName(), "&sku=").concat(sku));
-};
+export var deepLinkToSubscriptionsAndroid = function (sku) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                checkNativeAndroidAvailable();
+                _b = (_a = Linking).openURL;
+                _c = "https://play.google.com/store/account/subscriptions?package=".concat;
+                return [4 /*yield*/, RNIapModule.getPackageName()];
+            case 1: return [2 /*return*/, _b.apply(_a, [_c.apply("https://play.google.com/store/account/subscriptions?package=", [_d.sent(), "&sku="]).concat(sku)])];
+        }
+    });
+}); };
 /**
  * Should Add Store Payment (iOS only)
  *   Indicates the the App Store purchase should continue from the app instead of the App Store.

package/src/types/index.d.ts

@@ -35,6 +35,8 @@ export declare enum InstallSourceAndroid {
     AMAZON = 2
 }
 export interface ProductCommon {
+    type: 'subs' | 'sub' | 'inapp' | 'iap';
+    productId: string;
     title: string;
     description: string;
     price: string;
@@ -96,11 +98,9 @@ export interface Discount {
 }
 export interface Product extends ProductCommon {
     type: 'inapp' | 'iap';
-    productId: string;
 }
 export interface Subscription extends ProductCommon {
     type: 'subs' | 'sub';
-    productId: string;
     discounts?: Discount[];
     introductoryPrice?: string;
     introductoryPriceAsAmountIOS?: string;