[in_app_purchase] Convert storefront(), transactions(), canMakePayment(), and addPayment() to pigeon

packages/in_app_purchase/in_app_purchase/example/ios/Runner.xcodeproj/project.pbxproj

@@ -176,7 +176,7 @@
 			isa = PBXProject;
 			attributes = {
 				DefaultBuildSystemTypeForWorkspace = Original;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -418,14 +418,17 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = S8QB4VV633;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -442,14 +445,17 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = S8QB4VV633;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",

packages/in_app_purchase/in_app_purchase/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.h

@@ -4,6 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #import <StoreKit/StoreKit.h>
+#import "messages.g.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -56,6 +57,9 @@ NS_ASSUME_NONNULL_BEGIN
                                                   withError:(NSString *_Nullable *_Nullable)error
     API_AVAILABLE(ios(12.2));
 
++ (nullable SKPaymentTransactionMessage *) convertTransactionToPigeon:(SKPaymentTransaction *) transaction;
+
++ (nullable SKStorefrontMessage *) convertStorefrontToPigeon:(SKStorefront *)storefront  API_AVAILABLE(ios(13.0));
 @end
 ;
 

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/FIAObjectTranslator.m

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #import "FIAObjectTranslator.h"
+#import "messages.g.h"
 
 #pragma mark - SKProduct Coders
 
@@ -294,4 +295,59 @@ + (SKPaymentDiscount *)getSKPaymentDiscountFromMap:(NSDictionary *)map
   return discount;
 }
 
++ (nullable SKPaymentTransactionMessage *) convertTransactionToPigeon:(SKPaymentTransaction *) transaction {
+  SKPaymentTransactionMessage *msg = [SKPaymentTransactionMessage makeWithPayment:[self convertPaymentToPigeon:transaction.payment] transactionState:[self convertTransactionStateToPigeon:transaction.transactionState] originalTransaction:transaction.originalTransaction ? [self convertTransactionToPigeon:transaction.originalTransaction] : nil transactionTimeStamp:[NSNumber numberWithDouble:[transaction.transactionDate timeIntervalSince1970]] transactionIdentifier:transaction.transactionIdentifier
+      error:[self convertSKErrorToPigeon:transaction.error]];
+  return msg;
+}
+
++ (nullable SKErrorMessage *) convertSKErrorToPigeon:(NSError *) error {
+  SKErrorMessage *msg = [SKErrorMessage makeWithCode:@(error.code) domain:error.domain userInfo:error.userInfo];
+  return msg;
+}
+
++ (SKPaymentTransactionStateMessage) convertTransactionStateToPigeon:(SKPaymentTransactionState) state {
+  switch (state) {
+    case SKPaymentTransactionStatePurchasing:
+      return SKPaymentTransactionStateMessagePurchasing;
+      break;
+    case SKPaymentTransactionStatePurchased:
+      return SKPaymentTransactionStateMessagePurchased;
+      break;
+    case SKPaymentTransactionStateFailed:
+      return SKPaymentTransactionStateMessageFailed;
+      break;
+    case SKPaymentTransactionStateRestored:
+      return SKPaymentTransactionStateMessageRestored;
+      break;
+    case SKPaymentTransactionStateDeferred:
+      return SKPaymentTransactionStateMessageDeferred;
+      break;
+  }
+}
+
++ (nullable SKPaymentMessage *) convertPaymentToPigeon:(SKPayment *) payment {
+  if (@available(iOS 12.2, *)) {
+    SKPaymentMessage *msg = [SKPaymentMessage makeWithProductIdentifier:payment.productIdentifier applicationUsername:payment.applicationUsername
+        requestData:[[NSString alloc] initWithData:payment.requestData encoding:NSUTF8StringEncoding]
+        quantity:@(payment.quantity)
+        simulatesAskToBuyInSandbox:@(payment.simulatesAskToBuyInSandbox)
+        paymentDiscount:[self convertPaymentDiscountToPigeon: payment.paymentDiscount]];
+    return msg;
+  }
+  return nil;
+}
+
++ (nullable SKPaymentDiscountMessage *) convertPaymentDiscountToPigeon:(SKPaymentDiscount *) discount  API_AVAILABLE(ios(12.2)){
+  SKPaymentDiscountMessage *msg = [SKPaymentDiscountMessage makeWithIdentifier:discount.identifier keyIdentifier:discount.keyIdentifier nonce:[discount.nonce UUIDString] signature:discount.signature timestamp:discount.timestamp];
+
+  return msg;
+}
+
++ (nullable SKStorefrontMessage *) convertStorefrontToPigeon:(SKStorefront *)storefront  API_AVAILABLE(ios(13.0)){
+  SKStorefrontMessage *msg = [SKStorefrontMessage makeWithCountryCode:storefront.countryCode
+      identifier:storefront.identifier];
+  return msg;
+}
+
 @end

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/InAppPurchasePlugin.h

@@ -7,10 +7,12 @@
 #else
 #import <Flutter/Flutter.h>
 #endif
+#import "messages.g.h"
+
 @class FIAPaymentQueueHandler;
 @class FIAPReceiptManager;
 
-@interface InAppPurchasePlugin : NSObject <FlutterPlugin>
+@interface InAppPurchasePlugin : NSObject <FlutterPlugin, InAppPurchaseAPI>
 
 @property(strong, nonatomic) FIAPaymentQueueHandler *paymentQueueHandler;
 

packages/in_app_purchase/in_app_purchase_storekit/darwin/Classes/InAppPurchasePlugin.m

@@ -9,6 +9,7 @@
 #import "FIAPReceiptManager.h"
 #import "FIAPRequestHandler.h"
 #import "FIAPaymentQueueHandler.h"
+#import "messages.g.h"
 
 @interface InAppPurchasePlugin ()
 
@@ -40,8 +41,13 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
       [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/in_app_purchase"
                                   binaryMessenger:[registrar messenger]];
-  InAppPurchasePlugin *instance = [[InAppPurchasePlugin alloc] initWithRegistrar:registrar];
-  [registrar addMethodCallDelegate:instance channel:channel];
+  //  InAppPurchasePlugin *instance = [[InAppPurchasePlugin alloc] initWithRegistrar:registrar];
+  //  SetUpInAppPurchaseAPI([registrar messenger], instance);
+
+    InAppPurchasePlugin *instance = [[InAppPurchasePlugin alloc] initWithRegistrar:registrar];
+    [registrar addMethodCallDelegate:instance channel:channel];
+    [registrar addApplicationDelegate:instance];
+    InAppPurchaseAPISetup([registrar messenger], instance);
 }
 
 - (instancetype)initWithReceiptManager:(FIAPReceiptManager *)receiptManager {
@@ -85,16 +91,8 @@ - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
 }
 
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
-  if ([@"-[SKPaymentQueue canMakePayments:]" isEqualToString:call.method]) {
-    [self canMakePayments:result];
-  } else if ([@"-[SKPaymentQueue transactions]" isEqualToString:call.method]) {
-    [self getPendingTransactions:result];
-  } else if ([@"-[SKPaymentQueue storefront]" isEqualToString:call.method]) {
-    [self getStorefront:result];
-  } else if ([@"-[InAppPurchasePlugin startProductRequest:result:]" isEqualToString:call.method]) {
+  if ([@"-[InAppPurchasePlugin startProductRequest:result:]" isEqualToString:call.method]) {
     [self handleProductRequestMethodCall:call result:result];
-  } else if ([@"-[InAppPurchasePlugin addPayment:result:]" isEqualToString:call.method]) {
-    [self addPayment:call result:result];
   } else if ([@"-[InAppPurchasePlugin finishTransaction:result:]" isEqualToString:call.method]) {
     [self finishTransaction:call result:result];
   } else if ([@"-[InAppPurchasePlugin restoreTransactions:result:]" isEqualToString:call.method]) {
@@ -193,70 +191,6 @@ - (void)handleProductRequestMethodCall:(FlutterMethodCall *)call result:(Flutter
   }];
 }
 
-- (void)addPayment:(FlutterMethodCall *)call result:(FlutterResult)result {
-  if (![call.arguments isKindOfClass:[NSDictionary class]]) {
-    result([FlutterError errorWithCode:@"storekit_invalid_argument"
-                               message:@"Argument type of addPayment is not a Dictionary"
-                               details:call.arguments]);
-    return;
-  }
-  NSDictionary *paymentMap = (NSDictionary *)call.arguments;
-  NSString *productID = [paymentMap objectForKey:@"productIdentifier"];
-  // When a product is already fetched, we create a payment object with
-  // the product to process the payment.
-  SKProduct *product = [self getProduct:productID];
-  if (!product) {
-    result([FlutterError
-        errorWithCode:@"storekit_invalid_payment_object"
-              message:
-                  @"You have requested a payment for an invalid product. Either the "
-                  @"`productIdentifier` of the payment is not valid or the product has not been "
-                  @"fetched before adding the payment to the payment queue."
-              details:call.arguments]);
-    return;
-  }
-  SKMutablePayment *payment = [SKMutablePayment paymentWithProduct:product];
-  payment.applicationUsername = [paymentMap objectForKey:@"applicationUsername"];
-  NSNumber *quantity = [paymentMap objectForKey:@"quantity"];
-  payment.quantity = (quantity != nil) ? quantity.integerValue : 1;
-  NSNumber *simulatesAskToBuyInSandbox = [paymentMap objectForKey:@"simulatesAskToBuyInSandbox"];
-  payment.simulatesAskToBuyInSandbox = (id)simulatesAskToBuyInSandbox == (id)[NSNull null]
-                                           ? NO
-                                           : [simulatesAskToBuyInSandbox boolValue];
-
-  if (@available(iOS 12.2, *)) {
-    NSDictionary *paymentDiscountMap = [self getNonNullValueFromDictionary:paymentMap
-                                                                    forKey:@"paymentDiscount"];
-    NSString *error = nil;
-    SKPaymentDiscount *paymentDiscount =
-        [FIAObjectTranslator getSKPaymentDiscountFromMap:paymentDiscountMap withError:&error];
-
-    if (error) {
-      result([FlutterError
-          errorWithCode:@"storekit_invalid_payment_discount_object"
-                message:[NSString stringWithFormat:@"You have requested a payment and specified a "
-                                                   @"payment discount with invalid properties. %@",
-                                                   error]
-                details:call.arguments]);
-      return;
-    }
-
-    payment.paymentDiscount = paymentDiscount;
-  }
-
-  if (![self.paymentQueueHandler addPayment:payment]) {
-    result([FlutterError
-        errorWithCode:@"storekit_duplicate_product_object"
-              message:@"There is a pending transaction for the same product identifier. Please "
-                      @"either wait for it to be finished or finish it manually using "
-                      @"`completePurchase` to avoid edge cases."
-
-              details:call.arguments]);
-    return;
-  }
-  result(nil);
-}
-
 - (void)finishTransaction:(FlutterMethodCall *)call result:(FlutterResult)result {
   if (![call.arguments isKindOfClass:[NSDictionary class]]) {
     result([FlutterError errorWithCode:@"storekit_invalid_argument"
@@ -466,4 +400,87 @@ - (SKReceiptRefreshRequest *)getRefreshReceiptRequest:(NSDictionary *)properties
   return [[SKReceiptRefreshRequest alloc] initWithReceiptProperties:properties];
 }
 
+- (nullable NSNumber *)canMakePaymentsWithError:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {
+  return @([SKPaymentQueue canMakePayments]);
+}
+
+- (nullable SKStorefrontMessage *)storefrontWithError:(FlutterError *_Nullable *_Nonnull)error {
+  if (@available(iOS 13.0, macOS 10.15, *)) {
+    SKStorefront *storefront = self.paymentQueueHandler.storefront;
+    if (!storefront) {
+      return nil;
+    }
+    return[FIAObjectTranslator convertStorefrontToPigeon:storefront];
+  } else {
+    NSLog(@"storefront is not avaialbe in iOS below 13.0 or macOS below 10.15.");
+    return nil;
+  }
+}
+
+- (nullable NSArray<SKPaymentTransactionMessage *> *)transactionsWithError:(FlutterError *_Nullable *_Nonnull)error {
+  NSArray<SKPaymentTransaction *> *transactions =
+      [self.paymentQueueHandler getUnfinishedTransactions];
+  NSMutableArray *transactionMaps = [[NSMutableArray alloc] init];
+  for (SKPaymentTransaction *transaction in transactions) {
+    [transactionMaps addObject:[FIAObjectTranslator convertTransactionToPigeon:transaction]];
+  }
+  return(transactionMaps);
+}
+
+- (void)addPayment:(nonnull NSDictionary *)paymentMap error:(FlutterError * _Nullable __autoreleasing * _Nonnull)error {
+  NSLog(@"Here");
+  NSString *productID = [paymentMap objectForKey:@"productIdentifier"];
+  // When a product is already fetched, we create a payment object with
+  // the product to process the payment.
+  SKProduct *product = [self getProduct:productID];
+  if (!product) {
+    *error = [FlutterError
+     errorWithCode:@"storekit_invalid_payment_object"
+     message:
+       @"You have requested a payment for an invalid product. Either the "
+     @"`productIdentifier` of the payment is not valid or the product has not been "
+     @"fetched before adding the payment to the payment queue."
+     details:paymentMap];
+    return;
+  }
+
+  SKMutablePayment *payment = [SKMutablePayment paymentWithProduct:product];
+  payment.applicationUsername = [paymentMap objectForKey:@"applicationUsername"];
+  NSNumber *quantity = [paymentMap objectForKey:@"quantity"];
+  payment.quantity = (quantity != nil) ? quantity.integerValue : 1;
+  NSNumber *simulatesAskToBuyInSandbox = [paymentMap objectForKey:@"simulatesAskToBuyInSandbox"];
+  payment.simulatesAskToBuyInSandbox = (id)simulatesAskToBuyInSandbox == (id)[NSNull null]
+  ? NO
+  : [simulatesAskToBuyInSandbox boolValue];
+
+  if (@available(iOS 12.2, *)) {
+    NSDictionary *paymentDiscountMap = [self getNonNullValueFromDictionary:paymentMap
+                                                                    forKey:@"paymentDiscount"];
+    NSString *errorMsg = nil;
+    SKPaymentDiscount *paymentDiscount =
+    [FIAObjectTranslator getSKPaymentDiscountFromMap:paymentDiscountMap withError:&errorMsg];
+
+    if (errorMsg) {
+      *error = [FlutterError
+       errorWithCode:@"storekit_invalid_payment_discount_object"
+       message:[NSString stringWithFormat:@"You have requested a payment and specified a "
+                @"payment discount with invalid properties. %@",
+                errorMsg]
+       details:paymentMap];
+      return;
+    }
+
+    payment.paymentDiscount = paymentDiscount;
+  }
+  if (![self.paymentQueueHandler addPayment:payment]) {
+    *error = [FlutterError
+        errorWithCode:@"storekit_duplicate_product_object"
+              message:@"There is a pending transaction for the same product identifier. Please "
+                      @"either wait for it to be finished or finish it manually using "
+                      @"`completePurchase` to avoid edge cases."
+
+              details:paymentMap];
+    return;
+  }
+}
 @end