react-native-purchases 4.5.3 → 5.0.0-beta.1

package/ios/RNPurchases.m.bck

@@ -8,15 +8,17 @@
 
 @import StoreKit;
 
+typedef void (^PurchaseCompletedBlock)(RCStoreTransaction *, RCCustomerInfo *, NSError *, BOOL);
+typedef void (^StartPurchaseBlock)(PurchaseCompletedBlock);
 
 @interface RNPurchases () <RCPurchasesDelegate>
 
-@property (nonatomic, retain) NSMutableArray<RCDeferredPromotionalPurchaseBlock> *defermentBlocks;
+@property (nonatomic, retain) NSMutableArray<StartPurchaseBlock> *defermentBlocks;
 
 @end
 
 
-NSString *RNPurchasesPurchaserInfoUpdatedEvent = @"Purchases-PurchaserInfoUpdated";
+NSString *RNPurchasesCustomerInfoUpdatedEvent = @"Purchases-CustomerInfoUpdated";
 NSString *RNPurchasesShouldPurchasePromoProductEvent = @"Purchases-ShouldPurchasePromoProduct";
 
 
@@ -27,7 +29,7 @@ NSString *RNPurchasesShouldPurchasePromoProductEvent = @"Purchases-ShouldPurchas
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[RNPurchasesPurchaserInfoUpdatedEvent, RNPurchasesShouldPurchasePromoProductEvent];
+    return @[RNPurchasesCustomerInfoUpdatedEvent, RNPurchasesShouldPurchasePromoProductEvent];
 }
 
 RCT_EXPORT_MODULE();
@@ -35,16 +37,17 @@ 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];
+                  userDefaultsSuiteName:(nullable NSString *)userDefaultsSuiteName
+                  usesStoreKit2IfAvailable:(BOOL)usesStoreKit2IfAvailable) {
+    RCPurchases *purchases = [RCPurchases configureWithAPIKey:apiKey
+                                                  appUserID:appUserID
+                                               observerMode:observerMode
+                                      userDefaultsSuiteName:userDefaultsSuiteName
+                                             platformFlavor:self.platformFlavor
+                                      platformFlavorVersion:self.platformFlavorVersion
+                                     usesStoreKit2IfAvailable:usesStoreKit2IfAvailable
+                                          dangerousSettings:nil];
+    purchases.delegate = self;
 }
 
 RCT_EXPORT_METHOD(setAllowSharingStoreAccount:(BOOL)allowSharingStoreAccount) {
@@ -58,15 +61,6 @@ 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) {
@@ -112,8 +106,8 @@ RCT_REMAP_METHOD(purchasePackage,
 RCT_REMAP_METHOD(restoreTransactions,
                  restoreTransactionsWithResolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
-    [RCCommonFunctionality restoreTransactionsWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve
-                                                                                                       reject:reject]];
+    [RCCommonFunctionality restorePurchasesWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve
+                                                                                                    reject:reject]];
 }
 
 RCT_EXPORT_METHOD(syncPurchases) {
@@ -126,13 +120,6 @@ RCT_REMAP_METHOD(getAppUserID,
     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) {
@@ -146,25 +133,6 @@ RCT_REMAP_METHOD(logOut,
     [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];
@@ -175,10 +143,10 @@ RCT_EXPORT_METHOD(setSimulatesAskToBuyInSandbox:(BOOL)simulatesAskToBuyInSandbox
     [RCCommonFunctionality setSimulatesAskToBuyInSandbox:simulatesAskToBuyInSandbox];
 }
 
-RCT_REMAP_METHOD(getPurchaserInfo,
-                 purchaserInfoWithResolve:(RCTPromiseResolveBlock)resolve
+RCT_REMAP_METHOD(getCustomerInfo,
+                 customerInfoWithResolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
-    [RCCommonFunctionality getPurchaserInfoWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
+    [RCCommonFunctionality getCustomerInfoWithCompletionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
 }
 
 RCT_EXPORT_METHOD(setAutomaticAppleSearchAdsAttributionCollection:(BOOL)automaticAppleSearchAdsAttributionCollection)
@@ -195,7 +163,7 @@ RCT_REMAP_METHOD(isAnonymous,
 RCT_EXPORT_METHOD(makeDeferredPurchase:(nonnull NSNumber *)callbackID
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-    RCDeferredPromotionalPurchaseBlock defermentBlock = [self.defermentBlocks objectAtIndex:[callbackID integerValue]];
+    StartPurchaseBlock defermentBlock = [self.defermentBlocks objectAtIndex:[callbackID integerValue]];
     [RCCommonFunctionality makeDeferredPurchase:defermentBlock
                                 completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
 }
@@ -209,19 +177,18 @@ RCT_EXPORT_METHOD(checkTrialOrIntroductoryPriceEligibility:(NSArray *)products
     }];
 }
 
-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(invalidateCustomerInfoCache) {
+    [RCCommonFunctionality invalidateCustomerInfoCache];
 }
 
-RCT_EXPORT_METHOD(invalidatePurchaserInfoCache) {
-    [RCCommonFunctionality invalidatePurchaserInfoCache];
+RCT_REMAP_METHOD(getPromotionalOffer,
+                 getPromotionalOfferForProductIdentifier:(NSString *)productIdentifier
+                 discount:(NSString *)discount
+                 resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    [RCCommonFunctionality promotionalOfferForProductIdentifier:productIdentifier
+                                                       discount:discount
+                                                completionBlock:[self getResponseCompletionBlockWithResolve:resolve reject:reject]];
 }
 
 RCT_EXPORT_METHOD(presentCodeRedemptionSheet) {
@@ -329,17 +296,17 @@ RCT_REMAP_METHOD(isConfigured,
 
 #pragma mark -
 #pragma mark Delegate Methods
-- (void)purchases:(RCPurchases *)purchases didReceiveUpdatedPurchaserInfo:(RCPurchaserInfo *)purchaserInfo {
-    [self sendEventWithName:RNPurchasesPurchaserInfoUpdatedEvent body:purchaserInfo.dictionary];
+- (void)purchases:(RCPurchases *)purchases didReceiveUpdatedCustomerInfo:(RCCustomerInfo *)customerInfo {
+    [self sendEventWithName:RNPurchasesCustomerInfoUpdatedEvent body:customerInfo.dictionary];
 }
 
-- (void)         purchases:(RCPurchases *)purchases
-shouldPurchasePromoProduct:(SKProduct *)product
-            defermentBlock:(RCDeferredPromotionalPurchaseBlock)makeDeferredPurchase {
+- (void)purchases:(RCPurchases *)purchases
+readyForPromotedProduct:(RCStoreProduct *)product
+         purchase:(void (^)(void (^ _Nonnull)(RCStoreTransaction * _Nullable, RCCustomerInfo * _Nullable, NSError * _Nullable, BOOL)))startPurchase {
     if (!self.defermentBlocks) {
         self.defermentBlocks = [NSMutableArray array];
     }
-    [self.defermentBlocks addObject:makeDeferredPurchase];
+    [self.defermentBlocks addObject:startPurchase];
     NSInteger position = [self.defermentBlocks count] - 1;
     [self sendEventWithName:RNPurchasesShouldPurchasePromoProductEvent body:@{@"callbackID": @(position)}];
 }
@@ -369,7 +336,7 @@ shouldPurchasePromoProduct:(SKProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"4.5.2";
+    return @"4.6.1";
 }
 
 @end

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "react-native-purchases",
   "title": "React Native Purchases",
-  "version": "4.5.3",
+  "version": "5.0.0-beta.1",
   "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android. ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "source": "src/index",
   "files": [
-    "scripts/build.js",
     "dist",
     "android",
     "!android/gradlew*",
@@ -30,12 +29,11 @@
   "scripts": {
     "build": "tsc",
     "build-watch": "tsc --watch",
-    "preinstall": "node scripts/build.js",
     "test": "jest",
     "tslint": "tslint -c tslint.json 'src/*.ts'",
     "prepublish": "tsc",
-    "example": "(yarn --cwd examples/purchaseTester) && (yarn --cwd examples/purchaseTesterTypescript)",
-    "pods": "(cd examples/purchaseTester && npx pod-install --quiet) && (cd examples/purchaseTesterTypescript && npx pod-install --quiet)",
+    "example": "yarn --cwd examples/MagicWeather && yarn --cwd examples/purchaseTesterTypescript",
+    "pods": "(cd examples/MagicWeather && npx pod-install --quiet) && (cd examples/purchaseTesterTypescript && npx pod-install --quiet)",
     "bootstrap": "yarn example && yarn && yarn pods"
   },
   "repository": {
@@ -77,7 +75,7 @@
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [
-      "<rootDir>/examples/purchaseTester/node_modules",
+      "<rootDir>/examples/purchaseTesterTypescript/node_modules",
       "<rootDir>/lib/"
     ],
     "moduleFileExtensions": [

package/scripts/setupJest.js

@@ -1,6 +1,6 @@
 const {NativeModules} = require("react-native");
 
-global.purchaserInfoStub = {
+global.customerInfoStub = {
   activeSubscriptions: ["annual_freetrial"],
   allExpirationDates: {
     onetime_purchase: null,
@@ -663,7 +663,7 @@ global.discountStub = {
   periodNumberOfUnits: 1,
 };
 
-global.paymentDiscountStub = {
+global.promotionalOfferStub = {
   identifier: "promo_cat",
   keyIdentifier: "keyID",
   nonce: "nonce",
@@ -680,13 +680,10 @@ NativeModules.RNPurchases = {
   makePurchase: jest.fn(),
   restoreTransactions: jest.fn(),
   getAppUserID: jest.fn(),
-  createAlias: jest.fn(),
-  identify: jest.fn(),
   setDebugLogsEnabled: jest.fn(),
-  getPurchaserInfo: jest.fn(),
+  getCustomerInfo: jest.fn(),
   logIn: jest.fn(),
   logOut: jest.fn(),
-  reset: jest.fn(),
   syncPurchases: jest.fn(),
   setFinishTransactions: jest.fn(),
   purchaseProduct: jest.fn(),
@@ -696,8 +693,8 @@ NativeModules.RNPurchases = {
   checkTrialOrIntroductoryPriceEligibility: jest.fn(),
   purchaseDiscountedPackage: jest.fn(),
   purchaseDiscountedProduct: jest.fn(),
-  getPaymentDiscount: jest.fn(),
-  invalidatePurchaserInfoCache: jest.fn(),
+  getPromotionalOffer: jest.fn(),
+  invalidateCustomerInfoCache: jest.fn(),
   setAttributes: jest.fn(),
   setEmail: jest.fn(),
   setPhoneNumber: jest.fn(),
@@ -710,4 +707,3 @@ NativeModules.RNPurchases = {
 jest.mock(
   'react-native/Libraries/EventEmitter/NativeEventEmitter',
  );
- 

package/scripts/download-purchases-common.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-cd ios/
-
-VERSION=$1
-CURRENT_VERSION=$(cat .common_version)
-
-if [ "$VERSION" == "$CURRENT_VERSION" ]; then
-  echo "The newest version is already installed. Exiting."
-  exit 0
-fi
-
-pwd
-
-URL=https://github.com/RevenueCat/purchases-hybrid-common/releases/download/$VERSION/PurchasesHybridCommon.framework.zip
-
-echo "Downloading Purchases common hybrid SDKs classes $VERSION from $URL, this may take a minute."
-
-if ! which curl > /dev/null; then echo "curl command not found. Please install curl"; exit 1; fi;
-if ! which unzip > /dev/null; then echo "unzip command not found. Please install unzip"; exit 1; fi;
-
-if [ -d ./PurchasesHybridCommon.framework ]; then
-    echo "Old classes found. Removing them and installing version $VERSION"
-    rm -rf ./PurchasesHybridCommon.framework
-fi
-
-curl -sSL $URL > tempCommon.zip
-# In some cases the temp folder can not be created by unzip, https://github.com/RevenueCat/react-native-purchases/issues/26
-mkdir -p tempCommon
-unzip -o tempCommon.zip -d tempCommon
-mv tempCommon/Carthage/Build/iOS/PurchasesHybridCommon.framework ./PurchasesHybridCommon.framework
-rm -r tempCommon
-rm tempCommon.zip
-
-if ! [ -d ./PurchasesHybridCommon.framework ]; then
-  echo "Common files not found. Please reinstall react-native-purchases"; exit 1;
-fi;
-
-echo "$VERSION" > .common_version

package/scripts/download-purchases-framework.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-cd ios/
-
-VERSION=$1
-CURRENT_VERSION=$(cat .framework_version)
-
-if [ "$VERSION" == "$CURRENT_VERSION" ]; then
-  echo "The newest version is already installed. Exiting."
-  exit 0
-fi
-
-pwd
-
-URL=https://github.com/RevenueCat/purchases-ios/releases/download/$VERSION/Purchases.framework.zip
-
-echo "Downloading Purchases iOS $VERSION from $URL, this may take a minute."
-
-if ! which curl > /dev/null; then echo "curl command not found. Please install curl"; exit 1; fi;
-if ! which unzip > /dev/null; then echo "unzip command not found. Please install unzip"; exit 1; fi;
-
-if [ -d ./Purchases.framework ]; then
-    echo "Old Purchases.framework found. Removing it and installing a $VERSION"
-    rm -rf ./Purchases.framework
-fi
-
-curl -sSL $URL > temp.zip
-# In some cases the temp folder can not be created by unzip, https://github.com/RevenueCat/react-native-purchases/issues/26
-mkdir -p temp
-unzip -o temp.zip -d temp
-mv temp/Carthage/Build/iOS/Purchases.framework ./Purchases.framework
-rm -r temp
-rm temp.zip
-
-if ! [ -d ./Purchases.framework ]; then
-  echo "Purchases.framework not found. Please reinstall react-native-purchases"; exit 1;
-fi;
-
-echo "$VERSION" > .framework_version