react-native-purchases 5.0.0-beta.2 → 5.0.0-beta.5

package/RNPurchases.podspec

@@ -24,6 +24,6 @@ Pod::Spec.new do |spec|
   ]
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '4.0.0'
+  spec.dependency   "PurchasesHybridCommon", '4.1.1'
   spec.swift_version    = '5.0'
 end

package/android/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '5.0.0-beta.2'
+        versionName '5.0.0-beta.5'
     }
 
     buildTypes {
@@ -121,6 +121,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases-hybrid-common:4.0.0'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:4.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

package/android/build.gradle.bck

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '5.0.0-beta.1'
+        versionName '5.0.0-beta.5'
     }
 
     buildTypes {
@@ -121,6 +121,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases-hybrid-common:4.0.0'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:4.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

package/android/gradle.properties

@@ -1,5 +1,5 @@
 android.useAndroidX=true
-Purchases_kotlinVersion=1.5.31
+Purchases_kotlinVersion=1.6.21
 Purchases_compileSdkVersion=28
 Purchases_targetSdkVersion=28
 Purchases_minSdkVersion=16

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesConverters.kt

@@ -53,6 +53,7 @@ internal object RNPurchasesConverters {
         return array
     }
 
+    @Suppress("UNCHECKED_CAST")
     private fun convertArrayToWritableArray(array: Array<Any?>): WritableArray {
         val writableArray: WritableArray = WritableNativeArray()
         for (item in array) {
@@ -71,6 +72,7 @@ internal object RNPurchasesConverters {
     }
 
     @JvmStatic
+    @Suppress("UNCHECKED_CAST")
     fun convertMapToWriteableMap(map: Map<String, *>): WritableMap {
         val writableMap: WritableMap = WritableNativeMap()
         for ((key, value) in map) {
@@ -87,4 +89,4 @@ internal object RNPurchasesConverters {
         }
         return writableMap
     }
-}
+}

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java

@@ -16,6 +16,7 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.revenuecat.purchases.CustomerInfo;
 import com.revenuecat.purchases.Purchases;
+import com.revenuecat.purchases.Store;
 import com.revenuecat.purchases.common.PlatformInfo;
 import com.revenuecat.purchases.hybridcommon.CommonKt;
 import com.revenuecat.purchases.hybridcommon.ErrorContainer;
@@ -79,9 +80,13 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     @ReactMethod
     public void setupPurchases(String apiKey, @Nullable String appUserID,
                                boolean observerMode, @Nullable String userDefaultsSuiteName,
-                                @Nullable Boolean usesStoreKit2IfAvailable) {
+                               @Nullable Boolean usesStoreKit2IfAvailable, boolean useAmazon) {
         PlatformInfo platformInfo = new PlatformInfo(PLATFORM_NAME, PLUGIN_VERSION);
-        CommonKt.configure(reactContext, apiKey, appUserID, observerMode, platformInfo);
+        Store store = Store.PLAY_STORE;
+        if (useAmazon) {
+            store = Store.AMAZON;
+        }
+        CommonKt.configure(reactContext, apiKey, appUserID, observerMode, platformInfo, store);
         Purchases.getSharedInstance().setUpdatedCustomerInfoListener(this);
     }
 

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java.bck

@@ -16,6 +16,7 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.revenuecat.purchases.CustomerInfo;
 import com.revenuecat.purchases.Purchases;
+import com.revenuecat.purchases.Store;
 import com.revenuecat.purchases.common.PlatformInfo;
 import com.revenuecat.purchases.hybridcommon.CommonKt;
 import com.revenuecat.purchases.hybridcommon.ErrorContainer;
@@ -79,9 +80,13 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     @ReactMethod
     public void setupPurchases(String apiKey, @Nullable String appUserID,
                                boolean observerMode, @Nullable String userDefaultsSuiteName,
-                                @Nullable Boolean usesStoreKit2IfAvailable) {
+                               @Nullable Boolean usesStoreKit2IfAvailable, boolean useAmazon) {
         PlatformInfo platformInfo = new PlatformInfo(PLATFORM_NAME, PLUGIN_VERSION);
-        CommonKt.configure(reactContext, apiKey, appUserID, observerMode, platformInfo);
+        Store store = Store.PLAY_STORE;
+        if (useAmazon) {
+            store = Store.AMAZON;
+        }
+        CommonKt.configure(reactContext, apiKey, appUserID, observerMode, platformInfo, store);
         Purchases.getSharedInstance().setUpdatedCustomerInfoListener(this);
     }
 

package/dist/purchases.d.ts

@@ -62,6 +62,17 @@ export interface LogInResult {
      */
     readonly created: boolean;
 }
+/**
+ * Holds parameters to initialize the SDK.
+ */
+export interface PurchasesConfiguration {
+    apiKey: string;
+    appUserID?: string | null;
+    observerMode?: boolean;
+    userDefaultsSuiteName?: string;
+    usesStoreKit2IfAvailable?: boolean;
+    useAmazon?: boolean;
+}
 export default class Purchases {
     /**
      * Supported SKU types.
@@ -111,11 +122,12 @@ export default class Purchases {
      * @param {String?} appUserID An optional unique id for identifying the user. Needs to be a string.
      * @param {boolean} [observerMode=false] An optional boolean. Set this to TRUE if you have your own IAP implementation and want to use only RevenueCat's backend. Default is FALSE.
      * @param {boolean} [usesStoreKit2IfAvailable=false] An optional boolean. iOS-only. Set this to TRUE to enable StoreKit2 on compatible devices.
+     * @param {boolean} [useAmazon=false] An optional boolean. Android-only. Set this to TRUE to enable Amazon on compatible devices.
      * @param {String?} userDefaultsSuiteName An optional string. iOS-only, will be ignored for Android.
      * Set this if you would like the RevenueCat SDK to store its preferences in a different NSUserDefaults suite, otherwise it will use standardUserDefaults.
      * Default is null, which will make the SDK use standardUserDefaults.
      */
-    static configure(apiKey: string, appUserID?: string | null, observerMode?: boolean, userDefaultsSuiteName?: string, usesStoreKit2IfAvailable?: boolean): void;
+    static configure({ apiKey, appUserID, observerMode, userDefaultsSuiteName, usesStoreKit2IfAvailable, useAmazon }: PurchasesConfiguration): void;
     /**
      * @deprecated, configure behavior through the RevenueCat dashboard instead.
      * If an user tries to purchase a product that is active on the current app store account,
@@ -234,7 +246,7 @@ export default class Purchases {
      * @returns {Promise<CustomerInfo>} A promise of a customer info object. Rejections return an error code, and an
      * userInfo object with more information. The promise will be also be rejected if setup has not been called yet.
      */
-    static restoreTransactions(): Promise<CustomerInfo>;
+    static restorePurchases(): Promise<CustomerInfo>;
     /**
      * Get the appUserID
      * @returns {Promise<string>} The app user id in a promise
@@ -278,11 +290,17 @@ export default class Purchases {
      */
     static syncPurchases(): Promise<void>;
     /**
+     * @deprecated, use enableAdServicesAttributionTokenCollection instead.
      * Enable automatic collection of Apple Search Ad attribution. Disabled by default
      * @param {boolean} enabled Enable or not automatic apple search ads attribution collection
      * @returns {Promise<void>} The promise will be rejected if setup has not been called yet.
      */
     static setAutomaticAppleSearchAdsAttributionCollection(enabled: boolean): Promise<void>;
+    /**
+     * Enable automatic collection of Apple Search Ad attribution on iOS. Disabled by default
+     * @returns {Promise<void>} The promise will be rejected if setup has not been called yet.
+     */
+    static enableAdServicesAttributionTokenCollection(): Promise<void>;
     /**
      * @returns { Promise<boolean> } If the `appUserID` has been generated by RevenueCat or not.
      * @returns {Promise<void>} The promise will be rejected if setup has not been called yet.

package/dist/purchases.js

@@ -102,17 +102,20 @@ var Purchases = /** @class */ (function () {
      * @param {String?} appUserID An optional unique id for identifying the user. Needs to be a string.
      * @param {boolean} [observerMode=false] An optional boolean. Set this to TRUE if you have your own IAP implementation and want to use only RevenueCat's backend. Default is FALSE.
      * @param {boolean} [usesStoreKit2IfAvailable=false] An optional boolean. iOS-only. Set this to TRUE to enable StoreKit2 on compatible devices.
+     * @param {boolean} [useAmazon=false] An optional boolean. Android-only. Set this to TRUE to enable Amazon on compatible devices.
      * @param {String?} userDefaultsSuiteName An optional string. iOS-only, will be ignored for Android.
      * Set this if you would like the RevenueCat SDK to store its preferences in a different NSUserDefaults suite, otherwise it will use standardUserDefaults.
      * Default is null, which will make the SDK use standardUserDefaults.
      */
-    Purchases.configure = function (apiKey, appUserID, observerMode, userDefaultsSuiteName, usesStoreKit2IfAvailable) {
-        if (observerMode === void 0) { observerMode = false; }
-        if (usesStoreKit2IfAvailable === void 0) { usesStoreKit2IfAvailable = false; }
+    Purchases.configure = function (_a) {
+        var apiKey = _a.apiKey, _b = _a.appUserID, appUserID = _b === void 0 ? null : _b, _c = _a.observerMode, observerMode = _c === void 0 ? false : _c, userDefaultsSuiteName = _a.userDefaultsSuiteName, _d = _a.usesStoreKit2IfAvailable, usesStoreKit2IfAvailable = _d === void 0 ? false : _d, _e = _a.useAmazon, useAmazon = _e === void 0 ? false : _e;
+        if (apiKey === undefined || typeof apiKey !== "string") {
+            throw new Error("Invalid API key. It must be called with an Object: configure({apiKey: \"key\"})");
+        }
         if (appUserID !== null && typeof appUserID !== "undefined" && typeof appUserID !== "string") {
             throw new Error("appUserID needs to be a string");
         }
-        RNPurchases.setupPurchases(apiKey, appUserID, observerMode, userDefaultsSuiteName, usesStoreKit2IfAvailable);
+        RNPurchases.setupPurchases(apiKey, appUserID, observerMode, userDefaultsSuiteName, usesStoreKit2IfAvailable, useAmazon);
     };
     /**
      * @deprecated, configure behavior through the RevenueCat dashboard instead.
@@ -373,14 +376,14 @@ var Purchases = /** @class */ (function () {
      * @returns {Promise<CustomerInfo>} A promise of a customer info object. Rejections return an error code, and an
      * userInfo object with more information. The promise will be also be rejected if setup has not been called yet.
      */
-    Purchases.restoreTransactions = function () {
+    Purchases.restorePurchases = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, Purchases.throwIfNotConfigured()];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/, RNPurchases.restoreTransactions()];
+                        return [2 /*return*/, RNPurchases.restorePurchases()];
                 }
             });
         });
@@ -495,6 +498,7 @@ var Purchases = /** @class */ (function () {
         });
     };
     /**
+     * @deprecated, use enableAdServicesAttributionTokenCollection instead.
      * Enable automatic collection of Apple Search Ad attribution. Disabled by default
      * @param {boolean} enabled Enable or not automatic apple search ads attribution collection
      * @returns {Promise<void>} The promise will be rejected if setup has not been called yet.
@@ -509,6 +513,26 @@ var Purchases = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Enable automatic collection of Apple Search Ad attribution on iOS. Disabled by default
+     * @returns {Promise<void>} The promise will be rejected if setup has not been called yet.
+     */
+    Purchases.enableAdServicesAttributionTokenCollection = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(react_native_2.Platform.OS === "ios")) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Purchases.throwIfNotConfigured()];
+                    case 1:
+                        _a.sent();
+                        RNPurchases.enableAdServicesAttributionTokenCollection();
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * @returns { Promise<boolean> } If the `appUserID` has been generated by RevenueCat or not.
      * @returns {Promise<void>} The promise will be rejected if setup has not been called yet.

package/ios/RNPurchases.m

@@ -38,15 +38,16 @@ RCT_EXPORT_METHOD(setupPurchases:(NSString *)apiKey
                   appUserID:(nullable NSString *)appUserID
                   observerMode:(BOOL)observerMode
                   userDefaultsSuiteName:(nullable NSString *)userDefaultsSuiteName
-                  usesStoreKit2IfAvailable:(BOOL)usesStoreKit2IfAvailable) {
+                  usesStoreKit2IfAvailable:(BOOL)usesStoreKit2IfAvailable
+                  useAmazon:(BOOL)useAmazon) {
     RCPurchases *purchases = [RCPurchases configureWithAPIKey:apiKey
-                                                  appUserID:appUserID
-                                               observerMode:observerMode
-                                      userDefaultsSuiteName:userDefaultsSuiteName
-                                             platformFlavor:self.platformFlavor
-                                      platformFlavorVersion:self.platformFlavorVersion
+                                                    appUserID:appUserID
+                                                 observerMode:observerMode
+                                        userDefaultsSuiteName:userDefaultsSuiteName
+                                               platformFlavor:self.platformFlavor
+                                        platformFlavorVersion:self.platformFlavorVersion
                                      usesStoreKit2IfAvailable:usesStoreKit2IfAvailable
-                                          dangerousSettings:nil];
+                                            dangerousSettings:nil];
     purchases.delegate = self;
 }
 
@@ -154,6 +155,15 @@ RCT_EXPORT_METHOD(setAutomaticAppleSearchAdsAttributionCollection:(BOOL)automati
     [RCCommonFunctionality setAutomaticAppleSearchAdsAttributionCollection:automaticAppleSearchAdsAttributionCollection];
 }
 
+RCT_EXPORT_METHOD(enableAdServicesAttributionTokenCollection)
+{
+    if (@available(iOS 14.3, macOS 11.1, macCatalyst 14.3, *)) {
+        [RCCommonFunctionality enableAdServicesAttributionTokenCollection];
+    } else {
+        NSLog(@"[Purchases] Warning: tried to enable AdServices attribution token collection, but it's only available on iOS 14.3 or greater or macOS 11.1 or greater.");
+    }
+}
+
 RCT_REMAP_METHOD(isAnonymous,
                  isAnonymousWithResolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
@@ -336,7 +346,7 @@ readyForPromotedProduct:(RCStoreProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"5.0.0-beta.2";
+    return @"5.0.0-beta.5";
 }
 
 @end

package/ios/RNPurchases.m.bck

@@ -38,15 +38,16 @@ RCT_EXPORT_METHOD(setupPurchases:(NSString *)apiKey
                   appUserID:(nullable NSString *)appUserID
                   observerMode:(BOOL)observerMode
                   userDefaultsSuiteName:(nullable NSString *)userDefaultsSuiteName
-                  usesStoreKit2IfAvailable:(BOOL)usesStoreKit2IfAvailable) {
+                  usesStoreKit2IfAvailable:(BOOL)usesStoreKit2IfAvailable
+                  useAmazon:(BOOL)useAmazon) {
     RCPurchases *purchases = [RCPurchases configureWithAPIKey:apiKey
-                                                  appUserID:appUserID
-                                               observerMode:observerMode
-                                      userDefaultsSuiteName:userDefaultsSuiteName
-                                             platformFlavor:self.platformFlavor
-                                      platformFlavorVersion:self.platformFlavorVersion
+                                                    appUserID:appUserID
+                                                 observerMode:observerMode
+                                        userDefaultsSuiteName:userDefaultsSuiteName
+                                               platformFlavor:self.platformFlavor
+                                        platformFlavorVersion:self.platformFlavorVersion
                                      usesStoreKit2IfAvailable:usesStoreKit2IfAvailable
-                                          dangerousSettings:nil];
+                                            dangerousSettings:nil];
     purchases.delegate = self;
 }
 
@@ -103,8 +104,8 @@ RCT_REMAP_METHOD(purchasePackage,
                            completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
 }
 
-RCT_REMAP_METHOD(restoreTransactions,
-                 restoreTransactionsWithResolve:(RCTPromiseResolveBlock)resolve
+RCT_REMAP_METHOD(restorePurchases,
+                 restorePurchasesWithResolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
     [RCCommonFunctionality restorePurchasesWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve
                                                                                                     reject:reject]];
@@ -154,6 +155,15 @@ RCT_EXPORT_METHOD(setAutomaticAppleSearchAdsAttributionCollection:(BOOL)automati
     [RCCommonFunctionality setAutomaticAppleSearchAdsAttributionCollection:automaticAppleSearchAdsAttributionCollection];
 }
 
+RCT_EXPORT_METHOD(enableAdServicesAttributionTokenCollection)
+{
+    if (@available(iOS 14.3, macOS 11.1, macCatalyst 14.3, *)) {
+        [RCCommonFunctionality enableAdServicesAttributionTokenCollection];
+    } else {
+        NSLog(@"[Purchases] Warning: tried to enable AdServices attribution token collection, but it's only available on iOS 14.3 or greater or macOS 11.1 or greater.");
+    }
+}
+
 RCT_REMAP_METHOD(isAnonymous,
                  isAnonymousWithResolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
@@ -336,7 +346,7 @@ readyForPromotedProduct:(RCStoreProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"5.0.0-beta.1";
+    return @"5.0.0-beta.5";
 }
 
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-purchases",
   "title": "React Native Purchases",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.5",
   "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android. ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/docs/index.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/5.0.0-beta.2/" />
+	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/5.0.0-beta.5/" />
 </head>
 <body>
 </body>

package/scripts/docs/index.html.bck

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/5.0.0-beta.1/" />
+	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/5.0.0-beta.5/" />
 </head>
 <body>
 </body>