Updating to latest applepay capabilities code.

Author: OsamaRabie

TapApplePayKit-Example/EssentialSetupViewController.swift

@@ -21,7 +21,7 @@ class EssentialSetupViewController: UIViewController {
         super.viewDidLoad()
         loadingIndicator.isHidden = true
         // First define your environment
-        TapApplePay.sdkMode = .production
+        TapApplePay.sdkMode = .sandbox
         // Second define your transaction & merchant details
         setupApplePayRequest()
         // Do any additional setup after loading the view.
@@ -30,7 +30,7 @@ class EssentialSetupViewController: UIViewController {
     /// Call this to first define your transaction & merchant details
     func setupApplePayRequest() {
         myTapApplePayRequest.build(paymentAmount: 0.1, applePayMerchantID: "merchant.tap.gosell")
-        myTapApplePayRequest.build(paymentNetworks: [.Mada,.Visa,.MasterCard], paymentItems: [], paymentAmount:0.1, currencyCode: .KWD,applePayMerchantID:"merchant.tap.gosell", merchantCapabilities: [.capability3DS,.capabilityCredit,.capabilityDebit,.capabilityEMV])
+        myTapApplePayRequest.build(paymentNetworks: [.Visa,.MasterCard], paymentItems: [], paymentAmount:0.1, currencyCode: .KWD,applePayMerchantID:"merchant.tap.gosell", merchantCapabilities: [.threeDSecure,.credit,.debit,.emv])
     }
 
 

TapApplePayKit-Example/ViewController.swift

@@ -27,7 +27,7 @@ class ViewController: UIViewController {
         // Do any additional setup after loading the view.
 
         myTapApplePayRequest.build(paymentAmount: 0.1, applePayMerchantID: "merchant.tap.gosell")
-        myTapApplePayRequest.build(paymentNetworks: [.Mada,.Visa,.MasterCard], paymentItems: [], paymentAmount:0.1, currencyCode: .KWD,applePayMerchantID:"merchant.tap.gosell", merchantCapabilities: [.capability3DS,.capabilityCredit,.capabilityDebit,.capabilityEMV])
+        myTapApplePayRequest.build(paymentNetworks: [.Visa,.MasterCard], paymentItems: [], paymentAmount:0.1, currencyCode: .KWD,applePayMerchantID:"merchant.tap.gosell", merchantCapabilities: [.threeDSecure,.credit,.debit,.emv])
         featuresTableView.dataSource = self
         featuresTableView.delegate = self
 

TapApplePayKit-iOS.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "TapApplePayKit-iOS"
-  spec.version      = "1.0.26"
+  spec.version      = "1.0.27"
   spec.summary      = "Provide an interface and an easy wrapper for Apple Pay functionalities."
 
   # This description is used to generate tags and improve search results.

TapApplePayKit-iOS.xcodeproj/xcuserdata/osamarabie.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>TapApplePayKit-Example.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>17</integer>
 		</dict>
 		<key>TapApplePayKit-iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>16</integer>
 		</dict>
 	</dict>
 </dict>

TapApplePayKit-iOS.xcworkspace/xcuserdata/osamarabie.xcuserdatad/UserInterfaceState.xcuserstate

@@ -139,6 +139,19 @@ Hj+N6UWFOYK98Xi+sQIDAQAB
             simCountryISO = carrier.isoCountryCode
         }
 
+        let result2: [String: String] = [
+            Constants.HTTPHeaderValueKey.appID: bundleID,
+            Constants.HTTPHeaderValueKey.requirer:Constants.HTTPHeaderValueKey.requirerValue,
+            Constants.HTTPHeaderValueKey.requirerVersion:requirerVersion,
+            Constants.HTTPHeaderValueKey.requirerOS: osName,
+            Constants.HTTPHeaderValueKey.requirerOSVersion: osVersion,
+            Constants.HTTPHeaderValueKey.requirerDeviceName: deviceNameFiltered,
+            Constants.HTTPHeaderValueKey.requirerDeviceType: deviceType,
+            Constants.HTTPHeaderValueKey.requirerDeviceModel: deviceModel,
+            Constants.HTTPHeaderValueKey.requirerSimNetworkName: simNetWorkName ?? "",
+            Constants.HTTPHeaderValueKey.requirerSimCountryIso: simCountryISO ?? ""
+        ]
+        
 
         let result: [String: String] = [
             Constants.HTTPHeaderValueKey.appID: Crypter.encrypt(bundleID, using: NetworkManager.headersEncryptionPublicKey) ?? "",

TapApplePayKit-iOS/Core/private/Network/NetworkManagerExtension.swift

@@ -24,6 +24,8 @@ import enum CommonDataModelsKit_iOS.TapCurrencyCode
     public lazy var paymentAmount:Double = 0
     /// The apple pay merchant identefier
     public lazy var applePayMerchantID:String = ""
+    /// The apple pay merchant identefier
+    public lazy var merchantCapabilities:PKMerchantCapability = [.credit,.debit,.threeDSecure]
 
     /// The actual apple pay request
     public lazy var appleRequest:PKPaymentRequest = .init()
@@ -40,13 +42,13 @@ import enum CommonDataModelsKit_iOS.TapCurrencyCode
      - Parameter applePayMerchantID: The apple pay merchant identefier default ""
      - Parameter recurringPaymentRequest: Defines the recurring payment request Please check [Apple Pay docs](https://developer.apple.com/documentation/passkit/pkrecurringpaymentrequest). NOTE: This will only be availble for iOS 16+ and subscripion parameter is on.
      **/
-    public func build(paymentNetworks:[TapApplePayPaymentNetwork] = [.Amex,.Visa,.MasterCard], paymentItems:[PKPaymentSummaryItem] = [], paymentAmount:Double,currencyCode:TapCurrencyCode = .USD,applePayMerchantID:String,merchantCapabilities:PKMerchantCapability = [.capability3DS,.capabilityCredit,.capabilityDebit,.capabilityEMV], recurringPaymentRequest:Any? = nil) {
+    public func build(paymentNetworks:[TapApplePayPaymentNetwork] = [.Amex,.Visa,.MasterCard], paymentItems:[PKPaymentSummaryItem] = [], paymentAmount:Double,currencyCode:TapCurrencyCode = .USD,applePayMerchantID:String,merchantCapabilities:PKMerchantCapability = [.credit,.debit,.emv,.threeDSecure], recurringPaymentRequest:Any? = nil) {
         self.paymentNetworks = paymentNetworks
         self.paymentItems = paymentItems
         self.paymentAmount = paymentAmount
         self.currencyCode = currencyCode
         self.applePayMerchantID = applePayMerchantID
-        
+        self.merchantCapabilities = merchantCapabilities
         // Correctly define the recurring request
         if #available(iOS 16.0, *),
            let correctRecurring:PKRecurringPaymentRequest = recurringPaymentRequest as? PKRecurringPaymentRequest {
@@ -74,7 +76,7 @@ import enum CommonDataModelsKit_iOS.TapCurrencyCode
         appleRequest.paymentSummaryItems.append(.init(label: "\(TapApplePay.intitModelResponse?.data.merchant?.name ?? "")", amount: NSDecimalNumber(value: paymentAmount)))
         appleRequest.supportedNetworks = paymentNetworks.map{ $0.applePayNetwork! }
         appleRequest.merchantIdentifier = applePayMerchantID
-        appleRequest.merchantCapabilities = [.capability3DS]
+        appleRequest.merchantCapabilities = merchantCapabilities
         // Check subscription details
         if #available(iOS 16.0, *),
            let correctRecurring:PKRecurringPaymentRequest = recurringPaymentRequest as? PKRecurringPaymentRequest {