[in_app_purchase] Fix the bug that prevent restored subscription transactions from being completed (#2872)

* Fix the bug that prevent restored subscription transactions from being completed

* Update changelog

* increased version

* fixed removing transactions from transactionsSetter

* Fixed CHANGELOGS conflicts

* transactionsSetter code formating updates

* fixed formating

Author: ziggycrane

packages/in_app_purchase/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.4+6
+
+* iOS: Fix the bug that prevent restored subscription transactions from being completed
+
 ## 0.3.4+5
 
 * Added necessary README docs for getting started with Android.

packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.h

@@ -19,7 +19,8 @@ typedef void (^UpdatedDownloads)(NSArray<SKDownload *> *downloads);
 @interface FIAPaymentQueueHandler : NSObject <SKPaymentTransactionObserver>
 
 // Unfinished transactions.
-@property(nonatomic, readonly) NSDictionary<NSString *, SKPaymentTransaction *> *transactions;
+@property(nonatomic, readonly)
+    NSDictionary<NSString *, NSMutableArray<SKPaymentTransaction *> *> *transactions;
 
 - (instancetype)initWithQueue:(nonnull SKPaymentQueue *)queue
                      transactionsUpdated:(nullable TransactionsUpdated)transactionsUpdated

packages/in_app_purchase/ios/Classes/FIAPaymentQueueHandler.m

@@ -16,7 +16,7 @@ @interface FIAPaymentQueueHandler ()
 @property(nullable, copy, nonatomic) UpdatedDownloads updatedDownloads;
 
 @property(strong, nonatomic)
-    NSMutableDictionary<NSString *, SKPaymentTransaction *> *transactionsSetter;
+    NSMutableDictionary<NSString *, NSMutableArray<SKPaymentTransaction *> *> *transactionsSetter;
 
 @end
 
@@ -81,7 +81,13 @@ - (void)paymentQueue:(SKPaymentQueue *)queue
       //    will become impossible for clients to finish deferred transactions when needed.
       // 2. Using product identifiers can help prevent clients from purchasing the same
       //    subscription more than once by accident.
-      self.transactionsSetter[transaction.payment.productIdentifier] = transaction;
+      NSMutableArray *transactionArray =
+          [self.transactionsSetter objectForKey:transaction.payment.productIdentifier];
+      if (transactionArray == nil) {
+        transactionArray = [NSMutableArray array];
+      }
+      [transactionArray addObject:transaction];
+      self.transactionsSetter[transaction.payment.productIdentifier] = transactionArray;
     }
   }
   // notify dart through callbacks.
@@ -92,7 +98,21 @@ - (void)paymentQueue:(SKPaymentQueue *)queue
 - (void)paymentQueue:(SKPaymentQueue *)queue
     removedTransactions:(NSArray<SKPaymentTransaction *> *)transactions {
   for (SKPaymentTransaction *transaction in transactions) {
-    [self.transactionsSetter removeObjectForKey:transaction.payment.productIdentifier];
+    NSString *productId = transaction.payment.productIdentifier;
+
+    if ([self.transactionsSetter objectForKey:productId] == nil) {
+      continue;
+    }
+
+    NSPredicate *predicate = [NSPredicate
+        predicateWithFormat:@"transactionIdentifier == %@", transaction.transactionIdentifier];
+    NSArray<SKPaymentTransaction *> *filteredTransactions =
+        [self.transactionsSetter[productId] filteredArrayUsingPredicate:predicate];
+    [self.transactionsSetter[productId] removeObjectsInArray:filteredTransactions];
+
+    if (!self.transactionsSetter[productId] || !self.transactionsSetter[productId].count) {
+      [self.transactionsSetter removeObjectForKey:productId];
+    }
   }
   self.transactionsRemoved(transactions);
 }
@@ -128,7 +148,7 @@ - (BOOL)paymentQueue:(SKPaymentQueue *)queue
 
 #pragma mark - getter
 
-- (NSDictionary<NSString *, SKPaymentTransaction *> *)transactions {
+- (NSDictionary<NSString *, NSMutableArray<SKPaymentTransaction *> *> *)transactions {
   return [self.transactionsSetter copy];
 }
 

packages/in_app_purchase/ios/Classes/InAppPurchasePlugin.m

@@ -204,24 +204,25 @@ - (void)finishTransaction:(FlutterMethodCall *)call result:(FlutterResult)result
     return;
   }
   NSString *identifier = call.arguments;
-  SKPaymentTransaction *transaction =
-      [self.paymentQueueHandler.transactions objectForKey:identifier];
-  if (!transaction) {
+  NSMutableArray *transactions = [self.paymentQueueHandler.transactions objectForKey:identifier];
+  if (!transactions) {
     result([FlutterError
         errorWithCode:@"storekit_platform_invalid_transaction"
               message:[NSString
                           stringWithFormat:@"The transaction with transactionIdentifer:%@ does not "
                                            @"exist. Note that if the transactionState is "
                                            @"purchasing, the transactionIdentifier will be "
                                            @"nil(null).",
-                                           transaction.transactionIdentifier]
+                                           identifier]
               details:call.arguments]);
     return;
   }
   @try {
+    for (SKPaymentTransaction *transaction in transactions) {
+      [self.paymentQueueHandler finishTransaction:transaction];
+    }
     // finish transaction will throw exception if the transaction type is purchasing. Notify dart
     // about this exception.
-    [self.paymentQueueHandler finishTransaction:transaction];
   } @catch (NSException *e) {
     result([FlutterError errorWithCode:@"storekit_finish_transaction_exception"
                                message:e.name

packages/in_app_purchase/pubspec.yaml

@@ -1,7 +1,7 @@
 name: in_app_purchase
 description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play.
 homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase
-version: 0.3.4+5
+version: 0.3.4+6
 
 dependencies:
   async: ^2.0.8