@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/ios/Classes/EasyMerchantSdk.swift

@@ -1,11 +1,7 @@
-//
-//  EasyMerchantSdkPlugin.swift
-//  EasyMerchantSdk
-//
-
 import Foundation
 import UIKit
 import React
+//import EasyPay // Import the EasyPay module
 
 @objc(EasyMerchantSdkPlugin)
 public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
@@ -14,6 +10,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     public static func moduleName() -> String! {
         return "EasyMerchantSdk"
     }
+    
     public static func requiresMainQueueSetup() -> Bool {
         return true
     }
@@ -23,6 +20,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     // MARK: - Stored Promise Callbacks
     private var billingResolver: RCTPromiseResolveBlock?
     private var billingRejecter: RCTPromiseRejectBlock?
+    private var paymentReferenceResolver: RCTPromiseResolveBlock?
+    private var paymentReferenceRejecter: RCTPromiseRejectBlock?
 
     // MARK: - View Controller Reference
     private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
@@ -46,12 +45,23 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         }
     }
 
+    // MARK: - configureEnvironment(...) Exposed to RN
+    @objc public func configureEnvironment(_ env: String, apiKey: String, apiSecret: String) {
+        switch env.lowercased() {
+        case "production": EnvironmentConfig.setEnvironment(.production)
+        case "sandbox":    EnvironmentConfig.setEnvironment(.sandbox)
+        default:           EnvironmentConfig.setEnvironment(.staging)
+        }
+        EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
+    }
+
     // MARK: - billing(...) Exposed to RN
     @objc public func billing(
         _ amount: String,
-        billinginfo: String?,
+        currency: String?,
+        billingInfo: [String: Any]?,
         paymentMethods: [String],
-        themeConfiguration: [String: Any],
+        themeConfiguration: [String: Any]?,
         tokenOnly: Bool,
         saveCard: Bool,
         saveAccount: Bool,
@@ -62,22 +72,66 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         recurringIntervals: [String]?,
         recurringStartDateType: String?,
         recurringStartDate: String?,
+        secureAuthentication: Bool,
+        showReceipt: Bool,
+        showTotal: Bool,
+        showSubmitButton: Bool,
         enable3DS: Bool,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
         // 1) Validate amount
-        guard let amountValue = Double(amount), amountValue > 0 else {
-            rejecter("INVALID_AMOUNT", "Amount must be a positive number", nil)
+        guard let amountValue = Double(amount), amountValue >= 0.50 else {
+            rejecter("INVALID_AMOUNT", "Amount must be at least $0.50", nil)
             return
         }
 
-        // 2) Validate billinginfo JSON
-        if let info = billinginfo {
-            guard info.data(using: .utf8)
-                    .flatMap({ try? JSONSerialization.jsonObject(with: $0) }) != nil
-            else {
-                rejecter("INVALID_BILLING_INFO", "Billing info must be valid JSON", nil)
+        // 2) Process billing info into FieldSection
+        var billingInfoData: Data? = nil
+        if let billingDict = billingInfo {
+            var billingFields: [FieldItem] = []
+            var additionalFields: [FieldItem] = []
+            var billingVisibility = true
+            var additionalVisibility = true
+
+            // Parse billing fields
+            if let billing = billingDict["billing"] as? [String: Any] {
+                for (key, value) in billing {
+                    guard let fieldValue = value as? String else { continue }
+                    let required = (billingDict["billingRequired"] as? [String: Bool])?[key] ?? false
+                    if let billingField = BillingFieldName(rawValue: key) {
+                        billingFields.append(FieldItem(name: billingField, required: required, value: fieldValue))
+                    }
+                }
+            }
+
+            // Parse additional fields
+            if let additional = billingDict["additional"] as? [String: Any] {
+                for (key, value) in additional {
+                    guard let fieldValue = value as? String else { continue }
+                    let required = (billingDict["additionalRequired"] as? [String: Bool])?[key] ?? false
+                    if let additionalField = AdditionalFieldName(rawValue: key) {
+                        additionalFields.append(FieldItem(name: additionalField, required: required, value: fieldValue))
+                    }
+                }
+            }
+
+            // Parse visibility
+            if let visibility = billingDict["visibility"] as? [String: Bool] {
+                billingVisibility = visibility["billing"] ?? true
+                additionalVisibility = visibility["additional"] ?? true
+            }
+
+            let fields = FieldSection(
+                visibility: FieldsVisibility(billing: billingVisibility, additional: additionalVisibility),
+                billing: billingFields,
+                additional: additionalFields
+            )
+
+            do {
+                billingInfoData = try JSONEncoder().encode(fields)
+            } catch {
+                rejecter("INVALID_BILLING_INFO", "Failed to encode billing info: \(error.localizedDescription)", nil)
                 return
             }
         }
@@ -88,6 +142,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             case "card":   return .Card
             case "bank":   return .Bank
             case "crypto": return .Crypto
+            case "wallet": return .Wallet
             default:       return nil
             }
         }
@@ -96,37 +151,39 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         var grailParams: GrailPayRequest? = nil
         if authenticatedACH, let params = grailPayParams {
             grailParams = GrailPayRequest(
-                accessToken:        params["accessToken"] as? String ?? "",
-                vendorId:           params["vendorId"]    as? String ?? "",
-                role:               params["role"]        as? String ?? "business",
-                timeout:            params["timeout"]     as? Int    ??  10,
-                isSandbox:          params["isSandbox"]   as? Bool   ??  true,
-                brandingName:       params["brandingName"]    as? String ?? "Payments",
-                finderSubtitle:     params["finderSubtitle"]  as? String ?? "Find your bank",
-                searchPlaceholder:  params["searchPlaceholder"] as? String ?? "Search"
+                accessToken: params["accessToken"] as? String ?? "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
+                vendorId: params["vendorId"] as? String ?? "251",
+                role: params["role"] as? String ?? "business",
+                timeout: params["timeout"] as? Int ?? 10,
+                isSandbox: params["isSandbox"] as? Bool ?? true,
+                brandingName: params["brandingName"] as? String ?? "Lyfecycle Payments",
+                finderSubtitle: params["finderSubtitle"] as? String ?? "Search for your bank",
+                searchPlaceholder: params["searchPlaceholder"] as? String ?? "Enter bank name"
             )
         }
 
         // 5) Build theme config
         let themeConfig = ThemeConfiguration(
-            bodyBackgroundColor:           themeConfiguration["bodyBackgroundColor"]           as? String ?? "#EBF8FF",
-            containerBackgroundColor:      themeConfiguration["containerBackgroundColor"]      as? String ?? "#FFFFFF",
-            primaryFontColor:              themeConfiguration["primaryFontColor"]              as? String ?? "#1E3A8A",
-            secondaryFontColor:            themeConfiguration["secondaryFontColor"]            as? String ?? "#696969",
-            primaryButtonBackgroundColor:  themeConfiguration["primaryButtonBackgroundColor"]  as? String ?? "#1D4ED8",
-            primaryButtonHoverColor:       themeConfiguration["primaryButtonHoverColor"]       as? String ?? "#2563EB",
-            primaryButtonFontColor:        themeConfiguration["primaryButtonFontColor"]        as? String ?? "#FFFFFF",
-            secondaryButtonBackgroundColor:themeConfiguration["secondaryButtonBackgroundColor"]as? String ?? "#FFFFFF",
-            secondaryButtonHoverColor:     themeConfiguration["secondaryButtonHoverColor"]     as? String ?? "#BFDBFE",
-            secondaryButtonFontColor:      themeConfiguration["secondaryButtonFontColor"]      as? String ?? "#1E40AF",
-            borderRadius:                  themeConfiguration["borderRadius"]                  as? String ?? "8",
-            fontSize:                      themeConfiguration["fontSize"]                      as? String ?? "14"
+            bodyBackgroundColor: themeConfiguration?["bodyBackgroundColor"] as? String ?? "#121212",
+            containerBackgroundColor: themeConfiguration?["containerBackgroundColor"] as? String ?? "#1E1E1E",
+            primaryFontColor: themeConfiguration?["primaryFontColor"] as? String ?? "#FFFFFF",
+            secondaryFontColor: themeConfiguration?["secondaryFontColor"] as? String ?? "#B0B0B0",
+            primaryButtonBackgroundColor: themeConfiguration?["primaryButtonBackgroundColor"] as? String ?? "#2563EB",
+            primaryButtonHoverColor: themeConfiguration?["primaryButtonHoverColor"] as? String ?? "#1D4ED8",
+            primaryButtonFontColor: themeConfiguration?["primaryButtonFontColor"] as? String ?? "#FFFFFF",
+            secondaryButtonBackgroundColor: themeConfiguration?["secondaryButtonBackgroundColor"] as? String ?? "#374151",
+            secondaryButtonHoverColor: themeConfiguration?["secondaryButtonHoverColor"] as? String ?? "#4B5563",
+            secondaryButtonFontColor: themeConfiguration?["secondaryButtonFontColor"] as? String ?? "#E5E7EB",
+            borderRadius: themeConfiguration?["borderRadius"] as? String ?? "8",
+            fontSize: themeConfiguration?["fontSize"] as? String ?? "14",
+            fontWeight: themeConfiguration?["fontWeight"] as? Int ?? 500,
+            fontFamily: themeConfiguration?["fontFamily"] as? String ?? "\"Inter\", sans-serif"
         )
 
-        // 6) Map recurring intervals (strip leading dots)
+        // 6) Map recurring intervals
         let intervals: [RecurringIntervals] = (recurringIntervals ?? []).compactMap { raw in
             let cleaned = raw.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-            let noDot   = cleaned.hasPrefix(".") ? String(cleaned.dropFirst()) : cleaned
+            let noDot = cleaned.hasPrefix(".") ? String(cleaned.dropFirst()) : cleaned
             return RecurringIntervals(rawValue: noDot)
         }
 
@@ -136,61 +193,114 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         }
 
         // 7) Map start date type
-        let startType: RecurringStartDateType = {
+        let startType: RecurringStartDateType? = {
             switch recurringStartDateType?.lowercased() {
             case "custom": return .custom
             case "fixed":  return .fixed
-            default:       return .custom
+            default:       return nil
             }
         }()
 
         // 8) Build the request object
         let request = Request(
-            amount:                 amountValue,
-            billingInfoData:        billinginfo?.data(using: .utf8) ?? Data(),
-            paymentMethods:         methods,
-            themeConfiguration:     themeConfig,
-            tokenOnly:              tokenOnly,
-            saveCard:               saveCard,
-            saveAccount:            saveAccount,
-            submitButtonText:       submitButtonText ?? "Submit",
-            authenticatedACH:       authenticatedACH,
-            grailPayParams:         grailParams,
-            is_recurring:           isRecurring,
-            recurringIntervals:     intervals,
+            amount: amountValue,
+            currency: currency ?? "usd",
+            billingInfoData: billingInfoData,
+            paymentMethods: methods.isEmpty ? [.Card, .Bank] : methods,
+            themeConfiguration: themeConfig,
+            tokenOnly: tokenOnly,
+            saveCard: saveCard,
+            saveAccount: saveAccount,
+            submitButtonText: submitButtonText ?? "Submit",
+            authenticatedACH: authenticatedACH,
+            grailPayParams: grailParams,
+            is_recurring: isRecurring,
+            recurringIntervals: intervals,
             recurringStartDateType: startType,
-            recurringStartDate:     recurringStartDate,
-            enable3DS:              enable3DS
+            recurringStartDate: recurringStartDate,
+            secureAuthentication: secureAuthentication,
+            showReceipt: showReceipt,
+            showTotal: showTotal,
+            showSubmitButton: showSubmitButton,
+            referenceID: enable3DS,
+            referenceToken: nil
         )
 
         // Store resolvers
         self.billingResolver = resolver
-        self.billingRejecter  = rejecter
+        self.billingRejecter = rejecter
 
-        // Present your EasyPayViewController
-        DispatchQueue.main.async {
-            let vc = EasyPayViewController(request: request, delegate: self)
-            if let host = self.viewController {
-                host.present(vc, animated: true, completion: nil)
-            } else if let root = UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController {
-                root.present(vc, animated: true, completion: nil)
-            } else {
-                rejecter("NO_VIEW_CONTROLLER", "Cannot find a view controller to present.", nil)
+        // Handle tokenOnly or present EasyPayViewController
+        if tokenOnly {
+            NotificationCenter.default.addObserver(
+                forName: NSNotification.Name("ClientTokenReceived"),
+                object: nil,
+                queue: .main
+            ) { [weak self] notification in
+                guard let self = self else { return }
+                if let clientToken = notification.object as? String {
+                    self.billingResolver?(["status": "success", "clientToken": clientToken])
+                } else {
+                    self.billingRejecter?("TOKEN_ERROR", "Failed to receive client token.", nil)
+                }
                 self.clearResolvers()
             }
+        } else {
+            DispatchQueue.main.async {
+                let vc = EasyPayViewController(request: request, delegate: self)
+                if let host = self.viewController {
+                    host.present(vc, animated: true, completion: nil)
+                } else if let root = UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController {
+                    root.present(vc, animated: true, completion: nil)
+                } else {
+                    rejecter("NO_VIEW_CONTROLLER", "Cannot find a view controller to present.", nil)
+                    self.clearResolvers()
+                }
+            }
         }
     }
 
-    // MARK: - Environment Config & Platform
-    @objc public func configureEnvironment(_ env: String, apiKey: String, apiSecret: String) {
-        switch env.lowercased() {
-        case "production": EnvironmentConfig.setEnvironment(.production)
-        case "sandbox":    EnvironmentConfig.setEnvironment(.sandbox)
-        default:           EnvironmentConfig.setEnvironment(.staging)
+    // MARK: - paymentReference(...) Exposed to RN
+    @objc public func paymentReference(
+        _ referenceToken: String,
+        resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        // Validate reference token
+        guard !referenceToken.isEmpty else {
+            rejecter("INVALID_REFERENCE_TOKEN", "Reference token cannot be empty.", nil)
+            return
+        }
+
+        // Store resolvers
+        self.paymentReferenceResolver = resolver
+        self.paymentReferenceRejecter = rejecter
+
+        // Build the request object
+        let request = Request(
+            referenceID: true,
+            referenceToken: referenceToken
+        )
+
+        // Set up notification observer for ReferenceIDResponse
+        DispatchQueue.main.async {
+            NotificationCenter.default.addObserver(
+                forName: NSNotification.Name("ReferenceIDResponse"),
+                object: nil,
+                queue: .main
+            ) { [weak self] notification in
+                guard let self = self else { return }
+                if let data = notification.object as? [String: Any] {
+                    self.paymentReferenceResolver?(data)
+                } else {
+                    self.paymentReferenceRejecter?("INVALID_RESPONSE", "Invalid response data.", nil)
+                }
+                self.clearReferenceResolvers()
+            }
         }
-        EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
     }
 
+    // MARK: - getPlatformVersion(...) Exposed to RN
     @objc public func getPlatformVersion(
         _ resolver: RCTPromiseResolveBlock,
         rejecter: RCTPromiseRejectBlock
@@ -198,9 +308,16 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         resolver("iOS \(UIDevice.current.systemVersion)")
     }
 
+    // MARK: - Private Helpers
     private func clearResolvers() {
         billingResolver = nil
-        billingRejecter  = nil
+        billingRejecter = nil
+    }
+
+    private func clearReferenceResolvers() {
+        paymentReferenceResolver = nil
+        paymentReferenceRejecter = nil
+        NotificationCenter.default.removeObserver(self, name: NSNotification.Name("ReferenceIDResponse"), object: nil)
     }
 }
 
@@ -213,13 +330,19 @@ extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
                 self.billingResolver?(["status": "cancelled", "message": "User cancelled"])
 
             case .success:
-                // Build a single payload for RN
                 var payload: [String: Any] = ["status": "success"]
-                if let cd = result.chargeData    { payload["chargeData"]    = cd    }
-                if let bi = result.billingInfo   { payload["billingInfo"]   = bi   }
-                if let ai = result.additionalInfo{ payload["additionalInfo"] = ai   }
+                if let cd = result.chargeData { payload["chargeData"] = cd }
+                if let bi = result.billingInfo { payload["billingInfo"] = bi }
+                if let ai = result.additionalInfo { payload["additionalInfo"] = ai }
+
+                // Extract referenceToken for 3DS
+                if let additional = result.additionalInfo,
+                   let threeDSecureStatus = additional["threeDSecureStatus"] as? [String: Any],
+                   let data = threeDSecureStatus["data"] as? [String: Any],
+                   let token = data["ref_token"] as? String {
+                    payload["referenceToken"] = token
+                }
 
-                // Resolve promise
                 self.billingResolver?(payload)
 
             case .error:
@@ -227,7 +350,6 @@ extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
                 self.billingRejecter?("PAYMENT_ERROR", errMsg, nil)
             }
 
-            // Cleanup & dismiss
             self.clearResolvers()
             controller.dismiss(animated: true, completion: nil)
         }

package/ios/Classes/EasyPayViewController.swift

@@ -63,7 +63,7 @@ public final class EasyPayViewController: UINavigationController {
         let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "PaymentInfoVC") as! PaymentInfoVC
         vc.modalPresentationStyle = .overFullScreen
         vc.configureWith(request: request, delegate: easyPayDelegate)
-        vc.amount = Int(request.amount) // Set the amount here
+        vc.amount = Int(request.amount ?? 0.0) // Set the amount here
         self.navigationBar.isHidden = true
         self.setViewControllers([vc], animated: false)
     }

package/ios/CustomComponents/DatePickerHandler.swift

@@ -19,12 +19,14 @@ class DatePickerHandler: NSObject {
         
         self.targetTextField = textField
         configureDatePicker()
+        setupInputView(for: textField)
         
         if let date = initialDate {
             datePicker.date = date
         }
         
-        setupInputView(for: textField)
+        // Add observer for when the user taps the textField
+        textField.addTarget(self, action: #selector(textFieldEditingDidBegin), for: .editingDidBegin)
     }
     
     private func configureDatePicker() {
@@ -32,7 +34,7 @@ class DatePickerHandler: NSObject {
             datePicker.preferredDatePickerStyle = .inline
         }
         datePicker.datePickerMode = .date
-        datePicker.minimumDate = Date()
+        datePicker.minimumDate = Calendar.current.startOfDay(for: Date())
         datePicker.addTarget(self, action: #selector(dateChanged(_:)), for: .valueChanged)
     }
     
@@ -49,6 +51,17 @@ class DatePickerHandler: NSObject {
         textField.inputAccessoryView = toolbar
     }
     
+    @objc private func textFieldEditingDidBegin() {
+        // When the textField is tapped, if it has a date, set it back on the date picker
+        if let text = targetTextField?.text, !text.isEmpty {
+            let formatter = DateFormatter()
+            formatter.dateFormat = "dd/MM/yyyy"
+            if let selectedDate = formatter.date(from: text) {
+                datePicker.setDate(selectedDate, animated: true)
+            }
+        }
+    }
+    
     @objc private func dateChanged(_ sender: UIDatePicker) {
         let formatter = DateFormatter()
         formatter.dateFormat = "dd/MM/yyyy"
@@ -66,6 +79,4 @@ class DatePickerHandler: NSObject {
         }
         targetTextField?.resignFirstResponder()
     }
-    
 }
-

package/ios/EnvironmentConfig.swift

@@ -39,34 +39,36 @@ public class EnvironmentConfig {
         self.currentEnvironment = environment
     }
     
-   public enum Endpoints {
-           case paymentIntent
-           case hostedCheckouts
-           case emailVerification
-           case verifyOtp
-           case getCards
-           case creditCharges
-           case account
-           case achCharge
-           case charges
-           case accountConnect
-           case threeDSecure
-
-           func path() -> String {
-               switch self {
-               case .paymentIntent: return "/api/v1/paymentintent"
-               case .hostedCheckouts: return "/api/v1/hostedcheckouts"
-               case .emailVerification: return "/api/v1/customer/send_otp"
-               case .verifyOtp: return "/api/v1/customer/verify_otp"
-                   // case .getCards: return "/api/v1/customer/card"
-               case .getCards: return "/api/v1/card"
-               case .creditCharges: return "/api/v1/customer/charges"
-               case .account: return "/api/v1/ach/account"
-               case .achCharge: return "/api/v1/ach/charge"
-               case .charges: return "/api/v1/charges"
-               case .accountConnect: return "/api/v1/ach/account/connect"
-               case .threeDSecure: return "/api/v1/3dsecure"
-               }
-           }
-       }
+    public enum Endpoints {
+        case paymentIntent
+        case hostedCheckouts
+        case emailVerification
+        case verifyOtp
+        case getCards
+        case creditCharges
+        case account
+        case achCharge
+        case charges
+        case accountConnect
+        case threeDSecure
+        case threeDSecureStatus(String)
+        
+        func path() -> String {
+            switch self {
+            case .paymentIntent: return "/api/v1/paymentintent"
+            case .hostedCheckouts: return "/api/v1/hostedcheckouts"
+            case .emailVerification: return "/api/v1/customer/send_otp"
+            case .verifyOtp: return "/api/v1/customer/verify_otp"
+            // case .getCards: return "/api/v1/customer/card"
+            case .getCards: return "/api/v1/card"
+            case .creditCharges: return "/api/v1/customer/charges"
+            case .account: return "/api/v1/ach/account"
+            case .achCharge: return "/api/v1/ach/charge"
+            case .charges: return "/api/v1/charges"
+            case .accountConnect: return "/api/v1/ach/account/connect"
+            case .threeDSecure: return "/api/v1/3dsecure"
+            case .threeDSecureStatus(let token): return "/api/v1/3dsecure/\(token)/status"
+            }
+        }
+    }
 }