react-native-iap 8.0.7 → 8.0.10

package/.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.1.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

package/README.md

@@ -20,6 +20,8 @@ Published in [website](https://react-native-iap.dooboolab.com).
 
 ## Announcement
 
+- Current module is ported to [expo-iap](https://www.npmjs.com/package/expo-iap) which share the same codebase but different environment. This is currently experimental but you can use it in expo managed workflow. The source code is maintained in branch [expo](https://github.com/dooboolab/react-native-iap/tree/expo).
+
 - Version `8.0.0` has finally landed in Jan 28th. Since this is early release, please use it with caution 🚧. We recommend user to use `>=8.0.0` with react-native `>=0.65.1`. The `next` package is no longer updated until we organize the roadmap for `9.0.0`.
 
 - Version `8.0.0` is currently in release candidate. The module is completely rewritten with `Kotlin` and `Swift` for maintenenance issue by [andresesfm](https://github.com/andresesfm) 🔆. You may install this for early preview.

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

@@ -51,7 +51,10 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext?) :
         var ii = 0
         val skuSize = skuArr.size()
         while (ii < skuSize) {
-            productSkus.add(skuArr.getString(ii))
+            val sku = skuArr.getString(ii)
+            if (sku is String) {
+                productSkus.add(sku)
+            }
             ii++
         }
         DoobooUtils.instance.addPromiseForKey(PROMISE_GET_PRODUCT_DATA, promise)

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

@@ -203,7 +203,10 @@ class RNIapModule(reactContext: ReactApplicationContext) :
                 override fun run(billingClient: BillingClient) {
                     val skuList = ArrayList<String>()
                     for (i in 0 until skuArr.size()) {
-                        skuList.add(skuArr.getString(i))
+                        val sku = skuArr.getString(i)
+                        if (sku is String) {
+                            skuList.add(sku)
+                        }
                     }
                     val params = SkuDetailsParams.newBuilder()
                     params.setSkusList(skuList).setType(type!!)

package/index.js.flow

@@ -1,7 +1,7 @@
 /**
  * Flowtype definitions for index
  * Generated by Flowgen from a Typescript Definition
- * Flowgen v1.16.0
+ * Flowgen v1.19.0
  */
 
 declare export * from "./src";

package/ios/RNIapIos.swift

@@ -215,8 +215,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     
     @objc public func buyProductWithOffer(
         _ sku: String,
-        usernameHash: String,
-        discountOffer: Dictionary<String,String>,
+        forUser usernameHash: String,
+        withOffer discountOffer: Dictionary<String,String>,
         resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
@@ -236,8 +236,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
             addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
             
             let payment: SKMutablePayment = SKMutablePayment(product: prod)
-            
-            if #available(iOS 12.2, *) {
+
+            if #available(iOS 12.2, tvOS 12.2, *) {
                 let discount: SKPaymentDiscount = SKPaymentDiscount(
                     identifier: discountOffer["identifier"]!,
                     keyIdentifier: discountOffer["keyIdentifier"]!,
@@ -416,7 +416,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
         #if !os(tvOS)
-        if #available(iOS 14.0, *) {
+        if #available(iOS 14.0, tvOS 14.0, *) {
             SKPaymentQueue.default().presentCodeRedemptionSheet()
             resolve(nil)
         } else {
@@ -627,7 +627,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
             return descriptions[0]
         }
         
-        if code > descriptions.count - 1 {
+        if code > descriptions.count - 1 || code < 0 { // Fix crash app without internet connection
             return descriptions[0]
         }
         return descriptions[code]
@@ -654,8 +654,8 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         var periodUnitIOS = ""
         
         var itemType = "iap"
-        
-        if #available(iOS 11.2, *) {
+
+        if #available(iOS 11.2, tvOS 11.2, *) {
             let numOfUnits = UInt(product.subscriptionPeriod?.numberOfUnits ?? 0)
             let unit = product.subscriptionPeriod?.unit
             
@@ -718,22 +718,22 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
                 introductoryPriceSubscriptionPeriod = ""
             }
         }
-        
-        
-        
-        if #available(iOS 10.0, *) {
+
+
+
+        if #available(iOS 10.0, tvOS 10.0, *) {
             currencyCode = product.priceLocale.currencyCode
         }
-        
-        if #available(iOS 13.0, *) {
+
+        if #available(iOS 13.0, tvOS 13.0, *) {
             countryCode = SKPaymentQueue.default().storefront?.countryCode
-        } else if #available(iOS 10.0, *) {
+        } else if #available(iOS 10.0, tvOS 10.0, *) {
             countryCode = product.priceLocale.regionCode
         }
         
         var discounts: [[String: String?]]?
-        
-        if #available(iOS 12.2, *) {
+
+        if #available(iOS 12.2, tvOS 12.2, *) {
             discounts = getDiscountData(product)
         }
         
@@ -763,7 +763,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     
     
     func getDiscountData(_ product: SKProduct) -> [[String:String?]]? {
-        if #available(iOS 12.2, *) {
+        if #available(iOS 12.2, tvOS 12.2, *) {
             var mappedDiscounts : [[String:String?]] = []
             var localizedPrice: String?
             var paymendMode: String?

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-iap",
-  "version": "8.0.7",
-  "packageManager": "yarn@3.1.1",
+  "version": "8.0.10",
+  "packageManager": "yarn@3.2.0",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -44,31 +44,31 @@
     "dooboolab-welcome": "1.3.2"
   },
   "devDependencies": {
-    "@babel/core": "7.16.0",
-    "@babel/plugin-proposal-class-properties": "7.16.0",
-    "@babel/plugin-proposal-private-methods": "7.16.0",
-    "@babel/preset-env": "7.16.4",
-    "@babel/preset-react": "7.16.0",
-    "@babel/preset-typescript": "7.16.0",
-    "@dooboo/eslint-config": "1.2.2",
-    "@testing-library/jest-native": "4.0.4",
-    "@testing-library/react-native": "8.0.0",
-    "@types/eslint": "8.2.0",
-    "@types/jest": "27.0.3",
-    "@types/react": "17.0.37",
-    "@types/react-native": "0.66.6",
-    "@typescript-eslint/eslint-plugin": "^5.9.0",
+    "@babel/core": "7.18.2",
+    "@babel/plugin-proposal-class-properties": "7.17.12",
+    "@babel/plugin-proposal-private-methods": "7.17.12",
+    "@babel/preset-env": "7.18.2",
+    "@babel/preset-react": "7.17.12",
+    "@babel/preset-typescript": "7.17.12",
+    "@dooboo/eslint-config": "1.3.4",
+    "@testing-library/jest-native": "4.0.5",
+    "@testing-library/react-native": "9.1.0",
+    "@types/eslint": "8.4.2",
+    "@types/jest": "27.5.1",
+    "@types/react": "18.0.10",
+    "@types/react-native": "0.67.7",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "27.4.2",
-    "eslint": "8.3.0",
-    "flow-bin": "0.166.1",
-    "flowgen": "1.16.0",
-    "jest": "27.4.3",
-    "metro-react-native-babel-preset": "0.66.2",
+    "babel-jest": "28.1.0",
+    "eslint": "8.16.0",
+    "flow-bin": "0.179.0",
+    "flowgen": "1.19.0",
+    "jest": "28.1.0",
+    "metro-react-native-babel-preset": "0.71.0",
     "monolinter": "1.0.4",
-    "prettier": "2.5.0",
-    "react-native": "0.65.1",
-    "ts-jest": "27.0.7",
-    "typescript": "4.5.2"
+    "prettier": "2.6.2",
+    "react-native": "0.66.4",
+    "ts-jest": "28.0.3",
+    "typescript": "4.7.2"
   }
 }

package/src/iap.d.ts

@@ -79,7 +79,7 @@ export declare const requestPurchaseWithQuantityIOS: (sku: string, quantity: num
  * @param {string} developerPayloadAndroid Android developerPayload.
  * @returns {Promise<string | void> }
  */
-export declare const finishTransaction: (purchase: InAppPurchase | ProductPurchase, isConsumable?: boolean | undefined, developerPayloadAndroid?: string | undefined) => Promise<string | void>;
+export declare const finishTransaction: (purchase: InAppPurchase | ProductPurchase, isConsumable?: boolean, developerPayloadAndroid?: string) => Promise<string | void>;
 /**
  * Clear Transaction (iOS only)
  *   Finish remaining transactions. Related to issue #257 and #801
@@ -99,7 +99,7 @@ export declare const clearProductsIOS: () => Promise<void>;
  * @param {string} token The product's token (on Android)
  * @returns {Promise<PurchaseResult | void>}
  */
-export declare const acknowledgePurchaseAndroid: (token: string, developerPayload?: string | undefined) => Promise<PurchaseResult | void>;
+export declare const acknowledgePurchaseAndroid: (token: string, developerPayload?: string) => Promise<PurchaseResult | void>;
 /**
  * Deep link to subscriptions screen on Android. No-op on iOS.
  * @param {string} sku The product's SKU (on Android)
@@ -140,7 +140,7 @@ export declare const requestPurchaseWithOfferIOS: (sku: string, forUser: string,
  * @param {boolean} isTest whether this is in test environment which is sandbox.
  * @returns {Promise<Apple.ReceiptValidationResponse | false>}
  */
-export declare const validateReceiptIos: (receiptBody: Record<string, unknown>, isTest?: boolean | undefined) => Promise<Apple.ReceiptValidationResponse | false>;
+export declare const validateReceiptIos: (receiptBody: Record<string, unknown>, isTest?: boolean) => Promise<Apple.ReceiptValidationResponse | false>;
 /**
  * Validate receipt for Android. NOTE: This method is here for debugging purposes only. Including
  * your access token in the binary you ship to users is potentially dangerous.
@@ -152,7 +152,7 @@ export declare const validateReceiptIos: (receiptBody: Record<string, unknown>,
  * @param {boolean} isSub whether this is subscription or inapp. `true` for subscription.
  * @returns {Promise<object>}
  */
-export declare const validateReceiptAndroid: (packageName: string, productId: string, productToken: string, accessToken: string, isSub?: boolean | undefined) => Promise<Android.ReceiptType>;
+export declare const validateReceiptAndroid: (packageName: string, productId: string, productToken: string, accessToken: string, isSub?: boolean) => Promise<Android.ReceiptType>;
 /**
  * Validate receipt for Amazon. NOTE: This method is here for debugging purposes only. Including
  * your developer secret in the binary you ship to users is potentially dangerous.
@@ -179,7 +179,7 @@ export declare const purchaseErrorListener: (listener: (errorEvent: PurchaseErro
  * @param {forceRefresh?:boolean}
  * @returns {Promise<string>}
  */
-export declare const getReceiptIOS: (forceRefresh?: boolean | undefined) => Promise<string>;
+export declare const getReceiptIOS: (forceRefresh?: boolean) => Promise<string>;
 /**
  * Get the pending purchases in IOS.
  * @returns {Promise<ProductPurchase[]>}