Adds shouldPurchasePromoProduct (#98)

Author: vegaro

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.2
+
+- Adds `Purchases.addShouldPurchasePromoProduct` to be able to handle purchases started from the Apple App Store.
+
 ## 3.0.1
 
 - Updates Android SDK to 3.0.3 which should fix issues with restores and syncs.

VERSIONS.md

@@ -1,5 +1,6 @@
 | Version | iOS version | Android version | Common files version |
 |---------|-------------|-----------------|----------------------|
+| 3.0.2   | 3.0.0       | 3.0.3           | 1.0.3                |
 | 3.0.1   | 3.0.0       | 3.0.3           | 1.0.1                |
 | 3.0.0   | 3.0.0       | 3.0.2           | 1.0.1                |
 | 2.4.1   | 2.6.0       | 2.4.0           | 0.1.4                |

__tests__/index.test.js

@@ -1,4 +1,6 @@
-const {NativeModules} = require("react-native");
+const {NativeModules, NativeEventEmitter} = require("react-native");
+
+const nativeEmitter = new NativeEventEmitter();
 
 describe("Purchases", () => {
   beforeEach(() => {
@@ -20,11 +22,8 @@ describe("Purchases", () => {
 
     Purchases.addPurchaserInfoUpdateListener(listener);
 
-    const nativeEmitter = new NativeEventEmitter();
-
     nativeEmitter.emit("Purchases-PurchaserInfoUpdated", purchaserInfoStub);
 
-    expect(listener).toEqual(expect.any(Function));
     expect(listener).toHaveBeenCalledWith(purchaserInfoStub);
   });
 
@@ -34,8 +33,6 @@ describe("Purchases", () => {
     Purchases.addPurchaserInfoUpdateListener(listener);
     Purchases.removePurchaserInfoUpdateListener(listener);
 
-    const nativeEmitter = new NativeEventEmitter();
-
     const eventInfo = {
       purchaserInfo: purchaserInfoStub,
       error: null,
@@ -46,6 +43,65 @@ describe("Purchases", () => {
     expect(listener).toHaveBeenCalledTimes(0);
   });
 
+  it("addShouldPurchasePromoProductListener correctly saves listeners", () => {
+    const listener = jest.fn();
+    const Purchases = require("../index").default;
+
+    Purchases.addShouldPurchasePromoProductListener(listener);
+
+    const nativeEmitter = new NativeEventEmitter();
+    const eventInfo = {
+      callbackID: 1,
+    };
+    nativeEmitter.emit("Purchases-ShouldPurchasePromoProduct", eventInfo);
+
+    expect(listener).toHaveBeenCalledWith(expect.any(Function));
+  });
+
+  it("shouldPurchasePromoProductListener calls deferred purchase", async () => {
+    const listener = deferredPurchase => {
+      this.deferredPurchase = deferredPurchase;
+    };
+
+    const Purchases = require("../index").default;
+
+    Purchases.addShouldPurchasePromoProductListener(listener);
+
+    const nativeEmitter = new NativeEventEmitter();
+    const eventInfo = {
+      callbackID: 1,
+    };
+    nativeEmitter.emit("Purchases-ShouldPurchasePromoProduct", eventInfo);
+
+    NativeModules.RNPurchases.makeDeferredPurchase.mockResolvedValue({
+      purchasedProductIdentifier: "123",
+      purchaserInfo: purchaserInfoStub
+    });
+
+    let {purchaserInfo, purchasedProductIdentifier} = await this.deferredPurchase();
+
+    expect(NativeModules.RNPurchases.makeDeferredPurchase).toBeCalledWith(1);
+    expect(purchaserInfo).toEqual(purchaserInfoStub);
+    expect(purchasedProductIdentifier).toEqual("123");
+  });
+
+  it("removeShouldPurchasePromoProductListener correctly removes a listener", () => {
+    const Purchases = require("../index").default;
+    const listener = jest.fn();
+    Purchases.addShouldPurchasePromoProductListener(listener);
+    Purchases.removeShouldPurchasePromoProductListener(listener);
+
+    const nativeEmitter = new NativeEventEmitter();
+
+    const eventInfo = {
+      callbackID: 1,
+    };
+
+    nativeEmitter.emit("Purchases-ShouldPurchasePromoProduct", eventInfo);
+
+    expect(listener).toHaveBeenCalledTimes(0);
+  });
+
   it("calling setup with something other than string throws exception", () => {
     const Purchases = require("../index").default;
 

android/src/main/java/com/reactlibrary/RNPurchasesConverters.java

@@ -0,0 +1,90 @@
+package com.reactlibrary
+
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.WritableNativeArray
+import com.facebook.react.bridge.WritableNativeMap
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+internal object RNPurchasesConverters {
+    @JvmStatic
+    @Throws(JSONException::class)
+    fun convertReadableMapToJson(readableMap: ReadableMap?): JSONObject {
+        val jsonObject = JSONObject()
+        val iterator = readableMap!!.keySetIterator()
+        while (iterator.hasNextKey()) {
+            val key = iterator.nextKey()
+            when (readableMap.getType(key)) {
+                ReadableType.Null -> jsonObject.put(key, JSONObject.NULL)
+                ReadableType.Boolean -> jsonObject.put(key, readableMap.getBoolean(key))
+                ReadableType.Number -> jsonObject.put(key, readableMap.getDouble(key))
+                ReadableType.String -> jsonObject.put(key, readableMap.getString(key))
+                ReadableType.Map -> jsonObject.put(
+                    key,
+                    convertReadableMapToJson(readableMap.getMap(key))
+                )
+                ReadableType.Array -> jsonObject.put(
+                    key,
+                    convertReadableArrayToJson(readableMap.getArray(key))
+                )
+            }
+        }
+        return jsonObject
+    }
+
+    @Throws(JSONException::class)
+    fun convertReadableArrayToJson(readableArray: ReadableArray?): JSONArray {
+        val array = JSONArray()
+        for (i in 0 until readableArray!!.size()) {
+            when (readableArray.getType(i)) {
+                ReadableType.Null -> { }
+                ReadableType.Boolean -> array.put(readableArray.getBoolean(i))
+                ReadableType.Number -> array.put(readableArray.getDouble(i))
+                ReadableType.String -> array.put(readableArray.getString(i))
+                ReadableType.Map -> array.put(convertReadableMapToJson(readableArray.getMap(i)))
+                ReadableType.Array -> array.put(convertReadableArrayToJson(readableArray.getArray(i)))
+            }
+        }
+        return array
+    }
+
+    private fun convertArrayToWritableArray(array: Array<Any?>): WritableArray {
+        val writableArray: WritableArray = WritableNativeArray()
+        for (item in array) {
+            when (item) {
+                null -> writableArray.pushNull()
+                is Boolean -> writableArray.pushBoolean(item)
+                is Int -> writableArray.pushInt(item)
+                is Double -> writableArray.pushDouble(item)
+                is String -> writableArray.pushString(item)
+                is Map<*, *> -> writableArray.pushMap(convertMapToWriteableMap(item as Map<String, *>))
+                is Array<*> -> writableArray.pushArray(convertArrayToWritableArray(item as Array<Any?>))
+                is List<*> -> writableArray.pushArray(convertArrayToWritableArray(item.toTypedArray()))
+            }
+        }
+        return writableArray
+    }
+
+    @JvmStatic
+    fun convertMapToWriteableMap(map: Map<String, *>): WritableMap {
+        val writableMap: WritableMap = WritableNativeMap()
+        for ((key, value) in map) {
+            when (value) {
+                null -> writableMap.putNull(key)
+                is Boolean -> writableMap.putBoolean(key, value)
+                is Int -> writableMap.putInt(key, value)
+                is Double -> writableMap.putDouble(key, value)
+                is String -> writableMap.putString(key, value)
+                is Map<*, *> -> writableMap.putMap(key, convertMapToWriteableMap(value as Map<String, *>))
+                is Array<*> -> writableMap.putArray(key, convertArrayToWritableArray(value as Array<Any?>))
+                is List<*> -> writableMap.putArray(key, convertArrayToWritableArray(value.toTypedArray()))
+            }
+        }
+        return writableMap
+    }
+}

android/src/main/java/com/reactlibrary/RNPurchasesConverters.kt

@@ -9,7 +9,7 @@ if (os.type() === "Linux") {
   );
   downloadProcess.stdout.pipe(process.stdout);
   const downloadProcessCommon = exec(
-    "./scripts/download-purchases-common.sh 1.0.1"
+    "./scripts/download-purchases-common.sh 1.0.3"
   );
   downloadProcessCommon.stdout.pipe(process.stdout);
 } else if (os.type() === "Windows_NT") {

build.js

@@ -47,7 +47,11 @@ export default class UpsellScreen extends React.Component {
       this.purchaserInfoUpdateListener = (info) => {
         checkIfPro(info, this.props.navigation);
       };
+      this.shouldPurchasePromoProduct = async deferredPurchase => {
+        this.deferredPurchase = deferredPurchase;
+      };
       Purchases.addPurchaserInfoUpdateListener(this.purchaserInfoUpdateListener);
+      Purchases.addShouldPurchasePromoProductListener(this.shouldPurchasePromoProduct);
       const offerings = await Purchases.getOfferings();
       // eslint-disable-next-line no-console
       console.log(JSON.stringify(offerings));
@@ -68,6 +72,7 @@ export default class UpsellScreen extends React.Component {
 
   async componentWillUnmount() {
     Purchases.removePurchaserInfoUpdateListener(this.purchaserInfoUpdateListener);
+    Purchases.removeShouldPurchasePromoProductListener(this.shouldPurchasePromoProduct);
   }
 
   render() {

example/app/screens/UpsellScreen.js

@@ -24,5 +24,6 @@ module.exports = {
         inlineRequires: false
       }
     })
-  }
+  },
+  maxWorkers: 2,
 };