[FINAL] Subscription offers support (#123)

* Defaults to first subscribtion offer in the discounts array

* changes common files to use temporary branch

* updated common android

* added new functions

* uses timestamp instead of identifier

* updates gitignore

* adds development.md, it's a wip and copied from notion

* Adds intro price class

* updates common version

* fixes tests

* updates common

* Fixes configure

* line breaks

* changes remap to export

* updates sdk versions

* fixes framework location

Author: vegaro

.gitignore

@@ -61,3 +61,4 @@ example/.vscode/settings.json
 example/android/app/.classpath
 example/android/app/.project
 example/android/app/.settings/org.eclipse.buildship.core.prefs
+example/.vscode/

DEVELOPMENT.md

@@ -0,0 +1,40 @@
+Make sure react-native-purchases is not part of the examples package.json
+
+Setup the development by running: 
+
+    yarn run setup.example
+
+That will link the local package so that changes are automatically applied to the example
+
+---
+
+- Plug a device and run:
+`react-native run-android`
+or 
+`react-native run-ios`
+
+---
+
+To edit the iOS code, open the example project with XCode, there should be a subproject there RNPurchases.xcodeproj that can be used to edit the plugin. 
+If touching common files, make sure you copy them to their repo after editing them, so that changes are not lost when re linking the plugin (since it will download the dependencies again and overwrite your changes). 
+You can run the project from XCode without having to run `react-native run-ios`, but make sure that if you are touching `.ts` files, you run `npm run build` to compile the plugin.
+
+In Android, the common code is uploaded to the repo. Make sure you commit the changes.
+
+## Common issues
+
+> ReferenceError: Module not registered in graph: /Users/cesardelavega/Development/repos/react-native/react-native-purchases/example/node_modules/@babel/runtime/helpers/get.js
+
+Clean all the node_modules folders and restart the server
+
+---
+
+Make sure it's connected to the same wifi
+
+---
+
+Make sure the Android device doesn't have any app with the same package name you're running
+
+---
+
+Make sure your Android emulator has play services and you're logged in

RNPurchases.podspec

@@ -19,5 +19,5 @@ Pod::Spec.new do |spec|
   spec.exclude_files = "ios/Purchases.framework"
 
   spec.dependency   "React"
-  spec.dependency   "Purchases", "~> 3.0.1"
+  spec.dependency   "Purchases", "~> 3.2.1"
 end

VERSIONS.md

@@ -1,5 +1,6 @@
 | Version | iOS version | Android version | Common files version |
 |---------|-------------|-----------------|----------------------|
+| 3.0.7   | 3.2.1       | 3.1.0           | 1.0.9                |
 | 3.0.6   | 3.0.1       | 3.0.4           | 1.0.5                |
 | 3.0.5   | 3.0.1       | 3.0.4           | 1.0.5                |
 | 3.0.4   | 3.0.1       | 3.0.4           | 1.0.5                |

__tests__/index.test.js

@@ -260,7 +260,7 @@ describe("Purchases", () => {
         offeringIdentifier: "offering",
       });
 
-    expect(NativeModules.RNPurchases.purchasePackage).toBeCalledWith("$rc_onemonth", "offering", undefined);
+    expect(NativeModules.RNPurchases.purchasePackage).toBeCalledWith("$rc_onemonth", "offering", undefined, null);
     expect(NativeModules.RNPurchases.purchasePackage).toBeCalledTimes(1);
 
     Purchases.purchasePackage(
@@ -292,7 +292,7 @@ describe("Purchases", () => {
     expect(NativeModules.RNPurchases.purchasePackage).toBeCalledWith("$rc_onemonth", "offering", {
       oldSKU: "viejo",
       prorationMode: Purchases.PRORATION_MODE.DEFERRED
-    });
+    }, null);
     expect(NativeModules.RNPurchases.purchasePackage).toBeCalledTimes(2);
   });
 
@@ -526,6 +526,125 @@ describe("Purchases", () => {
     expect(NativeModules.RNPurchases.checkTrialOrIntroductoryPriceEligibility).toBeCalledWith(["monthly"]);
   })
 
+  it("getPaymentDiscount works", () => {
+    const Purchases = require("../index").default;
+
+    NativeModules.RNPurchases.getPaymentDiscount.mockResolvedValue(paymentDiscountStub);
+
+    const aProduct = {
+      ...productStub,
+      discounts: [discountStub]
+    }
+
+    Purchases.getPaymentDiscount(aProduct, discountStub)
+
+    expect(NativeModules.RNPurchases.getPaymentDiscount).toBeCalledWith(aProduct.identifier, discountStub.identifier);
+    expect(NativeModules.RNPurchases.getPaymentDiscount).toBeCalledTimes(1);
+  });
+
+  it("getPaymentDiscount returns undefined for Android", async () => {
+    const Purchases = require("../index").default;
+
+    mockPlatform("android");
+
+    let paymentDiscount = await Purchases.getPaymentDiscount(productStub, discountStub);
+
+    expect(paymentDiscount).toEqual(undefined)
+    expect(NativeModules.RNPurchases.getPaymentDiscount).toBeCalledTimes(0);
+  });
+
+  it("getPaymentDiscount throws error when null discount", () => {
+    const Purchases = require("../index").default;
+    mockPlatform("ios");
+
+    expect(() => {
+      Purchases.getPaymentDiscount(productStub, null)
+    }).toThrowError();
+
+    expect(() => {
+      Purchases.getPaymentDiscount(productStub)
+    }).toThrowError();
+
+    expect(NativeModules.RNPurchases.getPaymentDiscount).toBeCalledTimes(0);
+  });
+
+  it("purchaseDiscountedProduct works", () => {
+    const Purchases = require("../index").default;
+
+    NativeModules.RNPurchases.purchaseProduct.mockResolvedValue({
+      purchasedProductIdentifier: "123",
+      purchaserInfo: purchaserInfoStub
+    });
+
+    const aProduct = {
+      ...productStub,
+      discounts: [discountStub]
+    }
+
+    Purchases.purchaseDiscountedProduct(aProduct, paymentDiscountStub)
+
+    expect(NativeModules.RNPurchases.purchaseProduct).toBeCalledWith(aProduct.identifier, null, null, paymentDiscountStub.timestamp);
+    expect(NativeModules.RNPurchases.purchaseProduct).toBeCalledTimes(1);
+  });
+
+  it("purchaseDiscountedProduct throws if null or undefined discount", () => {
+    const Purchases = require("../index").default;
+
+    expect(() => {
+      Purchases.purchaseDiscountedProduct(productStub, null)
+    }).toThrow();
+
+    expect(() => {
+      Purchases.purchaseDiscountedProduct(productStub)
+    }).toThrow();
+
+    expect(NativeModules.RNPurchases.purchaseProduct).toBeCalledTimes(0);
+  });
+
+  it("purchaseDiscountedPackage works", () => {
+    const Purchases = require("../index").default;
+
+    NativeModules.RNPurchases.purchasePackage.mockResolvedValue({
+      purchasedProductIdentifier: "123",
+      purchaserInfo: purchaserInfoStub
+    });
+
+    const aProduct = {
+      ...productStub,
+      discounts: [discountStub]
+    }
+
+    const aPackage = {
+      ...packagestub,
+      product: aProduct
+    }
+
+    Purchases.purchaseDiscountedPackage(aPackage, paymentDiscountStub)
+
+    expect(NativeModules.RNPurchases.purchasePackage).toBeCalledWith(
+      aPackage.identifier,
+      aPackage.offeringIdentifier,
+      null,
+      paymentDiscountStub.timestamp
+    );
+    expect(NativeModules.RNPurchases.purchasePackage).toBeCalledTimes(1);
+
+  });
+
+  it("purchaseDiscountedPackage throws if null or undefined discount", () => {
+    const Purchases = require("../index").default;
+
+    expect(() => {
+      Purchases.purchaseDiscountedPackage(packagestub, null)
+    }).toThrow();
+
+    expect(() => {
+      Purchases.purchaseDiscountedPackage(packagestub)
+    }).toThrow();
+
+    expect(NativeModules.RNPurchases.purchaseProduct).toBeCalledTimes(0);
+  });
+
   const mockPlatform = OS => {
     jest.resetModules();
     jest.doMock("Platform", () => ({OS, select: objs => objs[OS]}));

android/build.gradle

@@ -38,6 +38,6 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases:3.0.4'
+    implementation 'com.revenuecat.purchases:purchases:3.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/src/main/java/com/revenuecat/purchases/common/common.kt

@@ -87,7 +87,7 @@ fun purchaseProduct(
                 it.sku == productIdentifier && it.type.equals(type, ignoreCase = true)
             }
             if (productToBuy != null) {
-                if (oldSku.isNullOrBlank()) {
+                if (oldSku == null || oldSku.isBlank()) {
                     Purchases.sharedInstance.purchaseProductWith(
                         activity,
                         productToBuy,
@@ -154,7 +154,7 @@ fun purchasePackage(
                         it.identifier.equals(packageIdentifier, ignoreCase = true)
                     }
                 if (packageToBuy != null) {
-                    if (oldSku.isNullOrBlank()) {
+                    if (oldSku == null || oldSku.isBlank()) {
                         Purchases.sharedInstance.purchasePackageWith(
                             activity,
                             packageToBuy,
@@ -266,6 +266,34 @@ fun checkTrialOrIntroductoryPriceEligibility(
     }.toMap()
 }
 
+fun invalidatePurchaserInfoCache() { 
+    Purchases.sharedInstance.invalidatePurchaserInfoCache()
+}
+
+// region Subscriber Attributes
+
+fun setAttributes(attributes: Map<String, String?>) {
+    Purchases.sharedInstance.setAttributes(attributes)
+}
+
+fun setEmail(email: String?) {
+    Purchases.sharedInstance.setEmail(email)
+}
+
+fun setPhoneNumber(phoneNumber: String?) {
+    Purchases.sharedInstance.setPhoneNumber(phoneNumber)
+}
+
+fun setDisplayName(displayName: String?) {
+    Purchases.sharedInstance.setDisplayName(displayName)
+}
+
+fun setPushToken(fcmToken: String?) {
+    Purchases.sharedInstance.setPushToken(fcmToken)
+}
+
+// region private functions
+
 private fun getMakePurchaseErrorFunction(onResult: OnResult): (PurchasesError, Boolean) -> Unit {
     return { error, userCancelled -> onResult.onError(error.map(mapOf("userCancelled" to userCancelled))) }
 }