Upgraded from upstream

InAppUtils.xcodeproj/project.pbxproj

@@ -306,8 +306,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/node_modules/react-native/React/**",
-					"$(SRCROOT)/../react-native/React/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -321,8 +319,6 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/node_modules/react-native/React/**",
-					"$(SRCROOT)/../react-native/React/**",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";

InAppUtils/InAppUtils.h

@@ -1,8 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <StoreKit/StoreKit.h>
 
-#import "RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
 
 @interface InAppUtils : NSObject <RCTBridgeModule, SKProductsRequestDelegate, SKPaymentTransactionObserver>
 
-@end
+@end

InAppUtils/InAppUtils.m

@@ -1,7 +1,7 @@
 #import "InAppUtils.h"
 #import <StoreKit/StoreKit.h>
-#import "RCTLog.h"
-#import "RCTUtils.h"
+#import <React/RCTLog.h>
+#import <React/RCTUtils.h>
 #import "SKProduct+StringPrice.h"
 
 @implementation InAppUtils
@@ -59,8 +59,10 @@ - (void)paymentQueue:(SKPaymentQueue *)queue
                 NSString *key = RCTKeyForInstance(transaction.payment.productIdentifier);
                 RCTResponseSenderBlock callback = _callbacks[key];
                 NSDictionary *purchase = @{
-                                           @"transactionIdentifier": transaction.transactionIdentifier,
-                                           @"productIdentifier": transaction.payment.productIdentifier
+                                              @"transactionDate": @(transaction.transactionDate.timeIntervalSince1970 * 1000),
+                                              @"transactionIdentifier": transaction.transactionIdentifier,
+                                              @"productIdentifier": transaction.payment.productIdentifier,
+                                              @"transactionReceipt": [[transaction transactionReceipt] base64EncodedStringWithOptions:0]
                                            };
                 if (callback) {
                     callback(@[[NSNull null], purchase]);
@@ -92,8 +94,22 @@ - (void)paymentQueue:(SKPaymentQueue *)queue
     }
 }
 
+RCT_EXPORT_METHOD(purchaseProductForUser:(NSString *)productIdentifier
+                  username:(NSString *)username
+                  callback:(RCTResponseSenderBlock)callback)
+{
+    [self doPurchaseProduct:productIdentifier username:username callback:callback];
+}
+
 RCT_EXPORT_METHOD(purchaseProduct:(NSString *)productIdentifier
                   callback:(RCTResponseSenderBlock)callback)
+{
+    [self doPurchaseProduct:productIdentifier username:nil callback:callback];
+}
+
+- (void) doPurchaseProduct:(NSString *)productIdentifier
+                  username:(NSString *)username
+                  callback:(RCTResponseSenderBlock)callback
 {
     SKProduct *product;
     for(SKProduct *p in products)
@@ -104,7 +120,10 @@ - (void)paymentQueue:(SKPaymentQueue *)queue
         }
     }
     if(product) {
-        SKPayment *payment = [SKPayment paymentWithProduct:product];
+        SKMutablePayment *payment = [SKMutablePayment paymentWithProduct:product];
+        if(username) {
+            payment.applicationUsername = username;
+        }
         [[SKPaymentQueue defaultQueue] addPayment:payment];
         _callbacks[RCTKeyForInstance(payment.productIdentifier)] = callback;
     } else {
@@ -118,7 +137,16 @@ - (void)paymentQueue:(SKPaymentQueue *)queue
     NSString *key = RCTKeyForInstance(@"restoreRequest");
     RCTResponseSenderBlock callback = _callbacks[key];
     if (callback) {
-        callback(@[@"restore_failed"]);
+        switch (error.code)
+        {
+            case SKErrorPaymentCancelled:
+                callback(@[@"user_cancelled"]);
+                break;
+            default:
+                callback(@[@"restore_failed"]);
+                break;
+        }
+
         [_callbacks removeObjectForKey:key];
     } else {
         RCTLogWarn(@"No callback registered for restore product request.");
@@ -133,10 +161,19 @@ - (void)paymentQueueRestoreCompletedTransactionsFinished:(SKPaymentQueue *)queue
         NSMutableArray *productsArrayForJS = [NSMutableArray array];
         for(SKPaymentTransaction *transaction in queue.transactions){
             if(transaction.transactionState == SKPaymentTransactionStateRestored) {
-                NSDictionary *purchase = @{
-                                           @"transactionIdentifier": transaction.transactionIdentifier,
-                                           @"productIdentifier": transaction.payment.productIdentifier
-                                           };
+                NSMutableDictionary *purchase = [NSMutableDictionary dictionaryWithDictionary: @{
+                    @"transactionDate": @(transaction.transactionDate.timeIntervalSince1970 * 1000),
+                    @"transactionIdentifier": transaction.transactionIdentifier,
+                    @"productIdentifier": transaction.payment.productIdentifier,
+                    @"transactionReceipt": [[transaction transactionReceipt] base64EncodedStringWithOptions:0]
+                }];
+
+                SKPaymentTransaction *originalTransaction = transaction.originalTransaction;
+                if (originalTransaction) {
+                    purchase[@"originalTransactionDate"] = @(originalTransaction.transactionDate.timeIntervalSince1970 * 1000);
+                    purchase[@"originalTransactionIdentifier"] = originalTransaction.transactionIdentifier;
+                }
+
                 [productsArrayForJS addObject:purchase];
                 [[SKPaymentQueue defaultQueue] finishTransaction:transaction];
             }
@@ -155,18 +192,32 @@ - (void)paymentQueueRestoreCompletedTransactionsFinished:(SKPaymentQueue *)queue
     [[SKPaymentQueue defaultQueue] restoreCompletedTransactions];
 }
 
+RCT_EXPORT_METHOD(restorePurchasesForUser:(NSString *)username
+                    callback:(RCTResponseSenderBlock)callback)
+{
+    NSString *restoreRequest = @"restoreRequest";
+    _callbacks[RCTKeyForInstance(restoreRequest)] = callback;
+    if(!username) {
+        callback(@[@"username_required"]);
+        return;
+    }
+    [[SKPaymentQueue defaultQueue] restoreCompletedTransactionsWithApplicationUsername:username];
+}
+
 RCT_EXPORT_METHOD(loadProducts:(NSArray *)productIdentifiers
                   callback:(RCTResponseSenderBlock)callback)
 {
-    if([SKPaymentQueue canMakePayments]){
-        SKProductsRequest *productsRequest = [[SKProductsRequest alloc]
-                                              initWithProductIdentifiers:[NSSet setWithArray:productIdentifiers]];
-        productsRequest.delegate = self;
-        _callbacks[RCTKeyForInstance(productsRequest)] = callback;
-        [productsRequest start];
-    } else {
-        callback(@[@"not_available"]);
-    }
+    SKProductsRequest *productsRequest = [[SKProductsRequest alloc]
+                                          initWithProductIdentifiers:[NSSet setWithArray:productIdentifiers]];
+    productsRequest.delegate = self;
+    _callbacks[RCTKeyForInstance(productsRequest)] = callback;
+    [productsRequest start];
+}
+
+RCT_EXPORT_METHOD(canMakePayments: (RCTResponseSenderBlock)callback)
+{
+    BOOL canMakePayments = [SKPaymentQueue canMakePayments];
+    callback(@[@(canMakePayments)]);
 }
 
 RCT_EXPORT_METHOD(receiptData:(RCTResponseSenderBlock)callback)
@@ -204,7 +255,8 @@ - (void)productsRequest:(SKProductsRequest *)request
                                   @"currencySymbol": [item.priceLocale objectForKey:NSLocaleCurrencySymbol],
                                   @"currencyCode": [item.priceLocale objectForKey:NSLocaleCurrencyCode],
                                   @"priceString": item.priceString,
-                                  @"downloadable": item.downloadable ? @"true" : @"false" ,
+                                  @"countryCode": [item.priceLocale objectForKey: NSLocaleCountryCode],
+                                      @"downloadable": item.downloadable ? @"true" : @"false" ,
                                   @"description": item.localizedDescription ? item.localizedDescription : @"",
                                   @"title": item.localizedTitle ? item.localizedTitle : @"",
                                   };
@@ -218,6 +270,16 @@ - (void)productsRequest:(SKProductsRequest *)request
     }
 }
 
+// SKProductsRequestDelegate network error
+- (void)request:(SKRequest *)request didFailWithError:(NSError *)error{
+    NSString *key = RCTKeyForInstance(request);
+    RCTResponseSenderBlock callback = _callbacks[key];
+    if(callback) {
+        callback(@[RCTJSErrorFromNSError(error)]);
+        [_callbacks removeObjectForKey:key];
+    }
+}
+
 - (void)dealloc
 {
     [[SKPaymentQueue defaultQueue] removeTransactionObserver:self];