chore: Rename oldProductId to originalPurchaseToken when updating subscription

Author: hero

android/src/main/java/net/class101/iap/RNInAppPurchaseModule.java

@@ -158,22 +158,22 @@ public void fetchProducts(ReadableArray productIds) {
      * Purchase in-app or subscription item.
      *
      * @param productId Unique ID of item to purchase.
-     * @param oldProductId When upgrading or downgrading a subscription, the unique ID of the
-     *                     subscription item that user originally used.
+     * @param originalPurchaseToken When upgrading or downgrading a subscription, purchase token
+     *                              of the subscription that user originally used.
      */
     @ReactMethod
-    public void purchase(String productId, @Nullable String oldProductId) {
+    public void purchase(String productId, @Nullable String originalPurchaseToken) {
         tryConnect(() -> {
             if (getCurrentActivity() == null) {
               return;
             }
 
             BillingFlowParams.Builder builder = BillingFlowParams.newBuilder();
 
-            if (oldProductId != null) {
+            if (originalPurchaseToken != null) {
                 builder.setSubscriptionUpdateParams(
                     BillingFlowParams.SubscriptionUpdateParams.newBuilder()
-                        .setOldSkuPurchaseToken(oldProductId)
+                        .setOldSkuPurchaseToken(originalPurchaseToken)
                         .build()
                 );
             }

index.d.ts

@@ -38,7 +38,7 @@ declare module "@class101/react-native-in-app-purchase" {
 
   function fetchProducts(productIds: string[]): void;
 
-  function purchase(productId: string, oldProductId?: string): void;
+  function purchase(productId: string, originalPurchaseToken?: string): void;
 
   function finalize(purchase: Purchase, isConsumable: boolean): Promise<void>;
 

index.js

@@ -3,61 +3,70 @@ import {
   NativeEventEmitter,
   DeviceEventEmitter,
   Platform,
-} from 'react-native';
+} from "react-native";
 
 const { RNInAppPurchase } = NativeModules;
 
 const ERROR = {
-  FETCH_PRODUCTS: 'FETCH_PRODUCTS',
-  PURCHASE: 'PURCHASE',
-  CONNECTION: 'CONNECTION',
+  FETCH_PRODUCTS: "FETCH_PRODUCTS",
+  PURCHASE: "PURCHASE",
+  CONNECTION: "CONNECTION",
 };
 
-const addListener = (event, listener) => Platform.select({
-  ios: new NativeEventEmitter(RNInAppPurchase),
-  android: DeviceEventEmitter,
-}).addListener(event, listener);
+const addListener = (event, listener) =>
+  Platform.select({
+    ios: new NativeEventEmitter(RNInAppPurchase),
+    android: DeviceEventEmitter,
+  }).addListener(event, listener);
 
-const removeAllListeners = (event) => Platform.select({
-  ios: new NativeEventEmitter(RNInAppPurchase),
-  android: DeviceEventEmitter,
-}).removeAllListeners(event);
+const removeAllListeners = (event) =>
+  Platform.select({
+    ios: new NativeEventEmitter(RNInAppPurchase),
+    android: DeviceEventEmitter,
+  }).removeAllListeners(event);
 
-const onFetchProducts = listener => addListener('iap:onFetchProductsSuccess', listener);
+const onFetchProducts = (listener) =>
+  addListener("iap:onFetchProductsSuccess", listener);
 
-const onPurchase = listener => addListener('iap:onPurchaseSuccess', listener);
+const onPurchase = (listener) => addListener("iap:onPurchaseSuccess", listener);
 
 const onError = (listener) => {
-  if (Platform.OS === 'android') {
-    addListener('iap:onConnectionFailure', e => listener(Object.assign(e, { type: ERROR.CONNECTION })));
+  if (Platform.OS === "android") {
+    addListener("iap:onConnectionFailure", (e) =>
+      listener(Object.assign(e, { type: ERROR.CONNECTION }))
+    );
   }
-  addListener('iap:onFetchProductsFailure', e => listener(Object.assign(e, { type: ERROR.FETCH_PRODUCTS })));
-  addListener('iap:onPurchaseFailure', e => listener(Object.assign(e, { type: ERROR.PURCHASE })));
+  addListener("iap:onFetchProductsFailure", (e) =>
+    listener(Object.assign(e, { type: ERROR.FETCH_PRODUCTS }))
+  );
+  addListener("iap:onPurchaseFailure", (e) =>
+    listener(Object.assign(e, { type: ERROR.PURCHASE }))
+  );
 };
 
 const clear = () => {
-  removeAllListeners('iap:onFetchProductsSuccess');
-  removeAllListeners('iap:onPurchaseSuccess');
-  removeAllListeners('iap:onFetchProductsFailure');
-  removeAllListeners('iap:onPurchaseFailure');
-  if (Platform.OS === 'android') {
-    removeAllListeners('iap:onConnectionFailure');
+  removeAllListeners("iap:onFetchProductsSuccess");
+  removeAllListeners("iap:onPurchaseSuccess");
+  removeAllListeners("iap:onFetchProductsFailure");
+  removeAllListeners("iap:onPurchaseFailure");
+  if (Platform.OS === "android") {
+    removeAllListeners("iap:onConnectionFailure");
   }
 };
 
-const purchase = (productId, oldProductId) => {
-  if (Platform.OS === 'android') {
-    RNInAppPurchase.purchase(productId, oldProductId || null);
+const purchase = (productId, originalPurchaseToken) => {
+  if (Platform.OS === "android") {
+    RNInAppPurchase.purchase(productId, originalPurchaseToken || null);
   } else {
     RNInAppPurchase.purchase(productId);
   }
 };
 
 const finalize = (purchase, isConsumable) => {
-  return Platform.OS === 'android'
+  return Platform.OS === "android"
     ? RNInAppPurchase.finalize(purchase, isConsumable)
     : RNInAppPurchase.finalize(purchase);
-}
+};
 
 export default {
   configure: RNInAppPurchase.configure,
@@ -70,4 +79,4 @@ export default {
   onError,
   clear,
   ERROR,
-}
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@class101/react-native-in-app-purchase",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "👻 A dead simple in app purchase library for React Native",
   "main": "index.js",
   "repository": "https://github.com/pedaling/react-native-in-app-purchase",