react-native-purchases 4.6.1 → 4.6.2

package/android/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '4.6.1'
+        versionName '4.6.2'
     }
 
     buildTypes {

package/android/build.gradle.bck

@@ -0,0 +1,126 @@
+buildscript {
+    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['Purchases_kotlinVersion']
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+def getExtOrDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['Purchases_' + name]
+}
+
+def getExtOrIntegerDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['Purchases_' + name]).toInteger()
+}
+
+android {
+    compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+
+    defaultConfig {
+        minSdkVersion getExtOrIntegerDefault('minSdkVersion')
+        targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+        versionCode 1
+        versionName '4.6.2'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    mavenCentral()
+    google()
+
+    def found = false
+    def defaultDir = null
+    def androidSourcesName = 'React Native sources'
+
+    if (rootProject.ext.has('reactNativeAndroidRoot')) {
+        defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+    } else {
+        defaultDir = new File(
+                projectDir,
+                '/../../../node_modules/react-native/android'
+        )
+    }
+
+    if (defaultDir.exists()) {
+        maven {
+            url defaultDir.toString()
+            name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+        found = true
+    } else {
+        def parentDir = rootProject.projectDir
+
+        1.upto(5, {
+            if (found) return true
+            parentDir = parentDir.parentFile
+
+            def androidSourcesDir = new File(
+                    parentDir,
+                    'node_modules/react-native'
+            )
+
+            def androidPrebuiltBinaryDir = new File(
+                    parentDir,
+                    'node_modules/react-native/android'
+            )
+
+            if (androidPrebuiltBinaryDir.exists()) {
+                maven {
+                    url androidPrebuiltBinaryDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+                found = true
+            } else if (androidSourcesDir.exists()) {
+                maven {
+                    url androidSourcesDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+                found = true
+            }
+        })
+    }
+
+    if (!found) {
+        throw new GradleException(
+                "${project.name}: unable to locate React Native android sources. " +
+                        "Ensure you have you installed React Native as a dependency in your project and try again."
+        )
+    }
+}
+
+def kotlin_version = getExtOrDefault('kotlinVersion')
+
+dependencies {
+    //noinspection GradleDynamicVersion
+    api 'com.facebook.react:react-native:+'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:2.0.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}

package/android/gradle.properties

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

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

@@ -43,7 +43,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
 
     private static final String PURCHASER_INFO_UPDATED = "Purchases-PurchaserInfoUpdated";
     public static final String PLATFORM_NAME = "react-native";
-    public static final String PLUGIN_VERSION = "4.6.1";
+    public static final String PLUGIN_VERSION = "4.6.2";
 
     private final ReactApplicationContext reactContext;
 

package/dist/purchaserInfo.d.ts

@@ -12,7 +12,6 @@ export interface PurchasesEntitlementInfo {
     readonly isActive: boolean;
     /**
      * True if the underlying subscription is set to renew at the end of the billing period (expirationDate).
-     * Will always be True if entitlement is for lifetime access.
      */
     readonly willRenew: boolean;
     /**

package/ios/RNPurchases.m

@@ -369,7 +369,7 @@ shouldPurchasePromoProduct:(SKProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"4.6.1";
+    return @"4.6.2";
 }
 
 @end

package/ios/RNPurchases.m.bck

@@ -0,0 +1,375 @@
+
+//
+//  Created by RevenueCat.
+//  Copyright © 2019 RevenueCat. All rights reserved.
+//
+
+#import "RNPurchases.h"
+
+@import StoreKit;
+
+
+@interface RNPurchases () <RCPurchasesDelegate>
+
+@property (nonatomic, retain) NSMutableArray<RCDeferredPromotionalPurchaseBlock> *defermentBlocks;
+
+@end
+
+
+NSString *RNPurchasesPurchaserInfoUpdatedEvent = @"Purchases-PurchaserInfoUpdated";
+NSString *RNPurchasesShouldPurchasePromoProductEvent = @"Purchases-ShouldPurchasePromoProduct";
+
+
+@implementation RNPurchases
+
+- (dispatch_queue_t)methodQueue {
+    return dispatch_get_main_queue();
+}
+
+- (NSArray<NSString *> *)supportedEvents {
+    return @[RNPurchasesPurchaserInfoUpdatedEvent, RNPurchasesShouldPurchasePromoProductEvent];
+}
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(setupPurchases:(NSString *)apiKey
+                  appUserID:(nullable NSString *)appUserID
+                  observerMode:(BOOL)observerMode
+                  userDefaultsSuiteName:(nullable NSString *)userDefaultsSuiteName) {
+    [RCPurchases configureWithAPIKey:apiKey
+                           appUserID:appUserID
+                        observerMode:observerMode
+               userDefaultsSuiteName:userDefaultsSuiteName
+                      platformFlavor:self.platformFlavor
+               platformFlavorVersion:self.platformFlavorVersion
+                   dangerousSettings:nil];
+    RCPurchases.sharedPurchases.delegate = self;
+    [RCCommonFunctionality configure];
+}
+
+RCT_EXPORT_METHOD(setAllowSharingStoreAccount:(BOOL)allowSharingStoreAccount) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    [RCCommonFunctionality setAllowSharingStoreAccount:allowSharingStoreAccount];
+#pragma GCC diagnostic pop
+}
+
+RCT_EXPORT_METHOD(setFinishTransactions:(BOOL)finishTransactions) {
+    [RCCommonFunctionality setFinishTransactions:finishTransactions];
+}
+
+RCT_EXPORT_METHOD(addAttributionData:(NSDictionary *)data
+                  forNetwork:(NSInteger)network
+                  forNetworkUserId:(nullable NSString *)networkUserId) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    [RCCommonFunctionality addAttributionData:data network:network networkUserId:networkUserId];
+#pragma GCC diagnostic pop
+}
+
+RCT_REMAP_METHOD(getOfferings,
+                 getOfferingsWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality getOfferingsWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve
+                                                                                                reject:reject]];
+}
+
+RCT_EXPORT_METHOD(getProductInfo:(NSArray *)products
+                  type:(NSString *)type
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality getProductInfo:products completionBlock:^(NSArray<NSDictionary *> *productObjects) {
+        resolve(productObjects);
+    }];
+}
+
+RCT_REMAP_METHOD(purchaseProduct,
+                 purchaseProduct:(NSString *)productIdentifier
+                 upgradeInfo:(NSDictionary *)upgradeInfo
+                 type:(NSString *)type
+                 signedDiscountTimestamp:(NSString *)signedDiscountTimestamp
+                 resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality purchaseProduct:productIdentifier
+                   signedDiscountTimestamp:signedDiscountTimestamp
+                           completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+
+RCT_REMAP_METHOD(purchasePackage,
+                 purchasePackage:(NSString *)packageIdentifier
+                 offeringIdentifier:(NSString *)offeringIdentifier
+                 upgradeInfo:(NSDictionary *)upgradeInfo
+                 signedDiscountTimestamp:(NSString *)signedDiscountTimestamp
+                 resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality purchasePackage:packageIdentifier
+                                  offering:offeringIdentifier
+                   signedDiscountTimestamp:signedDiscountTimestamp
+                           completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+RCT_REMAP_METHOD(restoreTransactions,
+                 restoreTransactionsWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality restoreTransactionsWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve
+                                                                                                       reject:reject]];
+}
+
+RCT_EXPORT_METHOD(syncPurchases) {
+    [RCCommonFunctionality syncPurchasesWithCompletionBlock:nil];
+}
+
+RCT_REMAP_METHOD(getAppUserID,
+                 getAppUserIDWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    resolve([RCCommonFunctionality appUserID]);
+}
+
+RCT_EXPORT_METHOD(createAlias:(nullable NSString *)newAppUserID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality createAlias:newAppUserID
+                       completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+RCT_EXPORT_METHOD(logIn:(nonnull NSString *)appUserID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality logInWithAppUserID:appUserID
+                              completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+RCT_REMAP_METHOD(logOut,
+                 logOutWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality logOutWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+RCT_EXPORT_METHOD(identify:(nullable NSString *)appUserID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    [RCCommonFunctionality identify:appUserID
+                    completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+#pragma GCC diagnostic pop
+}
+
+RCT_REMAP_METHOD(reset,
+                 resetWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    [RCCommonFunctionality resetWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+#pragma GCC diagnostic pop
+}
+
+RCT_REMAP_METHOD(setDebugLogsEnabled,
+                 debugLogsEnabled:(BOOL)enabled) {
+    [RCCommonFunctionality setDebugLogsEnabled:enabled];
+}
+
+RCT_EXPORT_METHOD(setSimulatesAskToBuyInSandbox:(BOOL)simulatesAskToBuyInSandbox)
+{
+    [RCCommonFunctionality setSimulatesAskToBuyInSandbox:simulatesAskToBuyInSandbox];
+}
+
+RCT_REMAP_METHOD(getPurchaserInfo,
+                 purchaserInfoWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality getPurchaserInfoWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+RCT_EXPORT_METHOD(setAutomaticAppleSearchAdsAttributionCollection:(BOOL)automaticAppleSearchAdsAttributionCollection)
+{
+    [RCCommonFunctionality setAutomaticAppleSearchAdsAttributionCollection:automaticAppleSearchAdsAttributionCollection];
+}
+
+RCT_REMAP_METHOD(isAnonymous,
+                 isAnonymousWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    resolve(@([RCCommonFunctionality isAnonymous]));
+}
+
+RCT_EXPORT_METHOD(makeDeferredPurchase:(nonnull NSNumber *)callbackID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    RCDeferredPromotionalPurchaseBlock defermentBlock = [self.defermentBlocks objectAtIndex:[callbackID integerValue]];
+    [RCCommonFunctionality makeDeferredPurchase:defermentBlock
+                                completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+}
+
+RCT_EXPORT_METHOD(checkTrialOrIntroductoryPriceEligibility:(NSArray *)products
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality checkTrialOrIntroductoryPriceEligibility:products
+                                                    completionBlock:^(NSDictionary<NSString *,RCIntroEligibility *> * _Nonnull responseDictionary) {
+        resolve([NSDictionary dictionaryWithDictionary:responseDictionary]);
+    }];
+}
+
+RCT_REMAP_METHOD(getPaymentDiscount,
+                 getPaymentDiscountForProductIdentifier:(NSString *)productIdentifier
+                 discountIdentifier:(nullable NSString *)discountIdentifier
+                 resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality paymentDiscountForProductIdentifier:productIdentifier
+                                                      discount:discountIdentifier
+                                               completionBlock:[self getResponseCompletionBlockWithResolve:resolve
+                                                                                                    reject:reject]];
+}
+
+RCT_EXPORT_METHOD(invalidatePurchaserInfoCache) {
+    [RCCommonFunctionality invalidatePurchaserInfoCache];
+}
+
+RCT_EXPORT_METHOD(presentCodeRedemptionSheet) {
+    if (@available(iOS 14.0, *)) {
+        [RCCommonFunctionality presentCodeRedemptionSheet];
+    } else {
+        NSLog(@"[Purchases] Warning: tried to present codeRedemptionSheet, but it's only available on iOS 14.0 or greater.");
+    }
+}
+
+#pragma mark - Subscriber Attributes
+
+RCT_EXPORT_METHOD(setProxyURLString:(nullable NSString *)proxyURLString) {
+    [RCCommonFunctionality setProxyURLString:proxyURLString];
+}
+
+RCT_EXPORT_METHOD(setAttributes:(NSDictionary *)attributes) {
+    [RCCommonFunctionality setAttributes:attributes];
+}
+
+RCT_EXPORT_METHOD(setEmail:(NSString *)email) {
+    [RCCommonFunctionality setEmail:email];
+}
+
+RCT_EXPORT_METHOD(setPhoneNumber:(NSString *)phoneNumber) {
+    [RCCommonFunctionality setPhoneNumber:phoneNumber];
+}
+
+RCT_EXPORT_METHOD(setDisplayName:(NSString *)displayName) {
+    [RCCommonFunctionality setDisplayName:displayName];
+}
+
+RCT_EXPORT_METHOD(setPushToken:(NSString *)pushToken) {
+    [RCCommonFunctionality setPushToken:pushToken];
+}
+
+# pragma mark Attribution IDs
+
+RCT_EXPORT_METHOD(collectDeviceIdentifiers) {
+    [RCCommonFunctionality collectDeviceIdentifiers];
+}
+
+RCT_EXPORT_METHOD(setAdjustID:(NSString *)adjustID) {
+    [RCCommonFunctionality setAdjustID:adjustID];
+}
+
+RCT_EXPORT_METHOD(setAppsflyerID:(NSString *)appsflyerID) {
+    [RCCommonFunctionality setAppsflyerID:appsflyerID];
+}
+
+RCT_EXPORT_METHOD(setFBAnonymousID:(NSString *)fbAnonymousID) {
+    [RCCommonFunctionality setFBAnonymousID:fbAnonymousID];
+}
+
+RCT_EXPORT_METHOD(setMparticleID:(NSString *)mparticleID) {
+    [RCCommonFunctionality setMparticleID:mparticleID];
+}
+
+RCT_EXPORT_METHOD(setOnesignalID:(NSString *)onesignalID) {
+    [RCCommonFunctionality setOnesignalID:onesignalID];
+}
+
+RCT_EXPORT_METHOD(setAirshipChannelID:(NSString *)airshipChannelID) {
+    [RCCommonFunctionality setAirshipChannelID:airshipChannelID];
+}
+
+# pragma mark Campaign parameters
+
+RCT_EXPORT_METHOD(setMediaSource:(NSString *)mediaSource) {
+    [RCCommonFunctionality setMediaSource:mediaSource];
+}
+
+RCT_EXPORT_METHOD(setCampaign:(NSString *)campaign) {
+    [RCCommonFunctionality setCampaign:campaign];
+}
+
+RCT_EXPORT_METHOD(setAdGroup:(NSString *)adGroup) {
+    [RCCommonFunctionality setAdGroup:adGroup];
+}
+
+RCT_EXPORT_METHOD(setAd:(NSString *)ad) {
+    [RCCommonFunctionality setAd:ad];
+}
+
+RCT_EXPORT_METHOD(setKeyword:(NSString *)keyword) {
+    [RCCommonFunctionality setKeyword:keyword];
+}
+
+RCT_EXPORT_METHOD(setCreative:(NSString *)creative) {
+    [RCCommonFunctionality setCreative:creative];
+}
+
+RCT_REMAP_METHOD(canMakePayments,
+                 canMakePaymentsWithFeatures:(NSArray<NSNumber *> *)features
+                 resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+      resolve(@([RCCommonFunctionality canMakePaymentsWithFeatures:features]));
+}
+
+RCT_REMAP_METHOD(isConfigured,
+                 isConfiguredWithResolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    resolve(@(RCPurchases.isConfigured));
+}
+
+#pragma mark -
+#pragma mark Delegate Methods
+- (void)purchases:(RCPurchases *)purchases didReceiveUpdatedPurchaserInfo:(RCPurchaserInfo *)purchaserInfo {
+    [self sendEventWithName:RNPurchasesPurchaserInfoUpdatedEvent body:purchaserInfo.dictionary];
+}
+
+- (void)         purchases:(RCPurchases *)purchases
+shouldPurchasePromoProduct:(SKProduct *)product
+            defermentBlock:(RCDeferredPromotionalPurchaseBlock)makeDeferredPurchase {
+    if (!self.defermentBlocks) {
+        self.defermentBlocks = [NSMutableArray array];
+    }
+    [self.defermentBlocks addObject:makeDeferredPurchase];
+    NSInteger position = [self.defermentBlocks count] - 1;
+    [self sendEventWithName:RNPurchasesShouldPurchasePromoProductEvent body:@{@"callbackID": @(position)}];
+}
+
+#pragma mark -
+#pragma mark Helper Methods
+
+- (void)rejectPromiseWithBlock:(RCTPromiseRejectBlock)reject error:(NSError *)error {
+    reject([NSString stringWithFormat: @"%ld", (long)error.code], error.localizedDescription, error);
+}
+
+- (void (^)(NSDictionary *, RCErrorContainer *))getResponseCompletionBlockWithResolve:(RCTPromiseResolveBlock)resolve
+                                                                               reject:(RCTPromiseRejectBlock)reject {
+    return ^(NSDictionary *_Nullable responseDictionary, RCErrorContainer *_Nullable error) {
+        if (error) {
+            reject([NSString stringWithFormat:@"%ld", (long) error.code], error.message, error.error);
+        } else if (responseDictionary) {
+            resolve([NSDictionary dictionaryWithDictionary:responseDictionary]);
+        } else {
+            resolve(nil);
+        }
+    };
+}
+
+- (NSString *)platformFlavor {
+    return @"react-native";
+}
+
+- (NSString *)platformFlavorVersion {
+    return @"4.6.2";
+}
+
+@end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-purchases",
   "title": "React Native Purchases",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "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/build.js.bck

@@ -0,0 +1,19 @@
+const {exec} = require("child_process");
+const os = require("os");
+
+if (os.type() === "Linux") {
+  console.log("Skipping iOS Dependencies");
+} else if (os.type() === "Darwin") {
+  const downloadProcess = exec(
+    "./scripts/download-purchases-framework.sh 3.14.1"
+  );
+  downloadProcess.stdout.pipe(process.stdout);
+  const downloadProcessCommon = exec(
+    "./scripts/download-purchases-common.sh 1.11.1"
+  );
+  downloadProcessCommon.stdout.pipe(process.stdout);
+} else if (os.type() === "Windows_NT") {
+  console.log("Skipping iOS Dependencies");
+} else {
+  throw new Error(`Unsupported OS found: ${os.type()}`);
+}