Merge pull request #35 from dojo-engineering/develop

Develop->Master

Author: deniss-kaibagarovs

Sources/dojo-ios-sdk/Classes/DojoSDK.swift

@@ -43,6 +43,11 @@ protocol DojoSDKProtocol {
 
 /// DojoSDK interface
 @objc public class DojoSDK: NSObject, DojoSDKProtocol {
+    
+    public static override func version() -> Int {
+        141
+    }
+    
     /// Execute card payment
     /// - Parameters:
     ///   - token: Payment secret obtained from a paymentIIntent object.

Sources/dojo-ios-sdk/Classes/Entities/CardPaymentPayload/DojoCardPaymentPayload.swift

@@ -28,7 +28,7 @@ import Foundation
         self.userPhoneNumber = userPhoneNumber
         self.billingAddress = billingAddress
         self.shippingDetails = shippingDetails
-        self.metaData = metaData
+        self.metaData = metaData == nil ? [:] : metaData
         self.savePaymentMethod = savePaymentMethod
     }
 
@@ -43,14 +43,15 @@ import Foundation
     /// The address where to send the order.
     public let shippingDetails: DojoShippingDetails?
     /// A set of key-value pairs that you can use for storing additional information.
-    public let metaData: [String: String]?
+    public var metaData: [String: String]?
     /// Set if you want to save this payment method on user's account
     public let savePaymentMethod: Bool
 }
 
 extension DojoCardPaymentPayload {
     func getRequestBody() -> Data? {
         let encoder = JSONEncoder()
+        self.metaData?[getMetadataSDKVersionKey()] = getMetadataSDKVersion()
         guard let bodyData = try? encoder.encode(CardPaymentDataRequest(payload: self)) else {
             return nil
         }

Sources/dojo-ios-sdk/Classes/Entities/CardPaymentPayload/DojoCardPaymentPayloadProtocol.swift

@@ -9,4 +9,16 @@ import Foundation
 
 protocol DojoCardPaymentPayloadProtocol: Codable {
     func getRequestBody() -> Data?
+    func getMetadataSDKVersion() -> String
+    func getMetadataSDKVersionKey() -> String
+}
+
+extension DojoCardPaymentPayloadProtocol {
+    func getMetadataSDKVersion() -> String {
+        "ios-\(DojoSDK.version())"
+    }
+    
+    func getMetadataSDKVersionKey() -> String {
+        "dojo-sdk-core-version"
+    }
 }

Sources/dojo-ios-sdk/Classes/Entities/CardPaymentPayload/DojoSavedCardPaymentPayload.swift

@@ -26,7 +26,7 @@ import Foundation
         self.userPhoneNumber = userPhoneNumber
         self.userEmailAddress = userEmailAddress
         self.shippingDetails = shippingDetails
-        self.metaData = metaData
+        self.metaData = metaData == nil ? [:] : metaData
     }
 
     /// CVV, CVC or CVC2 of a card.
@@ -40,10 +40,11 @@ import Foundation
     /// The address where to send the order.
     public let shippingDetails: DojoShippingDetails?
     /// A set of key-value pairs that you can use for storing additional information.
-    public let metaData: [String: String]?
+    public var metaData: [String: String]?
 
     func getRequestBody() -> Data? {
         let encoder = JSONEncoder()
+        self.metaData?[getMetadataSDKVersionKey()] = getMetadataSDKVersion()
         guard let bodyData = try? encoder.encode(CardPaymentDataRequest(payload: self)) else {
             return nil
         }

Sources/dojo-ios-sdk/Libs/CardinalMobile.xcframework/ios-arm64/CardinalMobile.framework/Assets.car

@@ -5,7 +5,7 @@
 //  Copyright © 2018 Cardinal Commerce. All rights reserved.
 //
 
-#import "Customization.h"
+#import <CardinalMobile/Customization.h>
 
 /**
  * The ButtonCustomization class provides methods for the 3DS Requestor App to pass button customization parameters to the 3DS SDK.

Sources/dojo-ios-sdk/Libs/CardinalMobile.xcframework/ios-arm64/CardinalMobile.framework/CardinalMobile

@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Warning.h"
-#import "DirectoryServerIDConst.h"
+#import <CardinalMobile/Warning.h>
+#import <CardinalMobile/DirectoryServerIDConst.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Sources/dojo-ios-sdk/Libs/CardinalMobile.xcframework/ios-arm64/CardinalMobile.framework/Headers/ButtonCustomization.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "UiCustomization.h"
+#import <CardinalMobile/UiCustomization.h>
 NS_ASSUME_NONNULL_BEGIN
 
 /*!

Sources/dojo-ios-sdk/Libs/CardinalMobile.xcframework/ios-arm64/CardinalMobile.framework/Headers/CardinalSession.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ThreeDS2Service.h"
+#import <CardinalMobile/ThreeDS2Service.h>
 
 @class ConfigParameters;
 @class UiCustomization;