react-native-iap 8.2.2 → 8.3.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/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 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,25 +92,35 @@ class RNIapModule(
             return
         }
 
-        billingClient = builder.setListener(this).build()
-
-        billingClient.startConnection(
-            object : BillingClientStateListener {
-                override fun onBillingSetupFinished(billingResult: BillingResult) {
-                    if (!isValidResult(billingResult, promise)) return
+        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
 
-                    promise.safeResolve(true)
-                }
+                        promise.safeResolve(true)
+                    }
 
-                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)
     }
 
@@ -120,7 +132,7 @@ class RNIapModule(
         for (purchase in purchases) {
             ensureConnection(
                 promise
-            ) {
+            ) { billingClient ->
                 val consumeParams =
                     ConsumeParams.newBuilder().setPurchaseToken(purchase.purchaseToken)
                         .build()
@@ -146,7 +158,7 @@ class RNIapModule(
     fun flushFailedPurchasesCachedAsPending(promise: Promise) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             billingClient.queryPurchasesAsync(
                 BillingClient.SkuType.INAPP
             ) { billingResult: BillingResult, list: List<Purchase>? ->
@@ -177,11 +189,11 @@ class RNIapModule(
     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)
                 }
             }
@@ -192,61 +204,60 @@ class RNIapModule(
             ) { billingResult: BillingResult, skuDetailsList: List<SkuDetails>? ->
                 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 = Arguments.createArray()
-                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)
             }
         }
@@ -272,7 +283,7 @@ class RNIapModule(
     fun getAvailableItemsByType(type: String, promise: Promise) {
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             val items = WritableNativeArray()
             billingClient.queryPurchasesAsync(
                 if (type == "subs") BillingClient.SkuType.SUBS else BillingClient.SkuType.INAPP
@@ -295,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)
@@ -316,7 +327,7 @@ 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 ->
@@ -357,7 +368,7 @@ class RNIapModule(
         }
         ensureConnection(
             promise
-        ) {
+        ) { billingClient ->
             DoobooUtils.instance.addPromiseForKey(
                 PROMISE_BUY_ITEM, promise
             )
@@ -441,13 +452,13 @@ class RNIapModule(
                 builder.setSubscriptionUpdateParams(subscriptionUpdateParams)
             }
             val flowParams = builder.build()
-            val billingResult = billingClient.launchBillingFlow(activity, flowParams)
-            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+            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(billingResult.responseCode)
+                    PlayUtils.instance.getBillingResponseData(billingResultCode)
                 promise.safeReject(errorData[0], errorData[1])
             }
         }
@@ -455,16 +466,16 @@ class RNIapModule(
 
     @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
@@ -485,14 +496,14 @@ 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? ->
@@ -576,7 +587,7 @@ 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(
@@ -607,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,
@@ -631,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

@@ -11,6 +11,7 @@ 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
@@ -55,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) }
@@ -112,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() }
@@ -123,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>()) }
@@ -137,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>()
@@ -161,7 +171,7 @@ class RNIapModuleTest {
                 ""
             )
         }
-
+        module.initConnection(mockk())
         module.flushFailedPurchasesCachedAsPending(promise)
 
         verify(exactly = 0) { promise.reject(any(), any<String>()) }
@@ -173,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)
@@ -186,6 +204,7 @@ 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>()
@@ -219,6 +238,7 @@ class RNIapModuleTest {
         val skus = mockk<ReadableArray>() {
             every { size() } returns 1
             every { getString(0) } returns "sku0"
+            every { getType(0) } returns ReadableType.String
         }
         mockkStatic(Arguments::class)
 
@@ -231,7 +251,7 @@ class RNIapModuleTest {
         every { itemsArr.pushMap(any()) } answers {
             itemsSize++
         }
-
+        module.initConnection(mockk())
         module.getItemsByType("subs", skus, promise)
         verify { promise.resolve(any()) }
         assertEquals(itemsSize, 1)

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.2",
+  "version": "8.3.0",
   "packageManager": "yarn@3.2.0",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",

package/src/iap.js

@@ -400,10 +400,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.