@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/ios/Models/Request.swift

@@ -20,6 +20,8 @@ public struct ThemeConfiguration: Codable {
     public let secondaryButtonFontColor: String?
     public let borderRadius: String?
     public let fontSize: String?
+    public let fontWeight: Int?
+    public let fontFamily: String?
     
     public init(
         bodyBackgroundColor: String? = nil,
@@ -33,7 +35,9 @@ public struct ThemeConfiguration: Codable {
         secondaryButtonHoverColor: String? = nil,
         secondaryButtonFontColor: String? = nil,
         borderRadius: String? = nil,
-        fontSize: String? = nil
+        fontSize: String? = nil,
+        fontWeight: Int? = nil,
+        fontFamily: String? = nil
     ) {
         self.bodyBackgroundColor = bodyBackgroundColor
         self.containerBackgroundColor = containerBackgroundColor
@@ -47,6 +51,8 @@ public struct ThemeConfiguration: Codable {
         self.secondaryButtonFontColor = secondaryButtonFontColor
         self.borderRadius = borderRadius
         self.fontSize = fontSize
+        self.fontWeight = fontWeight
+        self.fontFamily = fontFamily
     }
 }
 
@@ -81,14 +87,70 @@ public struct GrailPayRequest: Codable {
     }
 }
 
+public enum BillingFieldName: String, Codable {
+    case address
+    case country
+    case state
+    case city
+    case postalCode = "postal_code"
+}
+
+public enum AdditionalFieldName: String, Codable {
+    case name
+    case email = "email_address"
+    case phoneNumber = "phone_number"
+    case description
+}
+
+public struct FieldItem: Codable {
+    public let name: String
+    public let required: Bool
+    public var value: String
+
+    // Overloaded initializer for BillingFieldName
+    public init(name: BillingFieldName, required: Bool, value: String) {
+        self.name = name.rawValue
+        self.required = required
+        self.value = value
+    }
+
+    // Overloaded initializer for AdditionalFieldName
+    public init(name: AdditionalFieldName, required: Bool, value: String) {
+        self.name = name.rawValue
+        self.required = required
+        self.value = value
+    }
+}
+
+public struct FieldsVisibility: Codable {
+    public let billing: Bool
+    public let additional: Bool
+
+    public init(billing: Bool, additional: Bool) {
+        self.billing = billing
+        self.additional = additional
+    }
+}
+
+public struct FieldSection: Codable {
+    public let visibility: FieldsVisibility
+    public var billing: [FieldItem]
+    public var additional: [FieldItem]
+
+    public init(visibility: FieldsVisibility, billing: [FieldItem], additional: [FieldItem]) {
+        self.visibility = visibility
+        self.billing = billing
+        self.additional = additional
+    }
+}
+
 @objc
 public final class Request: NSObject {
-    public let amount: Double
+    public let amount: Double?
+    public let currency: String?
     public let billingInfoData: Data?
-    let themeConfiguration: ThemeConfiguration?
-    let selectedPaymentMethods: [PaymentMethod]
-    
-    // New parameters
+    public let themeConfiguration: ThemeConfiguration?
+    public let selectedPaymentMethods: [PaymentMethod]
     public let tokenOnly: Bool?
     public let saveCard: Bool?
     public let saveAccount: Bool?
@@ -99,10 +161,16 @@ public final class Request: NSObject {
     public var recurringIntervals: [RecurringIntervals]?
     public var recurringStartDateType: RecurringStartDateType?
     public var recurringStartDate: String?
-    public let enable3DS: Bool?
-    
+    public let secureAuthentication: Bool?
+    public let showReceipt: Bool?
+    public let showTotal: Bool?
+    public let showSubmitButton: Bool?
+    public let referenceID: Bool?
+    public let referenceToken: String?
+        
     public init(
-        amount: Double,
+        amount: Double? = nil,
+        currency: String? = nil,
         billingInfoData: Data? = nil,
         paymentMethods: [PaymentMethod]? = nil,
         themeConfiguration: ThemeConfiguration? = nil,
@@ -116,9 +184,36 @@ public final class Request: NSObject {
         recurringIntervals: [RecurringIntervals]? = nil,
         recurringStartDateType: RecurringStartDateType? = nil,
         recurringStartDate: String? = nil,
-        enable3DS: Bool = false
+        secureAuthentication: Bool = false,
+        showReceipt: Bool = false,
+        showTotal: Bool = false,
+        showSubmitButton: Bool = false,
+        referenceID: Bool = false,
+        referenceToken: String? = nil
     ) {
+        
+        // Validate if amount is provided, must be ≥ 0.50
+        if let amt = amount, amt < 0.50 {
+            DispatchQueue.main.async {
+                if let topVC = UIApplication.topViewController() {
+                    let alert = UIAlertController(title: "Invalid Amount",
+                                                  message: "Amount must be at least $0.50.",
+                                                  preferredStyle: .alert)
+                    alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
+                        if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
+                            easyPayVC.dismiss(animated: true)
+                        } else {
+                            // fallback: dismiss topVC itself if it's presented modally
+                            topVC.dismiss(animated: true)
+                        }
+                    }))
+                    topVC.present(alert, animated: true)
+                }
+            }
+        }
+        
         self.amount = amount
+        self.currency = currency
         self.billingInfoData = billingInfoData
         self.themeConfiguration = themeConfiguration
         self.tokenOnly = tokenOnly
@@ -131,7 +226,12 @@ public final class Request: NSObject {
         self.recurringIntervals = recurringIntervals
         self.recurringStartDateType = recurringStartDateType
         self.recurringStartDate = recurringStartDate
-        self.enable3DS = enable3DS
+        self.secureAuthentication = secureAuthentication
+        self.showReceipt = showReceipt
+        self.showTotal = showTotal
+        self.showSubmitButton = showSubmitButton
+        self.referenceID = referenceID
+        self.referenceToken = referenceToken
         
         // Conditionally assign recurring fields only if is_recurring == true
         if is_recurring {
@@ -186,12 +286,19 @@ public final class Request: NSObject {
             self.paymentIntentApi { success in
                 if success {
                     print("Payment Intent API call succeeded")
-                    UserStoreSingleton.shared.price = String(self.amount)
+                    UserStoreSingleton.shared.price = String(self.amount ?? 0)
                     print("Saved amount: \(UserStoreSingleton.shared.price ?? "No amount")")
                 }
             }
         }
         
+        if referenceID == true {
+            fetchReferenceData { response in
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: NSNotification.Name("ReferenceIDResponse"), object: response)
+                }
+            }
+        }
     }
     
     //MARK: - Payment Intent Api
@@ -239,7 +346,7 @@ public final class Request: NSObject {
         }
         
         let params: [String: Any] = [
-            "amount": amount,
+            "amount": amount ?? 0,
             "allowed_cycles": String(recurringIntervals?.count ?? 0),
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
@@ -332,7 +439,7 @@ public final class Request: NSObject {
         request.addValue(UserStoreSingleton.shared.clientToken ?? "", forHTTPHeaderField: "clientToken")
         
         let params: [String: Any] = [
-            "amount": amount,
+            "amount": amount ?? 0,
         ]
         
         do {
@@ -440,6 +547,61 @@ public final class Request: NSObject {
         task.resume()
     }
     
+    // MARK: - GET Transaction Status API
+    private func fetchReferenceData(completion: @escaping ([String: Any]?) -> Void) {
+        let urlString = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecureStatus(referenceToken ?? "").path()
+        print("Final 3DS status URL: \(urlString)")
+        
+        guard let url = URL(string: urlString) else {
+            print("Invalid URL")
+            completion(nil)
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: url)
+        uRLRequest.httpMethod = "GET"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.customerToken
+        print("Setting customerToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+        
+        // Add API key/secret headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        let task = URLSession.shared.dataTask(with: uRLRequest) { data, response, error in
+            if let error = error {
+                print("3DS status check error:", error.localizedDescription)
+                completion(nil)
+                return
+            }
+            
+            guard let data = data else {
+                print("No data in response")
+                completion(nil)
+                return
+            }
+            
+            do {
+                if let json = try JSONSerialization.jsonObject(with: data) as? [String: Any] {
+                    print("3DS status response:", json)
+                    completion(json) // pass result
+                } else {
+                    completion(nil)
+                }
+            } catch {
+                print("Error parsing JSON:", error.localizedDescription)
+                completion(nil)
+            }
+        }
+        
+        task.resume()
+    }
+    
 }
 
 extension DateFormatter {

package/ios/Models/Result.swift

@@ -1,3 +1,10 @@
+//
+//  Result.swift
+//  EasyPay
+//
+//  Created by iftekhar on 14/07/24.
+//
+
 import UIKit
 
 @objc
@@ -9,14 +16,14 @@ public enum ResultType: Int {
 
 @objc
 public final class Result: NSObject {
-
+    
     @objc public let type: ResultType
     @objc public let error: NSError?
     @objc public let chargeData: [String: Any]?
-
+    
     @objc public let billingInfo: [String: Any]?
     @objc public let additionalInfo: [String: Any]?
-
+    
     // Initializer for error type result
     internal init(error: NSError) {
         self.type = .error
@@ -26,7 +33,7 @@ public final class Result: NSObject {
         self.additionalInfo = nil
         super.init()
     }
-
+    
     // Initializer for success/cancelled result types
     internal init(type: ResultType,
                   chargeData: [String: Any]? = nil,
@@ -39,4 +46,4 @@ public final class Result: NSObject {
         self.additionalInfo = additionalInfo
         super.init()
     }
-}
+}