Merge branch 'temp' into issue/92231

Author: mvanbeusekom

packages/in_app_purchase/in_app_purchase_ios/example/ios/RunnerTests/Stubs.m

@@ -61,6 +61,14 @@ - (instancetype)initWithMap:(NSDictionary *)map {
  [self setValue:map[@"subscriptionGroupIdentifier"] ?: [NSNull null]
  forKey:@"subscriptionGroupIdentifier"];
  }
+ if (@available(iOS 12.2, *)) {
+ NSMutableArray *discounts = [NSMutableArray new];
+ for (NSDictionary *discountMap in map[@"discounts"]) {
+ [discounts addObject:[[SKProductDiscountStub alloc] initWithMap:discountMap]];
+ }
+ 
+ [self setValue:discounts forKey:@"discounts"];
+ }
  }
  return self;
 }

packages/in_app_purchase/in_app_purchase_ios/example/ios/RunnerTests/TranslatorTests.m

@@ -46,14 +46,13 @@ - (void)setUp {
  self.productMap[@"subscriptionPeriod"] = self.periodMap;
  self.productMap[@"introductoryPrice"] = self.discountMap;
  }
+ if (@available(iOS 12.2, *)) {
+ self.productMap[@"discounts"] = @[ self.discountMap ];
+ }
 
  if (@available(iOS 12.0, *)) {
  self.productMap[@"subscriptionGroupIdentifier"] = @"com.group";
  }
-
- if (@available(iOS 11.2, *)) {
- self.productMap[@"discounts"] = @[ self.discountMap ];
- }
 
  self.productResponseMap =
  @{@"products" : @[ self.productMap ], @"invalidProductIdentifiers" : @[]};
@@ -64,6 +63,13 @@ - (void)setUp {
  @"applicationUsername" : @"app user name",
  @"simulatesAskToBuyInSandbox" : @(NO)
  };
+ self.paymentDiscountMap = @{
+ @"identifier" : @"payment_discount_identifier",
+ @"keyIdentifier" : @"payment_discount_key_identifier",
+ @"nonce" : @"d18981e0-9003-4365-98a2-4b90e3b62c52",
+ @"signature" : @"this is a encrypted signature",
+ @"timestamp" : @([NSDate date].timeIntervalSince1970),
+ };
  NSDictionary *originalTransactionMap = @{
  @"transactionIdentifier" : @"567",
  @"transactionState" : @(SKPaymentTransactionStatePurchasing),
@@ -180,4 +186,16 @@ - (void)testSKStorefrontAndSKPaymentTransactionToMap {
  }
 }
 
+- (void)testSKPaymentDiscountFromMap {
+ if (@available(iOS 12.2, *)) {
+ SKPaymentDiscount *paymentDiscount = [FIAObjectTranslator getSKPaymentDiscountFromMap:self.paymentDiscountMap];
+ 
+ XCTAssertEqual(paymentDiscount.identifier, self.paymentDiscountMap[@"identifier"]);
+ XCTAssertEqual(paymentDiscount.keyIdentifier, self.paymentDiscountMap[@"keyIdentifier"]);
+ XCTAssertEqualObjects(paymentDiscount.nonce, [[NSUUID alloc] initWithUUIDString: self.paymentDiscountMap[@"nonce"]]);
+ XCTAssertEqual(paymentDiscount.signature, self.paymentDiscountMap[@"signature"]);
+ XCTAssertEqual(paymentDiscount.timestamp, self.paymentDiscountMap[@"timestamp"]);
+ }
+}
+
 @end

packages/in_app_purchase/in_app_purchase_ios/ios/Classes/FIAObjectTranslator.h

@@ -20,6 +20,10 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSDictionary *)getMapFromSKProductDiscount:(SKProductDiscount *)discount
  API_AVAILABLE(ios(11.2));
 
+// Converts an array of SKProductDiscount instances into an array of dictionaries.
++ (nonnull NSArray *)getMapArrayFromSKProductDiscounts:(nonnull NSArray<SKProductDiscount *> *)productDiscounts
+ API_AVAILABLE(ios(12.2));
+
 // Converts an instance of SKProductsResponse into a dictionary.
 + (NSDictionary *)getMapFromSKProductsResponse:(SKProductsResponse *)productResponse;
 

packages/in_app_purchase/in_app_purchase_ios/ios/Classes/FIAObjectTranslator.m

@@ -24,6 +24,7 @@ + (NSDictionary *)getMapFromSKProduct:(SKProduct *)product {
  // https://github.com/flutter/flutter/issues/26610
  [map setObject:[FIAObjectTranslator getMapFromNSLocale:product.priceLocale] ?: [NSNull null]
  forKey:@"priceLocale"];
+ 
  if (@available(iOS 11.2, *)) {
  [map setObject:[FIAObjectTranslator
  getMapFromSKProductSubscriptionPeriod:product.subscriptionPeriod]
@@ -35,6 +36,10 @@ + (NSDictionary *)getMapFromSKProduct:(SKProduct *)product {
  ?: [NSNull null]
  forKey:@"introductoryPrice"];
  }
+ if (@available(iOS 12.2, *)) {
+ [map setObject:[FIAObjectTranslator getMapArrayFromSKProductDiscounts:product.discounts]
+ forKey:@"discounts"];
+ }
  if (@available(iOS 12.0, *)) {
  [map setObject:product.subscriptionGroupIdentifier ?: [NSNull null]
  forKey:@"subscriptionGroupIdentifier"];
@@ -49,6 +54,16 @@ + (NSDictionary *)getMapFromSKProductSubscriptionPeriod:(SKProductSubscriptionPe
  return @{@"numberOfUnits" : @(period.numberOfUnits), @"unit" : @(period.unit)};
 }
 
++ (nonnull NSArray *)getMapArrayFromSKProductDiscounts:(nonnull NSArray<SKProductDiscount *> *)productDiscounts {
+ NSMutableArray *discountsMapArray = [NSMutableArray new];
+ 
+ for (SKProductDiscount *productDiscount in productDiscounts) {
+ [discountsMapArray addObject:[FIAObjectTranslator getMapFromSKProductDiscount:productDiscount]];
+ }
+ 
+ return discountsMapArray;
+}
+
 + (NSDictionary *)getMapFromSKProductDiscount:(SKProductDiscount *)discount {
  if (!discount) {
  return nil;

packages/in_app_purchase/in_app_purchase_ios/lib/src/store_kit_wrappers/sk_product_wrapper.dart

@@ -297,12 +297,12 @@ class SKProductWrapper {
  final SKProductDiscountWrapper? introductoryPrice;
 
  /// An array of subscription offers available for the auto-renewable subscription (available on iOS 12.2 and higher).
- /// 
- /// This property lists all promotional offers set up in App Store Connect. If 
+ ///
+ /// This property lists all promotional offers set up in App Store Connect. If
  /// no promotional offers have been set up this field returns an empty list.
  /// Each [subscriptionPeriod] of individual discounts are independent of the
  /// product's [subscriptionPeriod] and their units and duration do not have to
- /// be matched. 
+ /// be matched.
  @JsonKey(defaultValue: <SKProductDiscountWrapper>[])
  final List<SKProductDiscountWrapper> discounts;