react-native-iap 7.5.0 → 7.5.1

package/CHANGELOG.md

@@ -1,11 +1,20 @@
 ## Changelogs
 
+# 7.5.1
+
+- Refresh SkuDetails (#1566)
+- fix: NativeEventEmitter warnings since ReactNative 0.65 (#1544)
+- Using TCK Tested JDK builds of OpenJDK (#1525)
+- Add missing types for finishTransaction within useIAP() (#1533)
+
 # 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)
 

package/README.md

@@ -1,6 +1,7 @@
-![image](https://user-images.githubusercontent.com/27461460/75094417-20321b00-55ce-11ea-8de7-a1df42a4b7df.png)
-================
+# ![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)
 [![Download](http://img.shields.io/npm/dm/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
 [![Build Status](https://travis-ci.com/dooboolab/react-native-iap.svg?branch=master)](https://travis-ci.com/dooboolab/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)
@@ -20,10 +21,17 @@ Published in [website](https://react-native-iap.dooboolab.com).
 
 ## Announcement
 
-React Native IAP hook is out. You can see [medium post](https://medium.com/dooboolab/announcing-react-native-iap-hooks-96c7ffd3f19a) on how to use it.
+- 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.
+
+  ```
+  yarn add react-native-iap@next
+  ```
+
+- React Native IAP hook is out. You can see [medium post](https://medium.com/dooboolab/announcing-react-native-iap-hooks-96c7ffd3f19a) on how to use it.
+
+- The `react-native-iap` module hasn't been maintained well recently. We are thinking of participating again and make the module healthier. Please refer to [2021 Maintenance plan](https://github.com/dooboolab/react-native-iap/issues/1241) and share with us how you or your organization is using it. Happy new year 🎉
 
-The `react-native-iap` module hasn't been maintained well recently. We are thinking of participating again and make the module healthier. Please refer to [2021 Maintenance plan](https://github.com/dooboolab/react-native-iap/issues/1241) and share with us how you or your organization is using it. Happy new year 🎉
-- The sample code is out in [Sponsor page](https://github.com/hyochan/dooboolab.com/blob/master/src/components/pages/Sponsor.tsx) in [dooboolab.com](https://github.com/hyochan/dooboolab.com) repository which sadly is rejected by Apple because of lacking product features. I will work on another example project to support this module. More information in [#1241 commment](https://github.com/dooboolab/react-native-iap/issues/1241#issuecomment-798540785).
+  - The sample code is out in [Sponsor page](https://github.com/hyochan/dooboolab.com/blob/master/src/components/pages/Sponsor.tsx) in [dooboolab.com](https://github.com/hyochan/dooboolab.com) repository which sadly is rejected by Apple because of lacking product features. I will work on another example project to support this module. More information in [#1241 commment](https://github.com/dooboolab/react-native-iap/issues/1241#issuecomment-798540785).
 
 ## Introduction
 
@@ -35,26 +43,28 @@ Also, implementing the client side is only one side of the coin, you'll have to
 If you're looking for a module going further than react-native-iap, we recommend using [react-native-iaphub](https://github.com/iaphub/react-native-iaphub) which is taking care of everything from the client side to the server side.
 
 ⚠️ Most of users experiencing issues are caused by:
-  - A device simulator, use a real device for testing!
-  - The sandbox environment of the project not being configured properly ([Configure android sandbox](https://www.iaphub.com/docs/set-up-android/configure-sandbox-testing), [Configure ios sandbox](https://www.iaphub.com/docs/set-up-ios/configure-sandbox-testing/))
-  - An incorrect usage of the library
 
+- A device simulator, use a real device for testing!
+- The sandbox environment of the project not being configured properly ([Configure android sandbox](https://www.iaphub.com/docs/set-up-android/configure-sandbox-testing), [Configure ios sandbox](https://www.iaphub.com/docs/set-up-ios/configure-sandbox-testing/))
+- An incorrect usage of the library
+
+## Demo
 
-Demo
-----------
->
 > ![demo.gif](https://user-images.githubusercontent.com/27461460/52619625-87aa8a80-2ee5-11e9-9aee-6691c34408f3.gif)
 
 <!-- Inline anchors -->
+
 [a-acknowledge-purchase-android]: #finishing-a-purchase
 [a-migration-guide]: #migration-guide
 [a-purchase-flow]: #new-purchase-flow
 
 <!-- Official Blog -->
+
 [blog-config-steps]: https://medium.com/p/121622d26b67
 [blog-v3-note]: https://medium.com/p/1259e0b0c017
 
 <!-- Internals -->
+
 [contribute]: https://github.com/dooboolab/react-native-iap/blob/master/CONTRIBUTING.md
 [example]: https://github.com/dooboolab/react-native-iap/tree/master/IapExample
 [issue-126-c1]: https://github.com/dooboolab/react-native-iap/issues/126#issuecomment-439084872
@@ -72,8 +82,9 @@ Demo
 [readme-deprecated]: https://github.com/dooboolab/react-native-iap/blob/master/README_DEPRECATED.md
 
 <!-- Externals -->
-[android-acknowledge-purchase]: https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#acknowledgePurchase(com.android.billingclient.api.AcknowledgePurchaseParams,%20com.android.billingclient.api.AcknowledgePurchaseResponseListener) "BillingClient#acknowledgePurchase()"
-[android-end-connection]: https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#endConnection() "BillingClient#endConnection()"
+
+[android-acknowledge-purchase]: https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#acknowledgePurchase(com.android.billingclient.api.AcknowledgePurchaseParams,%20com.android.billingclient.api.AcknowledgePurchaseResponseListener) 'BillingClient#acknowledgePurchase()'
+[android-end-connection]: https://developer.android.com/reference/com/android/billingclient/api/BillingClient.html#endConnection() 'BillingClient#endConnection()'
 [android-iap-validation-guide]: https://developer.android.com/google/play/billing/billing_library_overview
 [android-migrate-androidx]: https://developer.android.com/jetpack/androidx/migrate
 [android-sku-details]: https://developer.android.com/reference/com/android/billingclient/api/SkuDetails
@@ -85,80 +96,87 @@ Demo
 [stackoverflow-android-iap-validation]: https://stackoverflow.com/questions/35127086
 [android-access-token-example-repo]: https://github.com/Bang9/android-get-access-token-example
 
-Quick News
-----------
+## 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 promptly for migration issues.
-    Don't get surprised too much on why it is bumping up version so quickly these days.
+  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 coming in `iOS 13`.
 
-Breaking Changes
-----------------
+## 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).
 
 [6.1.0]
+
 - Creates two variants: `play` and `amazon` and only uses the required code.
   ```
   NOTE: This would be a breaking change with a very simple fix described in the documentation. To add: `missingDimensionStrategy 'store', 'play'` `in build.gradle`
   ```
-[3.0.0+]
-[react-native-iap V3 note][blog-v3-note]
+  [3.0.0+]
+  [react-native-iap V3 note][blog-v3-note]
+
+## Configuration of Google Play & iTunes Connect
 
-Configuration of Google Play & iTunes Connect
----------------------------------------------
 - Please refer to [Blog][blog-config-steps].
 
-[Deprecated README][readme-deprecated]
---------------------------------------
+## [Deprecated README][readme-deprecated]
+
 - If you are using `react-native-iap@^2.*`, please follow the above README.
 
-Usage
------
+## Usage
+
 You can look in the [`RNIapExample/`][example] folder to try the example.
 
 NOTE: To run `RNIapExample` on Android use the variant flag as follows:
+
 ```
 yarn android --variant=MY_VARIANT
 ```
+
 where `MY_VARIANT` is `PlayDebug` or `AmazonDebug`
 
 Below is basic implementation which is also provided in `RNIapExample` project.
 
 If you want more advanced one please refer to [dooboolab.com/sponsor.tsx](https://github.com/hyochan/dooboolab.com/blob/master/src/components/pages/Sponsor.tsx)
 
-Sponsoring
-----------
+## Sponsoring
 
 Since `IAP` itself is not perfect on each platform, we desperately need
 this project to be maintained. If you'd like to help us, please consider being
 with us in [Open Collective](https://opencollective.com/react-native-iap).
 
 ### Sponsors
+
 Support this project by becoming a sponsor. Your logo will show up here with
 a link to your website. [Become a sponsor][open-collective-sponsor].
 <a href="https://opencollective.com/react-native-iap#sponsors" target="_blank"><img src="https://opencollective.com/react-native-iap/sponsors.svg?width=890"></a>
 
 ### Backers
+
 Please be our [Backers][open-collective-backer].
 <a href="https://opencollective.com/react-native-iap#backers" target="_blank"><img src="https://opencollective.com/react-native-iap/backers.svg?width=890"></a>
 
 ### Contributing
+
 Please make sure to read the [Contributing Guide][contribute] before making a pull request.
 Thank you to all the people who helped to maintain and upgrade this project!
 
 <a href="graphs/contributors"><img src="https://opencollective.com/react-native-iap/contributors.svg?width=890" /></a>
+
 <hr>
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdooboolab%2Freact-native-iap.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdooboolab%2Freact-native-iap?ref=badge_large)

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

@@ -117,4 +117,14 @@ public class RNIapAmazonModule extends ReactContextBaseJavaModule {
   public void startListening(final Promise promise) {
     sendUnconsumedPurchases(promise);
   }
+
+  @ReactMethod
+  public void addListener(String eventName) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
+  @ReactMethod
+  public void removeListeners(double count) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
 }

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

@@ -36,7 +36,9 @@ import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class RNIapModule extends ReactContextBaseJavaModule implements PurchasesUpdatedListener {
   final String TAG = "RNIapModule";
@@ -45,12 +47,12 @@ public class RNIapModule extends ReactContextBaseJavaModule implements Purchases
   private final ReactContext reactContext;
   private BillingClient billingClientCache;
 
-  private final List<SkuDetails> skus;
+  private final Map<String, SkuDetails> skus;
 
   public RNIapModule(ReactApplicationContext reactContext) {
     super(reactContext);
     this.reactContext = reactContext;
-    this.skus = new ArrayList<>();
+    this.skus = new HashMap<>();
     LifecycleEventListener lifecycleEventListener =
         new LifecycleEventListener() {
           @Override
@@ -245,9 +247,7 @@ public class RNIapModule extends ReactContextBaseJavaModule implements Purchases
 
                 if (skuDetailsList != null) {
                   for (SkuDetails sku : skuDetailsList) {
-                    if (!skus.contains(sku)) {
-                      skus.add(sku);
-                    }
+                    skus.put(sku.getSku(), sku);
                   }
                 }
                 WritableNativeArray items = new WritableNativeArray();
@@ -417,13 +417,7 @@ public class RNIapModule extends ReactContextBaseJavaModule implements Purchases
           DoobooUtils.getInstance().addPromiseForKey(PROMISE_BUY_ITEM, promise);
           final BillingFlowParams.Builder builder = BillingFlowParams.newBuilder();
 
-          SkuDetails selectedSku = null;
-          for (SkuDetails skuDetail : skus) {
-            if (skuDetail.getSku().equals(sku)) {
-              selectedSku = skuDetail;
-              break;
-            }
-          }
+          SkuDetails selectedSku = skus.get(sku);
 
           if (selectedSku == null) {
             String debugMessage =
@@ -663,6 +657,16 @@ public class RNIapModule extends ReactContextBaseJavaModule implements Purchases
     sendUnconsumedPurchases(promise);
   }
 
+  @ReactMethod
+  public void addListener(String eventName) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
+  @ReactMethod
+  public void removeListeners(double count) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
   @ReactMethod
   public String getPackageName() {
     return getReactApplicationContext().getPackageName();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "React Native In App Purchase Module.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/hooks/useIAP.d.ts

@@ -9,13 +9,13 @@ declare type IAP_STATUS = {
     availablePurchases: Purchase[];
     currentPurchase?: Purchase;
     currentPurchaseError?: PurchaseError;
-    finishTransaction: (purchase: Purchase) => Promise<string | void>;
+    finishTransaction: (purchase: Purchase, isConsumable?: boolean, developerPayloadAndroid?: string) => Promise<string | void>;
     getAvailablePurchases: () => Promise<void>;
     getPurchaseHistories: () => Promise<void>;
     getProducts: (skus: string[]) => Promise<void>;
     getSubscriptions: (skus: string[]) => Promise<void>;
     requestPurchase: typeof iapRequestPurchase;
-    requesSubscription: typeof iapRequestSubscription;
+    requestSubscription: typeof iapRequestSubscription;
 };
 export declare function useIAP(): IAP_STATUS;
 export {};

package/src/hooks/useIAP.js

@@ -133,6 +133,6 @@ export function useIAP() {
         getAvailablePurchases: getAvailablePurchases,
         getPurchaseHistories: getPurchaseHistories,
         requestPurchase: iapRequestPurchase,
-        requesSubscription: iapRequestSubscription,
+        requestSubscription: iapRequestSubscription,
     };
 }

package/src/types/index.d.ts

@@ -40,7 +40,7 @@ export interface ProductCommon {
     price: string;
     currency: string;
     localizedPrice: string;
-    countryCodeIOS?: string;
+    countryCode?: string;
 }
 export interface ProductPurchase {
     productId: string;

package/src/hooks/withIAPContext.tsx

@@ -1,150 +0,0 @@
-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>
-    );
-  };
-}