[in_app_purchase] Added country code to sk product wrapper (#4122)

Author: renefloor

packages/in_app_purchase/in_app_purchase_ios/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2
+
+* Added countryCode to the SKPriceLocaleWrapper.
+
 ## 0.1.1+1
 
 * iOS: Fix treating missing App Store receipt as an exception.

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

@@ -149,9 +149,10 @@ - (void)testError {
 
 - (void)testLocaleToMap {
   if (@available(iOS 10.0, *)) {
-    NSLocale *system = NSLocale.systemLocale;
+    NSLocale *system = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
     NSDictionary *map = [FIAObjectTranslator getMapFromNSLocale:system];
     XCTAssertEqualObjects(map[@"currencySymbol"], system.currencySymbol);
+    XCTAssertEqualObjects(map[@"countryCode"], system.countryCode);
   }
 }
 

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

@@ -111,6 +111,7 @@ + (NSDictionary *)getMapFromNSLocale:(NSLocale *)locale {
           forKey:@"currencySymbol"];
   [map setObject:[locale objectForKey:NSLocaleCurrencyCode] ?: [NSNull null]
           forKey:@"currencyCode"];
+  [map setObject:[locale objectForKey:NSLocaleCountryCode] ?: [NSNull null] forKey:@"countryCode"];
   return map;
 }
 

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

@@ -335,15 +335,19 @@ class SKProductWrapper {
 @JsonSerializable()
 class SKPriceLocaleWrapper {
   /// Creates a new price locale for `currencySymbol` and `currencyCode`.
-  SKPriceLocaleWrapper(
-      {required this.currencySymbol, required this.currencyCode});
+  SKPriceLocaleWrapper({
+    required this.currencySymbol,
+    required this.currencyCode,
+    required this.countryCode,
+  });
 
   /// Constructing an instance from a map from the Objective-C layer.
   ///
   /// This method should only be used with `map` values returned by [SKProductWrapper.fromJson] and [SKProductDiscountWrapper.fromJson].
   factory SKPriceLocaleWrapper.fromJson(Map<String, dynamic>? map) {
     if (map == null) {
-      return SKPriceLocaleWrapper(currencyCode: '', currencySymbol: '');
+      return SKPriceLocaleWrapper(
+          currencyCode: '', currencySymbol: '', countryCode: '');
     }
     return _$SKPriceLocaleWrapperFromJson(map);
   }
@@ -356,6 +360,10 @@ class SKPriceLocaleWrapper {
   @JsonKey(defaultValue: '')
   final String currencyCode;
 
+  ///The country code for the locale, e.g. US for US locale.
+  @JsonKey(defaultValue: '')
+  final String countryCode;
+
   @override
   bool operator ==(Object other) {
     if (identical(other, this)) {

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

@@ -2,7 +2,7 @@ name: in_app_purchase_ios
 description: An implementation for the iOS platform of the Flutter `in_app_purchase` plugin. This uses the iOS StoreKit Framework.
 repository: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase/in_app_purchase_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
-version: 0.1.1+1
+version: 0.1.2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/in_app_purchase/in_app_purchase_ios/pubspec.yaml

@@ -47,6 +47,10 @@ void main() {
         productResponseWrapper.products.first.priceLocale.currencyCode,
         'USD',
       );
+      expect(
+        productResponseWrapper.products.first.priceLocale.countryCode,
+        'US',
+      );
       expect(
         productResponseWrapper.invalidProductIdentifiers,
         isNotEmpty,

packages/in_app_purchase/in_app_purchase_ios/test/store_kit_wrappers/sk_methodchannel_apis_test.dart

@@ -44,8 +44,13 @@ void main() {
       final SKProductDiscountWrapper wrapper =
           SKProductDiscountWrapper.fromJson(<String, dynamic>{});
       expect(wrapper.price, '');
-      expect(wrapper.priceLocale,
-          SKPriceLocaleWrapper(currencyCode: '', currencySymbol: ''));
+      expect(
+          wrapper.priceLocale,
+          SKPriceLocaleWrapper(
+            currencyCode: '',
+            currencySymbol: '',
+            countryCode: '',
+          ));
       expect(wrapper.numberOfPeriods, 0);
       expect(wrapper.paymentMode, SKProductDiscountPaymentMode.payAsYouGo);
       expect(
@@ -69,8 +74,13 @@ void main() {
       expect(wrapper.productIdentifier, '');
       expect(wrapper.localizedTitle, '');
       expect(wrapper.localizedDescription, '');
-      expect(wrapper.priceLocale,
-          SKPriceLocaleWrapper(currencyCode: '', currencySymbol: ''));
+      expect(
+          wrapper.priceLocale,
+          SKPriceLocaleWrapper(
+            currencyCode: '',
+            currencySymbol: '',
+            countryCode: '',
+          ));
       expect(wrapper.subscriptionGroupIdentifier, null);
       expect(wrapper.price, '');
       expect(wrapper.subscriptionPeriod, null);

packages/in_app_purchase/in_app_purchase_ios/test/store_kit_wrappers/sk_product_test.dart

@@ -33,8 +33,11 @@ final SKPaymentTransactionWrapper dummyTransaction =
   error: dummyError,
 );
 
-final SKPriceLocaleWrapper dummyLocale =
-    SKPriceLocaleWrapper(currencySymbol: '\$', currencyCode: 'USD');
+final SKPriceLocaleWrapper dummyLocale = SKPriceLocaleWrapper(
+  currencySymbol: '\$',
+  currencyCode: 'USD',
+  countryCode: 'US',
+);
 
 final SKProductSubscriptionPeriodWrapper dummySubscription =
     SKProductSubscriptionPeriodWrapper(
@@ -70,7 +73,8 @@ final SkProductResponseWrapper dummyProductResponseWrapper =
 Map<String, dynamic> buildLocaleMap(SKPriceLocaleWrapper local) {
   return {
     'currencySymbol': local.currencySymbol,
-    'currencyCode': local.currencyCode
+    'currencyCode': local.currencyCode,
+    'countryCode': local.countryCode,
   };
 }