react-native-iap 8.3.0 → 8.5.1

package/README.md

@@ -1,7 +1,8 @@
 # ![image](https://user-images.githubusercontent.com/27461460/75094417-20321b00-55ce-11ea-8de7-a1df42a4b7df.png)
 
 [![Version](http://img.shields.io/npm/v/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
-<!-- [![Next](https://img.shields.io/npm/v/react-native-iap/next.svg?style=flat-square)](https://npmjs.org/package/react-native-iap) -->
+[![Next Version](https://img.shields.io/npm/v/react-native-iap/next)](https://npmjs.org/package/react-native-iap)
+
 [![Download](http://img.shields.io/npm/dm/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
 [![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)
@@ -20,7 +21,11 @@ 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 `9.0.0` is currently in release candidate. The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0) and iOS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). Our core maintainer [andresesfm](https://github.com/andresesfm) is working hard on this. Please [fund the project](https://opencollective.com/react-native-iap) if you wish to support his effort. The fund goes to maintainers. To try the earlier version please use the `next` package.
+
+  ```
+  yarn add react-native-iap@next
+  ```
 
 - 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`.
 

package/ios/RNIapIos.m

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

package/ios/RNIapIos.swift

@@ -47,6 +47,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         myQueue = DispatchQueue(label: "reject")
         validProducts = [SKProduct]()
         super.init()
+        SKPaymentQueue.default().add(self)
     }
     
     deinit {
@@ -132,12 +133,6 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
         _ resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
-        SKPaymentQueue.default().remove(RNIapQueue.shared)
-        if let queue = RNIapQueue.shared.queue, let payment = RNIapQueue.shared.payment, let product = RNIapQueue.shared.product  {
-            let val = paymentQueue(queue, shouldAddStorePayment: payment,for: product)
-            print("Promoted product response \(val)")
-        }
-        SKPaymentQueue.default().add(self)
         let canMakePayments = SKPaymentQueue.canMakePayments()
         resolve(NSNumber(value: canMakePayments))
     }
@@ -179,6 +174,7 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
     @objc public func buyProduct(
         _ sku:String,
         andDangerouslyFinishTransactionAutomatically: Bool,
+        applicationUsername:String?,
         resolve: @escaping RCTPromiseResolveBlock = { _ in },
         reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
     ) {
@@ -197,6 +193,10 @@ class RNIapIos: RCTEventEmitter, SKRequestDelegate, SKPaymentTransactionObserver
             addPromise(forKey: prod.productIdentifier, resolve: resolve, reject: reject)
             
             let payment = SKMutablePayment(product: prod)
+
+            if (applicationUsername != nil) {
+                payment.applicationUsername = applicationUsername 
+            }
             SKPaymentQueue.default().add(payment)
         } else{
             if hasListeners {
@@ -341,7 +341,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/package.json

@@ -1,7 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "8.3.0",
-  "packageManager": "yarn@3.2.0",
+  "version": "8.5.1",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",
   "types": "index.d.ts",

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} [applicationUsername] 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, applicationUsername?: 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,15 @@ 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;
+            var products;
             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); })];
+                        products = _a.sent();
+                        return [2 /*return*/, products.filter(function (item) {
+                                return skus.includes(item.productId) && item.type === 'iap';
+                            })];
                 }
             });
         }); },
@@ -166,14 +168,14 @@ 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;
+            var subscriptions;
             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);
+                        subscriptions = _a.sent();
+                        return [2 /*return*/, subscriptions.filter(function (item) {
+                                return skus.includes(item.productId) && item.type === 'subs';
                             })];
                 }
             });
@@ -256,15 +258,17 @@ 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} [applicationUsername] 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, applicationUsername) {
     if (andDangerouslyFinishTransactionAutomaticallyIOS === void 0) { andDangerouslyFinishTransactionAutomaticallyIOS = false; }
     if (obfuscatedAccountIdAndroid === void 0) { obfuscatedAccountIdAndroid = undefined; }
     if (obfuscatedProfileIdAndroid === void 0) { obfuscatedProfileIdAndroid = undefined; }
+    if (applicationUsername === void 0) { applicationUsername = undefined; }
     return (Platform.select({
         ios: function () { return __awaiter(void 0, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -274,7 +278,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, andDangerouslyFinishTransactionAutomaticallyIOS, applicationUsername)];
             });
         }); },
         android: function () { return __awaiter(void 0, void 0, void 0, function () {

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;
@@ -115,3 +115,11 @@ export interface Subscription extends ProductCommon {
     subscriptionPeriodAndroid?: string;
     freeTrialPeriodAndroid?: string;
 }
+export interface RequestPurchase {
+    sku: string;
+    andDangerouslyFinishTransactionAutomaticallyIOS: boolean;
+    applicationUsername?: string;
+    obfuscatedAccountIdAndroid: string | undefined;
+    obfuscatedProfileIdAndroid: string | undefined;
+    selectedOfferIndex: number;
+}