react-native-iap 7.2.1 → 7.5.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## Changelogs
 
+# 7.5.0
+
+### Bugfix
+- Fix canceled purchase dangling [#1504](https://github.com/dooboolab/react-native-iap/pull/1504)
+
+### Dependencies
+- Set default `androidX` version [#1505](https://github.com/dooboolab/react-native-iap/pull/1505)
+- Update packages [#1506](https://github.com/dooboolab/react-native-iap/pull/1506)
+
+# 7.4.1
+
+- [iOS] Add `quantityIOS` in purchase data [#1476](https://github.com/dooboolab/react-native-iap/pull/1476)
+
+# 7.4.0
+
+- Now using React's Context to manage IAP state
+- Introduce `withIAPContext` HOC ([how to use](docs/docs/usage_instructions/using_hooks.md))
+
+# 7.3.0
+
+_Breaking Change_:Amazon's receipt was incorrectly being put in `originalJson` it now matches the other platforms: `transactionReceipt` [#1461](https://github.com/dooboolab/react-native-iap/pull/1461)
+
 # 7.2.1
 
 Fix android crash by delaying ios check [#1456](https://github.com/dooboolab/react-native-iap/pull/1456)

package/README.md

@@ -6,7 +6,7 @@
 [![CI](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml)
 [![document](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml)
 [![License](https://img.shields.io/npm/l/react-native-iap.svg)](https://npmjs.org/package/react-native-iap)
-[![Vulnerabilites](https://img.shields.io/snyk/vulnerabilities/github/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap)
+[![Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap)
 [![Issue Opened](https://img.shields.io/opencollective/all/react-native-iap.svg)](https://opencollective.com/react-native-iap#backers)
 [![Issue Opened](https://img.shields.io/github/issues/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/issues)
 [![Issue Closed](https://img.shields.io/github/issues-closed/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/issues?q=is%3Aissue+is%3Aclosed)
@@ -90,17 +90,21 @@ Quick News
 - We had hard time supporting `react-native-iap` issues that did not provide working codes or any other examples. Therefore, we've decided to make an `example` app called [DoobooIAP](https://github.com/hyochan/DoobooIAP), which will contain all the features of `IAP`'s and willing to continuously improve to support real-life examples. [@Bang9](http://github.com/bang9) who had been helping many others for `react-native-iap`, is willing to support this repo so he will grant $300 of our income in `opencollective` as described in [#855](https://github.com/dooboolab/react-native-iap/issues/855) :tada:.
 - `react-native-iap@4.0.8` ~ `react-native-iap@4.1.0` is incompatible with `react-native <0.61`. This is fixed in `react-native-iap@4.1.1` and above.
 - `react-native-iap@4.0.0` has been released. You can see [#716](https://github.com/dooboolab/react-native-iap/pull/716) for updates.
-- In the past, `react-native-iap@^3.*` has been updated very prompty for migration issues.
-    Don't get suprised too much on why it is bumping up version so quickly these days.
+- In the past, `react-native-iap@^3.*` has been updated very promptly for migration issues.
+    Don't get surprised too much on why it is bumping up version so quickly these days.
   1. Migrated to new `AndroidX` APIs.
   2. Migrated to new `Android` billing client which is `> 2.0.0`.
      - [`acknowledgePurchase()`][android-acknowledge-purchase] has been added since `3.2.0` which is very important.
   3. New [Purchase Flow][a-purchase-flow]
-  4. More is comming in `iOS 13`.
+  4. More is coming in `iOS 13`.
 
 Breaking Changes
 ----------------
 
+[7.4.0]
+- Now using React's Context to manage IAP state
+- Introduce `withIAPContext` HOC ([how to use](docs/docs/usage_instructions/using_hooks.md))
+
 [7.1.0]
 - `androidOldSku` is no longer required [#1438](https://github.com/dooboolab/react-native-iap/pull/1438).
 

package/android/build.gradle

@@ -71,7 +71,7 @@ dependencies {
     implementation "com.android.support:support-annotations:$supportLibVersion"
     implementation "com.android.support:customtabs:$supportLibVersion"
   } else {
-    def defaultAndroidXVersion = "1.+"
+    def defaultAndroidXVersion = "1.2.0"
     if (androidXVersion == null) {
       androidXVersion = defaultAndroidXVersion
     }

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

@@ -1,6 +1,7 @@
 package com.dooboolab.RNIap;
 
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.amazon.device.iap.PurchasingListener;
 import com.amazon.device.iap.PurchasingService;
@@ -154,14 +155,7 @@ public class RNIapAmazonListener implements PurchasingListener {
         WritableMap promiseItem = null;
         final List<Receipt> purchases = response.getReceipts();
         for (Receipt receipt : purchases) {
-          WritableMap item = Arguments.createMap();
-          item.putString("productId", receipt.getSku());
-          item.putDouble("transactionDate", receipt.getPurchaseDate().getTime());
-          item.putString("purchaseToken", receipt.getReceiptId());
-          item.putString("originalJson", receipt.toJSON().toString());
-          item.putString("userIdAmazon", userData.getUserId());
-          item.putString("userMarketplaceAmazon", userData.getMarketplace());
-          item.putString("userJsonAmazon", userData.toJSON().toString());
+          WritableMap item = receiptToMap(userData, receipt);
 
           promiseItem = new WritableNativeMap();
           promiseItem.merge(item);
@@ -234,6 +228,20 @@ public class RNIapAmazonListener implements PurchasingListener {
     }
   }
 
+  @NonNull
+  private WritableMap receiptToMap(UserData userData, Receipt receipt) {
+    WritableMap item = Arguments.createMap();
+    item.putString("productId", receipt.getSku());
+    item.putDouble("transactionDate", receipt.getPurchaseDate().getTime());
+    item.putString("purchaseToken", receipt.getReceiptId());
+    item.putString("transactionReceipt", receipt.toJSON().toString());
+    item.putString("userIdAmazon", userData.getUserId());
+    item.putString("userMarketplaceAmazon", userData.getMarketplace());
+    item.putString("userJsonAmazon", userData.toJSON().toString());
+    item.putBoolean("isCanceledAmazon", receipt.isCanceled());
+    return item;
+  }
+
   @Override
   public void onPurchaseResponse(final PurchaseResponse response) {
     final String requestId = response.getRequestId().toString();
@@ -249,14 +257,7 @@ public class RNIapAmazonListener implements PurchasingListener {
       case SUCCESSFUL:
         final Receipt receipt = response.getReceipt();
         final UserData userData = response.getUserData();
-        WritableMap item = Arguments.createMap();
-        item.putString("productId", receipt.getSku());
-        item.putDouble("transactionDate", receipt.getPurchaseDate().getTime());
-        item.putString("purchaseToken", receipt.getReceiptId());
-        item.putString("originalJson", receipt.toJSON().toString());
-        item.putString("userIdAmazon", userData.getUserId());
-        item.putString("userMarketplaceAmazon", userData.getMarketplace());
-        item.putString("userJsonAmazon", userData.toJSON().toString());
+        WritableMap item = receiptToMap(userData, receipt);
 
         WritableMap promiseItem = new WritableNativeMap();
         promiseItem.merge(item);

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

@@ -583,9 +583,7 @@ public class RNIapModule extends ReactContextBaseJavaModule implements Purchases
       error.putString("message", errorData[1]);
       sendEvent(reactContext, "purchase-error", error);
 
-      if (responseCode != BillingClient.BillingResponseCode.USER_CANCELED) {
-        PlayUtils.getInstance().rejectPromisesWithBillingError(PROMISE_BUY_ITEM, responseCode);
-      }
+      PlayUtils.getInstance().rejectPromisesWithBillingError(PROMISE_BUY_ITEM, responseCode);
       return;
     }
 

package/ios/RNIap.xcodeproj/project.pbxproj

@@ -247,7 +247,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -293,7 +293,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

package/ios/RNIapIos.m

@@ -327,6 +327,7 @@ RCT_EXPORT_METHOD(getPendingTransactions:(RCTPromiseResolveBlock)resolve
                                                  @(item.transactionDate.timeIntervalSince1970 * 1000), @"transactionDate",
                                                  item.transactionIdentifier, @"transactionId",
                                                  item.payment.productIdentifier, @"productId",
+                                                 @(item.payment.quantity), @"quantityIOS",
                                                  [receiptData base64EncodedStringWithOptions:0], @"transactionReceipt",
                                                  nil
                                                  ];
@@ -462,11 +463,9 @@ RCT_EXPORT_METHOD(presentCodeRedemptionSheet:(RCTPromiseResolveBlock)resolve
                         [self sendEventWithName:@"purchase-error" body:err];
                     }
 
-                    if (transaction.error.code != SKErrorPaymentCancelled) {
-                        [self rejectPromisesForKey:transaction.payment.productIdentifier code:[self standardErrorCode:(int)transaction.error.code]
-                                        message:transaction.error.localizedDescription
-                                            error:transaction.error];
-                    }
+                    [self rejectPromisesForKey:transaction.payment.productIdentifier code:[self standardErrorCode:(int)transaction.error.code]
+                                    message:transaction.error.localizedDescription
+                                        error:transaction.error];
                 });
                 break;
             }
@@ -768,6 +767,7 @@ RCT_EXPORT_METHOD(presentCodeRedemptionSheet:(RCTPromiseResolveBlock)resolve
                                              @(transaction.transactionDate.timeIntervalSince1970 * 1000), @"transactionDate",
                                              transaction.transactionIdentifier, @"transactionId",
                                              transaction.payment.productIdentifier, @"productId",
+                                             @(transaction.payment.quantity), @"quantityIOS",
                                              [receiptData base64EncodedStringWithOptions:0], @"transactionReceipt",
                                              nil
                                              ];

package/ios/RNIapIos.swift

@@ -0,0 +1,11 @@
+// WIP Migrating from Objective C to swift
+func paymentQueue(_ queue: SKPaymentQueue, removedTransactions transactions: [SKPaymentTransaction]) {
+    print("removedTransactions")
+    if countPendingTransaction != nil && countPendingTransaction > 0 {
+        countPendingTransaction -= transactions.count
+        if countPendingTransaction == 0 {
+            resolvePromises(forKey: "cleaningTransactions", value: nil)
+            countPendingTransaction = nil
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "7.2.1",
+  "version": "7.5.0",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -43,31 +43,31 @@
     "dooboolab-welcome": "1.3.2"
   },
   "devDependencies": {
-    "@babel/core": "7.14.8",
+    "@babel/core": "7.15.5",
     "@babel/plugin-proposal-class-properties": "7.14.5",
     "@babel/plugin-proposal-private-methods": "7.14.5",
-    "@babel/preset-env": "7.14.8",
+    "@babel/preset-env": "7.15.6",
     "@babel/preset-react": "7.14.5",
-    "@babel/preset-typescript": "7.14.5",
-    "@dooboo/eslint-config": "0.8.2",
-    "@testing-library/jest-native": "4.0.1",
+    "@babel/preset-typescript": "7.15.0",
+    "@dooboo/eslint-config": "0.8.5",
+    "@testing-library/jest-native": "4.0.2",
     "@testing-library/react-native": "7.2.0",
     "@types/eslint": "7.28.0",
-    "@types/jest": "26.0.24",
-    "@types/react": "17.0.15",
-    "@types/react-native": "0.64.12",
+    "@types/jest": "27.0.1",
+    "@types/react": "17.0.21",
+    "@types/react-native": "0.65.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.1.0",
-    "babel-jest": "27.0.6",
-    "eslint": "7.31.0",
-    "flow-bin": "0.156.0",
+    "babel-jest": "27.2.0",
+    "eslint": "7.32.0",
+    "flow-bin": "0.160.0",
     "flowgen": "1.14.1",
-    "jest": "27.0.6",
+    "jest": "27.2.0",
     "metro-react-native-babel-preset": "0.66.2",
-    "monolinter": "1.0.2",
-    "prettier": "2.3.2",
+    "monolinter": "1.0.4",
+    "prettier": "2.4.1",
     "react-native": "0.64.2",
-    "ts-jest": "27.0.4",
-    "typescript": "4.3.5"
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.3"
   }
 }

package/src/hooks/useIAP.d.ts

@@ -1,4 +1,5 @@
 import type { Product, Purchase, PurchaseError, Subscription } from '../types';
+import { requestPurchase as iapRequestPurchase, requestSubscription as iapRequestSubscription } from '../iap';
 declare type IAP_STATUS = {
     connected: boolean;
     products: Product[];
@@ -13,6 +14,8 @@ declare type IAP_STATUS = {
     getPurchaseHistories: () => Promise<void>;
     getProducts: (skus: string[]) => Promise<void>;
     getSubscriptions: (skus: string[]) => Promise<void>;
+    requestPurchase: typeof iapRequestPurchase;
+    requesSubscription: typeof iapRequestSubscription;
 };
 export declare function useIAP(): IAP_STATUS;
 export {};

package/src/hooks/useIAP.js

@@ -34,53 +34,38 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
-};
-import { NativeEventEmitter, NativeModules, } from 'react-native';
-import { endConnection, getPromotedProductIOS, getPurchaseHistory, finishTransaction as iapFinishTransaction, getAvailablePurchases as iapGetAvailablePurchases, getProducts as iapGetProducts, getSubscriptions as iapGetSubscriptions, initConnection, purchaseErrorListener, purchaseUpdatedListener, } from '../iap';
-import { useCallback, useEffect, useState } from 'react';
-var RNIapIos = NativeModules.RNIapIos;
-var IAPEmitter = new NativeEventEmitter(RNIapIos);
-var purchaseUpdateSubscription;
-var purchaseErrorSubscription;
-var promotedProductsSubscription;
+import { getPurchaseHistory, finishTransaction as iapFinishTransaction, getAvailablePurchases as iapGetAvailablePurchases, getProducts as iapGetProducts, getSubscriptions as iapGetSubscriptions, requestPurchase as iapRequestPurchase, requestSubscription as iapRequestSubscription, } from '../iap';
+import { useCallback } from 'react';
+import { useIAPContext } from './withIAPContext';
 export function useIAP() {
     var _this = this;
-    var _a = useState(false), connected = _a[0], setConnected = _a[1];
-    var _b = useState([]), products = _b[0], setProducts = _b[1];
-    var _c = useState([]), promotedProductsIOS = _c[0], setPromotedProductsIOS = _c[1];
-    var _d = useState([]), subscriptions = _d[0], setSubscriptions = _d[1];
-    var _e = useState([]), purchaseHistories = _e[0], setPurchaseHistories = _e[1];
-    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 _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 getProducts = useCallback(function (skus) { return __awaiter(_this, void 0, void 0, function () {
-        var iaps;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, iapGetProducts(skus)];
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = setProducts;
+                    return [4 /*yield*/, iapGetProducts(skus)];
                 case 1:
-                    iaps = _a.sent();
-                    setProducts(iaps);
+                    _a.apply(void 0, [_b.sent()]);
                     return [2 /*return*/];
             }
         });
-    }); }, []);
+    }); }, [setProducts]);
     var getSubscriptions = useCallback(function (skus) { return __awaiter(_this, void 0, void 0, function () {
-        var subs;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, iapGetSubscriptions(skus)];
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = setSubscriptions;
+                    return [4 /*yield*/, iapGetSubscriptions(skus)];
                 case 1:
-                    subs = _a.sent();
-                    setSubscriptions(subs);
+                    _a.apply(void 0, [_b.sent()]);
                     return [2 /*return*/];
             }
         });
-    }); }, []);
+    }); }, [setSubscriptions]);
     var getAvailablePurchases = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
         var _a;
         return __generator(this, function (_b) {
@@ -93,7 +78,7 @@ export function useIAP() {
                     return [2 /*return*/];
             }
         });
-    }); }, []);
+    }); }, [setAvailablePurchases]);
     var getPurchaseHistories = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
         var _a;
         return __generator(this, function (_b) {
@@ -106,7 +91,7 @@ export function useIAP() {
                     return [2 /*return*/];
             }
         });
-    }); }, []);
+    }); }, [setPurchaseHistories]);
     var finishTransaction = useCallback(function (purchase, isConsumable, developerPayloadAndroid) { return __awaiter(_this, void 0, void 0, function () {
         var err_1;
         return __generator(this, function (_a) {
@@ -117,7 +102,7 @@ export function useIAP() {
                 case 1: return [2 /*return*/, _a.sent()];
                 case 2:
                     err_1 = _a.sent();
-                    throw new Error(err_1);
+                    throw err_1;
                 case 3:
                     if (purchase.productId === (currentPurchase === null || currentPurchase === void 0 ? void 0 : currentPurchase.productId))
                         setCurrentPurchase(undefined);
@@ -127,58 +112,12 @@ export function useIAP() {
                 case 4: return [2 /*return*/];
             }
         });
-    }); }, [currentPurchase === null || currentPurchase === void 0 ? void 0 : currentPurchase.productId, currentPurchaseError === null || currentPurchaseError === void 0 ? void 0 : currentPurchaseError.productId]);
-    var initIapWithSubscriptions = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var result;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, initConnection()];
-                case 1:
-                    result = _a.sent();
-                    setConnected(result);
-                    if (result) {
-                        purchaseUpdateSubscription = purchaseUpdatedListener(function (purchase) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                setCurrentPurchaseError(undefined);
-                                setCurrentPurchase(purchase);
-                                return [2 /*return*/];
-                            });
-                        }); });
-                        purchaseErrorSubscription = purchaseErrorListener(function (error) {
-                            setCurrentPurchase(undefined);
-                            setCurrentPurchaseError(error);
-                        });
-                        promotedProductsSubscription = IAPEmitter.addListener('iap-promoted-product', function () { return __awaiter(_this, void 0, void 0, function () {
-                            var product;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, getPromotedProductIOS()];
-                                    case 1:
-                                        product = _a.sent();
-                                        setPromotedProductsIOS(function (prevProducts) { return __spreadArray(__spreadArray([], prevProducts), (product ? [product] : [])); });
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                    }
-                    return [2 /*return*/];
-            }
-        });
-    }); }, []);
-    useEffect(function () {
-        initIapWithSubscriptions();
-        return function () {
-            if (purchaseUpdateSubscription)
-                purchaseUpdateSubscription.remove();
-            if (purchaseErrorSubscription)
-                purchaseErrorSubscription.remove();
-            if (promotedProductsSubscription)
-                promotedProductsSubscription.remove();
-            endConnection();
-            setConnected(false);
-        };
-    }, [initIapWithSubscriptions]);
+    }); }, [
+        currentPurchase === null || currentPurchase === void 0 ? void 0 : currentPurchase.productId,
+        currentPurchaseError === null || currentPurchaseError === void 0 ? void 0 : currentPurchaseError.productId,
+        setCurrentPurchase,
+        setCurrentPurchaseError,
+    ]);
     return {
         connected: connected,
         products: products,
@@ -193,5 +132,7 @@ export function useIAP() {
         getSubscriptions: getSubscriptions,
         getAvailablePurchases: getAvailablePurchases,
         getPurchaseHistories: getPurchaseHistories,
+        requestPurchase: iapRequestPurchase,
+        requesSubscription: iapRequestSubscription,
     };
 }

package/src/hooks/withIAPContext.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Product, Purchase, PurchaseError, Subscription } from '../types';
+declare type IAPContextType = {
+    connected: boolean;
+    products: Product[];
+    promotedProductsIOS: Product[];
+    subscriptions: Subscription[];
+    purchaseHistories: Purchase[];
+    availablePurchases: Purchase[];
+    currentPurchase?: Purchase;
+    currentPurchaseError?: PurchaseError;
+    setProducts: (products: Product[]) => void;
+    setSubscriptions: (subscriptions: Subscription[]) => void;
+    setPurchaseHistories: (purchaseHistories: Purchase[]) => void;
+    setAvailablePurchases: (availablePurchases: Purchase[]) => void;
+    setCurrentPurchase: (currentPurchase: Purchase | undefined) => void;
+    setCurrentPurchaseError: (currentPurchaseError: PurchaseError | undefined) => void;
+};
+export declare function useIAPContext(): IAPContextType;
+export declare function withIAPContext<T>(Component: React.ComponentType<T>): (props: T) => JSX.Element;
+export {};

package/src/hooks/withIAPContext.js

@@ -0,0 +1,140 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import { NativeEventEmitter, NativeModules } from 'react-native';
+import { getPromotedProductIOS, initConnection, purchaseErrorListener, purchaseUpdatedListener, } from '../iap';
+var RNIapIos = NativeModules.RNIapIos;
+var IAPEmitter = new NativeEventEmitter(RNIapIos);
+// @ts-ignore
+var IAPContext = React.createContext(null);
+export function useIAPContext() {
+    var ctx = useContext(IAPContext);
+    if (!ctx)
+        throw new Error('You need wrap your app with withIAPContext HOC');
+    return ctx;
+}
+export function withIAPContext(Component) {
+    return function WrapperComponent(props) {
+        var _this = this;
+        var _a = useState(false), connected = _a[0], setConnected = _a[1];
+        var _b = useState([]), products = _b[0], setProducts = _b[1];
+        var _c = useState([]), promotedProductsIOS = _c[0], setPromotedProductsIOS = _c[1];
+        var _d = useState([]), subscriptions = _d[0], setSubscriptions = _d[1];
+        var _e = useState([]), purchaseHistories = _e[0], setPurchaseHistories = _e[1];
+        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 context = useMemo(function () { return ({
+            connected: connected,
+            products: products,
+            subscriptions: subscriptions,
+            promotedProductsIOS: promotedProductsIOS,
+            purchaseHistories: purchaseHistories,
+            availablePurchases: availablePurchases,
+            currentPurchase: currentPurchase,
+            currentPurchaseError: currentPurchaseError,
+            setProducts: setProducts,
+            setSubscriptions: setSubscriptions,
+            setPurchaseHistories: setPurchaseHistories,
+            setAvailablePurchases: setAvailablePurchases,
+            setCurrentPurchase: setCurrentPurchase,
+            setCurrentPurchaseError: setCurrentPurchaseError,
+        }); }, [
+            connected,
+            products,
+            subscriptions,
+            promotedProductsIOS,
+            purchaseHistories,
+            availablePurchases,
+            currentPurchase,
+            currentPurchaseError,
+            setProducts,
+            setSubscriptions,
+            setPurchaseHistories,
+            setAvailablePurchases,
+            setCurrentPurchase,
+            setCurrentPurchaseError,
+        ]);
+        useEffect(function () {
+            initConnection().then(setConnected);
+        }, []);
+        useEffect(function () {
+            if (!connected)
+                return;
+            var purchaseUpdateSubscription = purchaseUpdatedListener(function (purchase) { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    setCurrentPurchaseError(undefined);
+                    setCurrentPurchase(purchase);
+                    return [2 /*return*/];
+                });
+            }); });
+            var purchaseErrorSubscription = purchaseErrorListener(function (error) {
+                setCurrentPurchase(undefined);
+                setCurrentPurchaseError(error);
+            });
+            var promotedProductsSubscription = IAPEmitter.addListener('iap-promoted-product', function () { return __awaiter(_this, void 0, void 0, function () {
+                var product;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, getPromotedProductIOS()];
+                        case 1:
+                            product = _a.sent();
+                            setPromotedProductsIOS(function (prevProducts) { return __spreadArray(__spreadArray([], prevProducts, true), (product ? [product] : []), true); });
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+            return function () {
+                purchaseUpdateSubscription.remove();
+                purchaseErrorSubscription.remove();
+                promotedProductsSubscription.remove();
+            };
+        }, [connected]);
+        return (<IAPContext.Provider value={context}>
+        <Component {...props}/>
+      </IAPContext.Provider>);
+    };
+}

package/src/hooks/withIAPContext.tsx

@@ -0,0 +1,150 @@
+import React, {useContext, useEffect, useMemo, useState} from 'react';
+import {NativeEventEmitter, NativeModules} from 'react-native';
+import {
+  InAppPurchase,
+  Product,
+  Purchase,
+  PurchaseError,
+  Subscription,
+  SubscriptionPurchase,
+} from '../types';
+import {
+  getPromotedProductIOS,
+  initConnection,
+  purchaseErrorListener,
+  purchaseUpdatedListener,
+} from '../iap';
+
+type IAPContextType = {
+  connected: boolean;
+  products: Product[];
+  promotedProductsIOS: Product[];
+  subscriptions: Subscription[];
+  purchaseHistories: Purchase[];
+  availablePurchases: Purchase[];
+  currentPurchase?: Purchase;
+  currentPurchaseError?: PurchaseError;
+  setProducts: (products: Product[]) => void;
+  setSubscriptions: (subscriptions: Subscription[]) => void;
+  setPurchaseHistories: (purchaseHistories: Purchase[]) => void;
+  setAvailablePurchases: (availablePurchases: Purchase[]) => void;
+  setCurrentPurchase: (currentPurchase: Purchase | undefined) => void;
+  setCurrentPurchaseError: (
+    currentPurchaseError: PurchaseError | undefined,
+  ) => void;
+};
+
+const {RNIapIos} = NativeModules;
+const IAPEmitter = new NativeEventEmitter(RNIapIos);
+
+// @ts-ignore
+const IAPContext = React.createContext<IAPContextType>(null);
+
+export function useIAPContext(): IAPContextType {
+  const ctx = useContext(IAPContext);
+  if (!ctx) throw new Error('You need wrap your app with withIAPContext HOC');
+
+  return ctx;
+}
+
+export function withIAPContext<T>(Component: React.ComponentType<T>) {
+  return function WrapperComponent(props: T) {
+    const [connected, setConnected] = useState<boolean>(false);
+    const [products, setProducts] = useState<Product[]>([]);
+
+    const [promotedProductsIOS, setPromotedProductsIOS] = useState<Product[]>(
+      [],
+    );
+    const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);
+    const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>([]);
+
+    const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>(
+      [],
+    );
+    const [currentPurchase, setCurrentPurchase] = useState<Purchase>();
+
+    const [currentPurchaseError, setCurrentPurchaseError] =
+      useState<PurchaseError>();
+
+    const context = useMemo(
+      () => ({
+        connected,
+        products,
+        subscriptions,
+        promotedProductsIOS,
+        purchaseHistories,
+        availablePurchases,
+        currentPurchase,
+        currentPurchaseError,
+        setProducts,
+        setSubscriptions,
+        setPurchaseHistories,
+        setAvailablePurchases,
+        setCurrentPurchase,
+        setCurrentPurchaseError,
+      }),
+      [
+        connected,
+        products,
+        subscriptions,
+        promotedProductsIOS,
+        purchaseHistories,
+        availablePurchases,
+        currentPurchase,
+        currentPurchaseError,
+        setProducts,
+        setSubscriptions,
+        setPurchaseHistories,
+        setAvailablePurchases,
+        setCurrentPurchase,
+        setCurrentPurchaseError,
+      ],
+    );
+
+    useEffect(() => {
+      initConnection().then(setConnected);
+    }, []);
+
+    useEffect(() => {
+      if (!connected) return;
+
+      const purchaseUpdateSubscription = purchaseUpdatedListener(
+        async (purchase: InAppPurchase | SubscriptionPurchase) => {
+          setCurrentPurchaseError(undefined);
+          setCurrentPurchase(purchase);
+        },
+      );
+
+      const purchaseErrorSubscription = purchaseErrorListener(
+        (error: PurchaseError) => {
+          setCurrentPurchase(undefined);
+          setCurrentPurchaseError(error);
+        },
+      );
+
+      const promotedProductsSubscription = IAPEmitter.addListener(
+        'iap-promoted-product',
+        async () => {
+          const product = await getPromotedProductIOS();
+
+          setPromotedProductsIOS((prevProducts) => [
+            ...prevProducts,
+            ...(product ? [product] : []),
+          ]);
+        },
+      );
+
+      return () => {
+        purchaseUpdateSubscription.remove();
+        purchaseErrorSubscription.remove();
+        promotedProductsSubscription.remove();
+      };
+    }, [connected]);
+
+    return (
+      <IAPContext.Provider value={context}>
+        <Component {...props} />
+      </IAPContext.Provider>
+    );
+  };
+}

package/src/iap.d.ts

@@ -24,7 +24,7 @@ export declare const flushFailedPurchasesCachedAsPendingAndroid: () => Promise<s
  * @param {string[]} skus The item skus
  * @returns {Promise<Product[]>}
  */
-export declare const getProducts: <SkuType extends string>(skus: SkuType[]) => Promise<Product<SkuType>[]>;
+export declare const getProducts: (skus: string[]) => Promise<Array<Product>>;
 /**
  * Get a list of subscriptions
  * @param {string[]} skus The item skus
@@ -49,7 +49,7 @@ export declare const getAvailablePurchases: () => Promise<(InAppPurchase | Subsc
  * @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 | undefined, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined) => Promise<InAppPurchase>;
+export declare const requestPurchase: (sku: 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
@@ -60,7 +60,7 @@ export declare const requestPurchase: (sku: string, andDangerouslyFinishTransact
  * @param {string} [obfuscatedProfileIdAndroid] Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.
  * @returns {Promise<SubscriptionPurchase | null>} Promise resolves to null when using proratioModesAndroid=DEFERRED, and to a SubscriptionPurchase otherwise
  */
-export declare const requestSubscription: (sku: string, andDangerouslyFinishTransactionAutomaticallyIOS?: boolean | undefined, purchaseTokenAndroid?: string | undefined, prorationModeAndroid?: ProrationModesAndroid | undefined, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined) => Promise<SubscriptionPurchase | null>;
+export declare const requestSubscription: (sku: string, andDangerouslyFinishTransactionAutomaticallyIOS?: boolean, purchaseTokenAndroid?: string | undefined, prorationModeAndroid?: ProrationModesAndroid, obfuscatedAccountIdAndroid?: string | undefined, obfuscatedProfileIdAndroid?: string | undefined) => Promise<SubscriptionPurchase | null>;
 /**
  * Request a purchase for product. This will be received in `PurchaseUpdatedListener`.
  * @param {string} sku The product's sku/ID
@@ -165,12 +165,12 @@ export declare const validateReceiptAndroid: (packageName: string, productId: st
  */
 export declare const validateReceiptAmazon: (developerSecret: string, userId: string, receiptId: string, useSandbox?: boolean) => Promise<Amazon.ReceiptType>;
 /**
- * Add IAP purchase event in ios.
+ * Add IAP purchase event
  * @returns {callback(e: InAppPurchase | ProductPurchase)}
  */
 export declare const purchaseUpdatedListener: (listener: (event: InAppPurchase | SubscriptionPurchase) => void) => EmitterSubscription;
 /**
- * Add IAP purchase error event in ios.
+ * Add IAP purchase error event
  * @returns {callback(e: PurchaseError)}
  */
 export declare const purchaseErrorListener: (listener: (errorEvent: PurchaseError) => void) => EmitterSubscription;

package/src/iap.js

@@ -132,14 +132,14 @@ 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) {
-                return [2 /*return*/, getIosModule()
-                        .getItems(skus)
-                        .then(function (items) {
-                        return items.filter(function (item) {
-                            return skus.includes(item.productId);
-                        });
-                    })];
+                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); })];
+                }
             });
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -163,12 +163,16 @@ 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) {
-                return [2 /*return*/, getIosModule()
-                        .getItems(skus)
-                        .then(function (items) {
-                        return items.filter(function (item) { return skus.includes(item.productId); });
-                    })];
+                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);
+                            })];
+                }
             });
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -247,13 +251,12 @@ export var getAvailablePurchases = function () {
  * @returns {Promise<InAppPurchase>}
  */
 export var requestPurchase = function (sku, andDangerouslyFinishTransactionAutomaticallyIOS, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid) {
+    if (andDangerouslyFinishTransactionAutomaticallyIOS === void 0) { andDangerouslyFinishTransactionAutomaticallyIOS = false; }
+    if (obfuscatedAccountIdAndroid === void 0) { obfuscatedAccountIdAndroid = undefined; }
+    if (obfuscatedProfileIdAndroid === void 0) { obfuscatedProfileIdAndroid = undefined; }
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                andDangerouslyFinishTransactionAutomaticallyIOS =
-                    andDangerouslyFinishTransactionAutomaticallyIOS === undefined
-                        ? false
-                        : andDangerouslyFinishTransactionAutomaticallyIOS;
                 if (andDangerouslyFinishTransactionAutomaticallyIOS)
                     // eslint-disable-next-line no-console
                     console.warn(
@@ -280,13 +283,14 @@ export var requestPurchase = function (sku, andDangerouslyFinishTransactionAutom
  * @returns {Promise<SubscriptionPurchase | null>} Promise resolves to null when using proratioModesAndroid=DEFERRED, and to a SubscriptionPurchase otherwise
  */
 export var requestSubscription = function (sku, andDangerouslyFinishTransactionAutomaticallyIOS, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid) {
+    if (andDangerouslyFinishTransactionAutomaticallyIOS === void 0) { andDangerouslyFinishTransactionAutomaticallyIOS = false; }
+    if (purchaseTokenAndroid === void 0) { purchaseTokenAndroid = undefined; }
+    if (prorationModeAndroid === void 0) { prorationModeAndroid = -1; }
+    if (obfuscatedAccountIdAndroid === void 0) { obfuscatedAccountIdAndroid = undefined; }
+    if (obfuscatedProfileIdAndroid === void 0) { obfuscatedProfileIdAndroid = undefined; }
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                andDangerouslyFinishTransactionAutomaticallyIOS =
-                    andDangerouslyFinishTransactionAutomaticallyIOS === undefined
-                        ? false
-                        : andDangerouslyFinishTransactionAutomaticallyIOS;
                 if (andDangerouslyFinishTransactionAutomaticallyIOS)
                     // eslint-disable-next-line no-console
                     console.warn(
@@ -297,8 +301,6 @@ export var requestSubscription = function (sku, andDangerouslyFinishTransactionA
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                if (!prorationModeAndroid)
-                    prorationModeAndroid = -1;
                 return [2 /*return*/, getAndroidModule().buyItemByType(ANDROID_ITEM_TYPE_SUBSCRIPTION, sku, purchaseTokenAndroid, prorationModeAndroid, obfuscatedAccountIdAndroid, obfuscatedProfileIdAndroid)];
             });
         }); },
@@ -553,33 +555,22 @@ export var validateReceiptAmazon = function (developerSecret, userId, receiptId,
     });
 };
 /**
- * Add IAP purchase event in ios.
+ * Add IAP purchase event
  * @returns {callback(e: InAppPurchase | ProductPurchase)}
  */
 export var purchaseUpdatedListener = function (listener) {
-    if (Platform.OS === 'ios') {
-        var myModuleEvt = new NativeEventEmitter(getIosModule());
-        return myModuleEvt.addListener('purchase-updated', listener);
-    }
-    else {
-        var myRNIapModule = getAndroidModule();
-        var myModuleEvt = new NativeEventEmitter(myRNIapModule);
-        var emitterSubscription = myModuleEvt.addListener('purchase-updated', listener);
-        myRNIapModule.startListening();
-        return emitterSubscription;
-    }
+    var myModuleEvt = new NativeEventEmitter(getNativeModule());
+    var emitterSubscription = myModuleEvt.addListener('purchase-updated', listener);
+    if (Platform.OS === 'android')
+        getAndroidModule().startListening();
+    return emitterSubscription;
 };
 /**
- * Add IAP purchase error event in ios.
+ * Add IAP purchase error event
  * @returns {callback(e: PurchaseError)}
  */
 export var purchaseErrorListener = function (listener) {
-    if (Platform.OS === 'ios') {
-        var myModuleEvt = new NativeEventEmitter(getIosModule());
-        return myModuleEvt.addListener('purchase-error', listener);
-    }
-    else
-        return new NativeEventEmitter(getAndroidModule()).addListener('purchase-error', listener);
+    return new NativeEventEmitter(getNativeModule()).addListener('purchase-error', listener);
 };
 /**
  * Get the current receipt base64 encoded in IOS.

package/src/index.d.ts

@@ -1,3 +1,4 @@
 export * from './types';
 export * from './hooks/useIAP';
+export * from './hooks/withIAPContext';
 export * from './iap';

package/src/index.js

@@ -1,3 +1,4 @@
 export * from './types';
 export * from './hooks/useIAP';
+export * from './hooks/withIAPContext';
 export * from './iap';

package/src/types/index.d.ts

@@ -48,12 +48,13 @@ export interface ProductPurchase {
     transactionDate: number;
     transactionReceipt: string;
     purchaseToken?: string;
+    quantityIOS?: number;
+    originalTransactionDateIOS?: string;
+    originalTransactionIdentifierIOS?: string;
     dataAndroid?: string;
     signatureAndroid?: string;
     autoRenewingAndroid?: boolean;
     purchaseStateAndroid?: PurchaseStateAndroid;
-    originalTransactionDateIOS?: string;
-    originalTransactionIdentifierIOS?: string;
     isAcknowledgedAndroid?: boolean;
     packageNameAndroid?: string;
     developerPayloadAndroid?: string;
@@ -62,6 +63,7 @@ export interface ProductPurchase {
     userIdAmazon?: string;
     userMarketplaceAmazon?: string;
     userJsonAmazon?: string;
+    isCanceledAmazon?: boolean;
 }
 export interface PurchaseResult {
     responseCode?: number;
@@ -92,9 +94,9 @@ export interface Discount {
     paymentMode: '' | 'FREETRIAL' | 'PAYASYOUGO' | 'PAYUPFRONT';
     subscriptionPeriod: string;
 }
-export interface Product<ProductId extends string = string> extends ProductCommon {
+export interface Product extends ProductCommon {
     type: 'inapp' | 'iap';
-    productId: ProductId;
+    productId: string;
 }
 export interface Subscription extends ProductCommon {
     type: 'subs' | 'sub';