Merge pull request #147 from Adyen/feature/removeSupportedNetworksApp…

…lePay

Removed supported networks value

android/src/main/kotlin/com/adyen/checkout/flutter/PlatformApi.kt

@@ -403,7 +403,6 @@ data class ApplePayConfigurationDTO (
   val merchantName: String,
   val allowOnboarding: Boolean? = null,
   val summaryItems: List<ApplePaySummaryItemDTO?>? = null,
-  val supportedNetworks: List<String?>? = null,
   val requiredBillingContactFields: List<String?>? = null,
   val billingContact: ApplePayContactDTO? = null,
   val requiredShippingContactFields: List<String?>? = null,
@@ -423,26 +422,25 @@ data class ApplePayConfigurationDTO (
       val merchantName = list[1] as String
       val allowOnboarding = list[2] as Boolean?
       val summaryItems = list[3] as List<ApplePaySummaryItemDTO?>?
-      val supportedNetworks = list[4] as List<String?>?
-      val requiredBillingContactFields = list[5] as List<String?>?
-      val billingContact: ApplePayContactDTO? = (list[6] as List<Any?>?)?.let {
+      val requiredBillingContactFields = list[4] as List<String?>?
+      val billingContact: ApplePayContactDTO? = (list[5] as List<Any?>?)?.let {
         ApplePayContactDTO.fromList(it)
       }
-      val requiredShippingContactFields = list[7] as List<String?>?
-      val shippingContact: ApplePayContactDTO? = (list[8] as List<Any?>?)?.let {
+      val requiredShippingContactFields = list[6] as List<String?>?
+      val shippingContact: ApplePayContactDTO? = (list[7] as List<Any?>?)?.let {
         ApplePayContactDTO.fromList(it)
       }
-      val applePayShippingType: ApplePayShippingType? = (list[9] as Int?)?.let {
+      val applePayShippingType: ApplePayShippingType? = (list[8] as Int?)?.let {
         ApplePayShippingType.ofRaw(it)
       }
-      val allowShippingContactEditing = list[10] as Boolean?
-      val shippingMethods = list[11] as List<ApplePayShippingMethodDTO?>?
-      val applicationData = list[12] as String?
-      val supportedCountries = list[13] as List<String?>?
-      val merchantCapability: ApplePayMerchantCapability? = (list[14] as Int?)?.let {
+      val allowShippingContactEditing = list[9] as Boolean?
+      val shippingMethods = list[10] as List<ApplePayShippingMethodDTO?>?
+      val applicationData = list[11] as String?
+      val supportedCountries = list[12] as List<String?>?
+      val merchantCapability: ApplePayMerchantCapability? = (list[13] as Int?)?.let {
         ApplePayMerchantCapability.ofRaw(it)
       }
-      return ApplePayConfigurationDTO(merchantId, merchantName, allowOnboarding, summaryItems, supportedNetworks, requiredBillingContactFields, billingContact, requiredShippingContactFields, shippingContact, applePayShippingType, allowShippingContactEditing, shippingMethods, applicationData, supportedCountries, merchantCapability)
+      return ApplePayConfigurationDTO(merchantId, merchantName, allowOnboarding, summaryItems, requiredBillingContactFields, billingContact, requiredShippingContactFields, shippingContact, applePayShippingType, allowShippingContactEditing, shippingMethods, applicationData, supportedCountries, merchantCapability)
     }
   }
   fun toList(): List<Any?> {
@@ -451,7 +449,6 @@ data class ApplePayConfigurationDTO (
       merchantName,
       allowOnboarding,
       summaryItems,
-      supportedNetworks,
       requiredBillingContactFields,
       billingContact?.toList(),
       requiredShippingContactFields,

ios/Classes/PlatformApi.swift

@@ -337,7 +337,6 @@ struct ApplePayConfigurationDTO {
     var merchantName: String
     var allowOnboarding: Bool?
     var summaryItems: [ApplePaySummaryItemDTO?]?
-    var supportedNetworks: [String?]?
     var requiredBillingContactFields: [String?]?
     var billingContact: ApplePayContactDTO?
     var requiredShippingContactFields: [String?]?
@@ -354,28 +353,27 @@ struct ApplePayConfigurationDTO {
         let merchantName = list[1] as! String
         let allowOnboarding: Bool? = nilOrValue(list[2])
         let summaryItems: [ApplePaySummaryItemDTO?]? = nilOrValue(list[3])
-        let supportedNetworks: [String?]? = nilOrValue(list[4])
-        let requiredBillingContactFields: [String?]? = nilOrValue(list[5])
+        let requiredBillingContactFields: [String?]? = nilOrValue(list[4])
         var billingContact: ApplePayContactDTO?
-        if let billingContactList: [Any?] = nilOrValue(list[6]) {
+        if let billingContactList: [Any?] = nilOrValue(list[5]) {
             billingContact = ApplePayContactDTO.fromList(billingContactList)
         }
-        let requiredShippingContactFields: [String?]? = nilOrValue(list[7])
+        let requiredShippingContactFields: [String?]? = nilOrValue(list[6])
         var shippingContact: ApplePayContactDTO?
-        if let shippingContactList: [Any?] = nilOrValue(list[8]) {
+        if let shippingContactList: [Any?] = nilOrValue(list[7]) {
             shippingContact = ApplePayContactDTO.fromList(shippingContactList)
         }
         var applePayShippingType: ApplePayShippingType?
-        let applePayShippingTypeEnumVal: Int? = nilOrValue(list[9])
+        let applePayShippingTypeEnumVal: Int? = nilOrValue(list[8])
         if let applePayShippingTypeRawValue = applePayShippingTypeEnumVal {
             applePayShippingType = ApplePayShippingType(rawValue: applePayShippingTypeRawValue)!
         }
-        let allowShippingContactEditing: Bool? = nilOrValue(list[10])
-        let shippingMethods: [ApplePayShippingMethodDTO?]? = nilOrValue(list[11])
-        let applicationData: String? = nilOrValue(list[12])
-        let supportedCountries: [String?]? = nilOrValue(list[13])
+        let allowShippingContactEditing: Bool? = nilOrValue(list[9])
+        let shippingMethods: [ApplePayShippingMethodDTO?]? = nilOrValue(list[10])
+        let applicationData: String? = nilOrValue(list[11])
+        let supportedCountries: [String?]? = nilOrValue(list[12])
         var merchantCapability: ApplePayMerchantCapability?
-        let merchantCapabilityEnumVal: Int? = nilOrValue(list[14])
+        let merchantCapabilityEnumVal: Int? = nilOrValue(list[13])
         if let merchantCapabilityRawValue = merchantCapabilityEnumVal {
             merchantCapability = ApplePayMerchantCapability(rawValue: merchantCapabilityRawValue)!
         }
@@ -385,7 +383,6 @@ struct ApplePayConfigurationDTO {
             merchantName: merchantName,
             allowOnboarding: allowOnboarding,
             summaryItems: summaryItems,
-            supportedNetworks: supportedNetworks,
             requiredBillingContactFields: requiredBillingContactFields,
             billingContact: billingContact,
             requiredShippingContactFields: requiredShippingContactFields,
@@ -405,7 +402,6 @@ struct ApplePayConfigurationDTO {
             merchantName,
             allowOnboarding,
             summaryItems,
-            supportedNetworks,
             requiredBillingContactFields,
             billingContact?.toList(),
             requiredShippingContactFields,

ios/Classes/utils/ApplePayConfigurationMapper.swift

@@ -29,11 +29,6 @@ extension ApplePayConfigurationDTO {
             }
         }
 
-        supportedNetworks.map {
-            let supportedNetworksNonNil: [String] = $0.compactMap { $0 }
-            paymentRequest.supportedNetworks = mapToSupportedNetworks(supportedNetworks: supportedNetworksNonNil)
-        }
-
         applicationData.map { paymentRequest.applicationData = Data($0.utf8) }
         return paymentRequest
     }
@@ -63,11 +58,6 @@ extension ApplePayConfigurationDTO {
         return Set<PKContactField>(contactFieldsNonNil.compactMap { PKContactField.fromString($0) })
     }
 
-    private func mapToSupportedNetworks(supportedNetworks: [String]) -> [PKPaymentNetwork] {
-        let networks = PKPaymentRequest.availableNetworks()
-        return networks.filter { supportedNetworks.contains($0.txVariantName) }
-    }
-
     private func mapToPaymentSummaryItems(summaryItems: [ApplePaySummaryItemDTO?]?, amount: AmountDTO) throws -> [PKPaymentSummaryItem] {
         guard let summaryItems else {
             let formattedAmount = try amount.toFormattedAmount()

lib/src/common/model/payment_method_configurations/apple_pay/apple_pay_configuration.dart

@@ -9,7 +9,6 @@ class ApplePayConfiguration {
   final String merchantName;
   final bool? allowOnboarding;
   final List<ApplePaySummaryItem>? applePaySummaryItems;
-  final List<String>? supportedNetworks;
   final List<ApplePayContactField>? requiredBillingContactFields;
   final ApplePayContact? billingContact;
   final List<ApplePayContactField>? requiredShippingContactFields;
@@ -26,7 +25,6 @@ class ApplePayConfiguration {
     required this.merchantName,
     this.allowOnboarding,
     this.applePaySummaryItems,
-    this.supportedNetworks,
     this.requiredBillingContactFields,
     this.billingContact,
     this.requiredShippingContactFields,

lib/src/generated/platform_api.g.dart

@@ -352,7 +352,6 @@ class ApplePayConfigurationDTO {
     required this.merchantName,
     this.allowOnboarding,
     this.summaryItems,
-    this.supportedNetworks,
     this.requiredBillingContactFields,
     this.billingContact,
     this.requiredShippingContactFields,
@@ -373,8 +372,6 @@ class ApplePayConfigurationDTO {
 
   List<ApplePaySummaryItemDTO?>? summaryItems;
 
-  List<String?>? supportedNetworks;
-
   List<String?>? requiredBillingContactFields;
 
   ApplePayContactDTO? billingContact;
@@ -401,7 +398,6 @@ class ApplePayConfigurationDTO {
       merchantName,
       allowOnboarding,
       summaryItems,
-      supportedNetworks,
       requiredBillingContactFields,
       billingContact?.encode(),
       requiredShippingContactFields,
@@ -423,27 +419,26 @@ class ApplePayConfigurationDTO {
       allowOnboarding: result[2] as bool?,
       summaryItems:
           (result[3] as List<Object?>?)?.cast<ApplePaySummaryItemDTO?>(),
-      supportedNetworks: (result[4] as List<Object?>?)?.cast<String?>(),
       requiredBillingContactFields:
-          (result[5] as List<Object?>?)?.cast<String?>(),
-      billingContact: result[6] != null
-          ? ApplePayContactDTO.decode(result[6]! as List<Object?>)
+          (result[4] as List<Object?>?)?.cast<String?>(),
+      billingContact: result[5] != null
+          ? ApplePayContactDTO.decode(result[5]! as List<Object?>)
           : null,
       requiredShippingContactFields:
-          (result[7] as List<Object?>?)?.cast<String?>(),
-      shippingContact: result[8] != null
-          ? ApplePayContactDTO.decode(result[8]! as List<Object?>)
+          (result[6] as List<Object?>?)?.cast<String?>(),
+      shippingContact: result[7] != null
+          ? ApplePayContactDTO.decode(result[7]! as List<Object?>)
           : null,
-      applePayShippingType: result[9] != null
-          ? ApplePayShippingType.values[result[9]! as int]
+      applePayShippingType: result[8] != null
+          ? ApplePayShippingType.values[result[8]! as int]
           : null,
-      allowShippingContactEditing: result[10] as bool?,
+      allowShippingContactEditing: result[9] as bool?,
       shippingMethods:
-          (result[11] as List<Object?>?)?.cast<ApplePayShippingMethodDTO?>(),
-      applicationData: result[12] as String?,
-      supportedCountries: (result[13] as List<Object?>?)?.cast<String?>(),
-      merchantCapability: result[14] != null
-          ? ApplePayMerchantCapability.values[result[14]! as int]
+          (result[10] as List<Object?>?)?.cast<ApplePayShippingMethodDTO?>(),
+      applicationData: result[11] as String?,
+      supportedCountries: (result[12] as List<Object?>?)?.cast<String?>(),
+      merchantCapability: result[13] != null
+          ? ApplePayMerchantCapability.values[result[13]! as int]
           : null,
     );
   }

lib/src/util/dto_mapper.dart

@@ -81,7 +81,6 @@ extension ApplePayConfigurationMapper on ApplePayConfiguration {
         summaryItems: applePaySummaryItems
             ?.map((applePaySummaryItem) => applePaySummaryItem.toDTO())
             .toList(),
-        supportedNetworks: supportedNetworks,
         requiredBillingContactFields: requiredBillingContactFields
             ?.map((billingContactField) => billingContactField.name)
             .toList(),

pigeons/platform_api.dart

@@ -192,7 +192,6 @@ class ApplePayConfigurationDTO {
   final String merchantName;
   final bool? allowOnboarding;
   final List<ApplePaySummaryItemDTO?>? summaryItems;
-  final List<String?>? supportedNetworks;
   final List<String?>? requiredBillingContactFields;
   final ApplePayContactDTO? billingContact;
   final List<String?>? requiredShippingContactFields;
@@ -209,7 +208,6 @@ class ApplePayConfigurationDTO {
     this.merchantName,
     this.allowOnboarding,
     this.summaryItems,
-    this.supportedNetworks,
     this.requiredBillingContactFields,
     this.billingContact,
     this.requiredShippingContactFields,