Multiple merchant capabilities (#41)

* Added ability to provide multiple merchant capabilities

* PR feedback

* guard check

* updated flutter_svg to latest version.

* mad_pay_android version bump

* mad_pay_android version bump

* Bump version & edit merchantCapabilities guard

* Fix doc

Co-authored-by: Michael Gobbers <michaelgobbers@gmail.com>

Author: mit-73

example/ios/Runner.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

example/lib/main.dart

@@ -48,6 +48,10 @@ class _MyAppState extends State<MyApp> {
     shippingContact: Contact(
       emailAddress: 'test@test.com',
     ),
+    merchantCapabilities: <MerchantCapabilities>[
+      MerchantCapabilities.threeds,
+      MerchantCapabilities.credit,
+    ],
   );
 
   final GoogleParameters googleParameters = GoogleParameters(

packages/mad_pay/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.8
+
+* Bump `mad_pay_android` version to `2.2.7` (Bump `flutter_svg` version to `1.0.3`)
+* Bump `mad_pay_ios` version to `2.2.4` (Added ability to provide multiple merchant capabilities)
+
 ## 2.2.7
 
 * Bump `mad_pay_android` version to `2.2.6` (Added support for building on Apple Silicon)

packages/mad_pay/pubspec.yaml

@@ -1,6 +1,6 @@
 name: mad_pay
 description: Mad Pay will help you make payments through Apple Pay and Google Pay
-version: 2.2.7
+version: 2.2.8
 repository: https://github.com/MadBrains/Mad-Pay-Flutter
 issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
 homepage: https://madbrains.ru/
@@ -13,8 +13,8 @@ dependencies:
   flutter:
     sdk: flutter
   mad_pay_platform_interface: ^2.2.2
-  mad_pay_android: ^2.2.6
-  mad_pay_ios: ^2.2.3
+  mad_pay_android: ^2.2.7
+  mad_pay_ios: ^2.2.4
 
 # For development. Remove/comment before publishing to pub.
 # dependency_overrides:

packages/mad_pay_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.7
+
+* Bump `flutter_svg` version to `1.0.3`
+
 ## 2.2.6
 
 * Added support for building on Apple Silicon

packages/mad_pay_android/android/protos/apple.proto

@@ -6,7 +6,7 @@ option java_package = "ru.madbrains.mad_pay_android";
 
 message AppleParameters {
   string merchant_identifier = 1;
-  MerchantCapabilities merchant_capabilities = 2;
+  repeated MerchantCapabilities merchant_capabilities = 2;
   repeated string supported_countries = 3;
   repeated string required_billing_contact_fields = 4;
   repeated string required_shipping_contact_fields = 5;

packages/mad_pay_android/pubspec.yaml

@@ -1,6 +1,6 @@
 name: mad_pay_android
 description: A plug-in to add support for payments on the Android side of Mad Pay
-version: 2.2.6
+version: 2.2.7
 repository: https://github.com/MadBrains/Mad-Pay-Flutter
 issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
 homepage: https://madbrains.ru/
@@ -15,7 +15,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   mad_pay_platform_interface: ^2.2.2
-  flutter_svg: ^0.23.0+1
+  flutter_svg: ^1.0.3
 
 # For development. Remove/comment before publishing to pub.
 # dependency_overrides:

packages/mad_pay_ios/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.4
+
+* Added ability to provide multiple merchant capabilities
+
 ## 2.2.3
 
 * Fix typo `emailAddress`

packages/mad_pay_ios/ios/Classes/PaymentHelpers.swift

@@ -97,19 +97,28 @@ class PaymentNetworkHelper {
         paymentNetwork.compactMap({ decodePaymentNetwork($0) })
     }
 
-    static func getMerchantCapabilities(_ merchantCapabilities: Apple_MerchantCapabilities) -> PKMerchantCapability {
-        switch (merchantCapabilities) {
-        case Apple_MerchantCapabilities.threeds:
-            return PKMerchantCapability.capability3DS
-        case Apple_MerchantCapabilities.credit:
-            return PKMerchantCapability.capabilityCredit
-        case Apple_MerchantCapabilities.debit:
-            return PKMerchantCapability.capabilityDebit
-        case Apple_MerchantCapabilities.emv:
-            return PKMerchantCapability.capabilityEMV
-        default:
-            return PKMerchantCapability.capability3DS
+    static func getMerchantCapabilities(_ merchantCapabilities: [Apple_MerchantCapabilities]?) -> PKMerchantCapability {
+
+        guard let capabilities = merchantCapabilities, !capabilities.isEmpty else {
+            return .capability3DS;
+        }
+
+        var decodedCapabilities: PKMerchantCapability = [];
+
+        if(capabilities.contains(Apple_MerchantCapabilities.threeds) ){
+            decodedCapabilities = decodedCapabilities.union(.capability3DS)
         }
+        if(capabilities.contains(Apple_MerchantCapabilities.emv)){
+            decodedCapabilities = decodedCapabilities.union(.capabilityEMV)
+        }
+        if(capabilities.contains(Apple_MerchantCapabilities.credit)){
+            decodedCapabilities = decodedCapabilities.union(.capabilityCredit)
+        }
+        if(capabilities.contains(Apple_MerchantCapabilities.debit)){
+            decodedCapabilities = decodedCapabilities.union(.capabilityDebit)
+        }
+
+        return decodedCapabilities;
     }
 
     static func getShippingType(_ shippingType: Apple_ShippingType) -> PKShippingType {

packages/mad_pay_ios/ios/Classes/protos/apple.pb.swift

@@ -126,7 +126,7 @@ struct Apple_AppleParameters {
     set {_uniqueStorage()._merchantIdentifier = newValue}
   }
 
-  var merchantCapabilities: Apple_MerchantCapabilities {
+  var merchantCapabilities: [Apple_MerchantCapabilities] {
     get {return _storage._merchantCapabilities}
     set {_uniqueStorage()._merchantCapabilities = newValue}
   }
@@ -355,7 +355,7 @@ extension Apple_AppleParameters: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
 
   fileprivate class _StorageClass {
     var _merchantIdentifier: String = String()
-    var _merchantCapabilities: Apple_MerchantCapabilities = .threeds
+    var _merchantCapabilities: [Apple_MerchantCapabilities] = []
     var _supportedCountries: [String] = []
     var _requiredBillingContactFields: [String] = []
     var _requiredShippingContactFields: [String] = []
@@ -399,7 +399,7 @@ extension Apple_AppleParameters: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
         // enabled. https://github.com/apple/swift-protobuf/issues/1034
         switch fieldNumber {
         case 1: try { try decoder.decodeSingularStringField(value: &_storage._merchantIdentifier) }()
-        case 2: try { try decoder.decodeSingularEnumField(value: &_storage._merchantCapabilities) }()
+        case 2: try { try decoder.decodeRepeatedEnumField(value: &_storage._merchantCapabilities) }()
         case 3: try { try decoder.decodeRepeatedStringField(value: &_storage._supportedCountries) }()
         case 4: try { try decoder.decodeRepeatedStringField(value: &_storage._requiredBillingContactFields) }()
         case 5: try { try decoder.decodeRepeatedStringField(value: &_storage._requiredShippingContactFields) }()
@@ -416,11 +416,15 @@ extension Apple_AppleParameters: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every if/case branch local when no optimizations
+      // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+      // https://github.com/apple/swift-protobuf/issues/1182
       if !_storage._merchantIdentifier.isEmpty {
         try visitor.visitSingularStringField(value: _storage._merchantIdentifier, fieldNumber: 1)
       }
-      if _storage._merchantCapabilities != .threeds {
-        try visitor.visitSingularEnumField(value: _storage._merchantCapabilities, fieldNumber: 2)
+      if !_storage._merchantCapabilities.isEmpty {
+        try visitor.visitPackedEnumField(value: _storage._merchantCapabilities, fieldNumber: 2)
       }
       if !_storage._supportedCountries.isEmpty {
         try visitor.visitRepeatedStringField(value: _storage._supportedCountries, fieldNumber: 3)
@@ -431,12 +435,12 @@ extension Apple_AppleParameters: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
       if !_storage._requiredShippingContactFields.isEmpty {
         try visitor.visitRepeatedStringField(value: _storage._requiredShippingContactFields, fieldNumber: 5)
       }
-      if let v = _storage._billingContact {
+      try { if let v = _storage._billingContact {
         try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
-      }
-      if let v = _storage._shippingContact {
+      } }()
+      try { if let v = _storage._shippingContact {
         try visitor.visitSingularMessageField(value: v, fieldNumber: 7)
-      }
+      } }()
       if !_storage._shippingMethods.isEmpty {
         try visitor.visitRepeatedMessageField(value: _storage._shippingMethods, fieldNumber: 8)
       }
@@ -499,18 +503,22 @@ extension Apple_Contact: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
   }
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+    // The use of inline closures is to circumvent an issue where the compiler
+    // allocates stack space for every if/case branch local when no optimizations
+    // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+    // https://github.com/apple/swift-protobuf/issues/1182
     if !self.emailAddress.isEmpty {
       try visitor.visitSingularStringField(value: self.emailAddress, fieldNumber: 1)
     }
-    if let v = self._name {
+    try { if let v = self._name {
       try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
-    }
+    } }()
     if !self.phoneNumber.isEmpty {
       try visitor.visitSingularStringField(value: self.phoneNumber, fieldNumber: 3)
     }
-    if let v = self._postalAddress {
+    try { if let v = self._postalAddress {
       try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
-    }
+    } }()
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -590,6 +598,10 @@ extension Apple_PersonNameComponents: SwiftProtobuf.Message, SwiftProtobuf._Mess
 
   func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every if/case branch local when no optimizations
+      // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
+      // https://github.com/apple/swift-protobuf/issues/1182
       if !_storage._namePrefix.isEmpty {
         try visitor.visitSingularStringField(value: _storage._namePrefix, fieldNumber: 1)
       }
@@ -608,9 +620,9 @@ extension Apple_PersonNameComponents: SwiftProtobuf.Message, SwiftProtobuf._Mess
       if !_storage._nickname.isEmpty {
         try visitor.visitSingularStringField(value: _storage._nickname, fieldNumber: 6)
       }
-      if let v = _storage._phoneticRepresentation {
+      try { if let v = _storage._phoneticRepresentation {
         try visitor.visitSingularMessageField(value: v, fieldNumber: 7)
-      }
+      } }()
     }
     try unknownFields.traverse(visitor: &visitor)
   }