@jimrising/easymerchantsdk-react-native 2.3.4 → 2.3.5

package/ios/Models/Request.swift

@@ -347,56 +347,58 @@ public final class Request: NSObject {
             return
         }
         
-        // ✅ Handle recurring setup differently for API keys vs clientToken flow
-                if let token = clientToken, !token.isEmpty {
-                    // --- Client Token Flow ---
-                    if let savedIsRecurring = UserStoreSingleton.shared.isRecurring,
-                       savedIsRecurring == "1" {
-
-                        self.is_recurring = true
-                        print("Recurring enabled (clientToken flow) → is_recurring = \(self.is_recurring ?? false)")
-
-                        if let cycles = UserStoreSingleton.shared.allowCycles,
-                           let num = Int(cycles) {
-                            self.numOfCycle = num
-                        }
-
-                        if let intervals = UserStoreSingleton.shared.interval {
-                            let parts = intervals.split(separator: ",").map { String($0).trimmingCharacters(in: .whitespaces) }
-                            self.recurringIntervals = parts.compactMap { RecurringIntervals(rawValue: $0) }
-                        }
-
-                        if let startType = UserStoreSingleton.shared.startDateType {
-                            self.recurringStartDateType = RecurringStartDateType(rawValue: startType)
-                        }
+        // Handle recurring setup differently for API keys vs clientToken flow
+        if let token = clientToken, !token.isEmpty {
+            // --- Client Token Flow ---
+            if let savedIsRecurring = UserStoreSingleton.shared.isRecurring,
+               savedIsRecurring == "1" {
+                
+                self.is_recurring = true
+                print("Recurring enabled (clientToken flow) → is_recurring = \(self.is_recurring ?? false)")
+                
+                if let cycles = UserStoreSingleton.shared.allowCycles,
+                   let num = Int(cycles) {
+                    self.numOfCycle = num
+                }
+                
+                if let intervals = UserStoreSingleton.shared.interval {
+                    let parts = intervals.split(separator: ",").map { String($0).trimmingCharacters(in: .whitespaces) }
+                    self.recurringIntervals = parts.compactMap { RecurringIntervals(rawValue: $0) }
+                }
+                
+                if let startType = UserStoreSingleton.shared.startDateType {
+                    self.recurringStartDateType = RecurringStartDateType(rawValue: startType)
+                }
+                
+                if let startDate = UserStoreSingleton.shared.startDate {
+                    self.recurringStartDate = startDate
+                }
+            } else {
+                self.is_recurring = false
+            }
+        } else {
+            // --- API Keys Flow ---
+            // Keep whatever was passed from outside (don’t override)
+            print("Recurring setup (API keys flow) → is_recurring = \(self.is_recurring ?? false)")
+        }
 
-                        if let startDate = UserStoreSingleton.shared.startDate {
-                            self.recurringStartDate = startDate
-                        }
-                    } else {
-                        self.is_recurring = false
-                    }
-                } else {
-                    // --- API Keys Flow ---
-                    // Keep whatever was passed from outside (don’t override)
-                    print("Recurring setup (API keys flow) → is_recurring = \(self.is_recurring ?? false)")
+        if is_recurring == true {
+            // Validate recurring start date not in past
+            if let startDateString = recurringStartDate,
+               let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
+                let today = Calendar.current.startOfDay(for: Date())
+                let startDay = Calendar.current.startOfDay(for: startDate)
+                if startDay < today {
+                    self.initializationErrorMessage = "The recurring start date cannot be in the past. Please select today or a future date."
+                    Request.notifyValidationError(self.initializationErrorMessage!)
+                    return
                 }
-        
-        // Validate recurring start date not in past
-        if let startDateString = recurringStartDate,
-           let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
-            let today = Calendar.current.startOfDay(for: Date())
-            let startDay = Calendar.current.startOfDay(for: startDate)
-            if startDay < today {
-                self.initializationErrorMessage = "The recurring start date cannot be in the past. Please select today or a future date."
+            } else if recurringStartDate != nil {
+                // Provided but invalid format
+                self.initializationErrorMessage = "Recurring date format should be dd/MM/yyyy"
                 Request.notifyValidationError(self.initializationErrorMessage!)
                 return
             }
-        } else if recurringStartDate != nil {
-            // Provided but invalid format
-            self.initializationErrorMessage = "Recurring date format should be dd/MM/yyyy"
-            Request.notifyValidationError(self.initializationErrorMessage!)
-            return
         }
         
         // Validate metadata limits
@@ -482,31 +484,31 @@ public final class Request: NSObject {
                 }
             }
         }
-        else {
-            if clientToken == nil {
-                // Proceed with normal payment flow for API key/secret case
-                self.paymentIntentApi { success in
-                    if success {
-                        print("Payment Intent API call succeeded")
-                        UserStoreSingleton.shared.price = String(self.amount ?? 0)
-                        print("Saved amount: \(UserStoreSingleton.shared.price ?? "No amount")")
-                    } else {
-                        print("Payment Intent API call failed")
-                    }
-                }
-            } else {
-                // For clientToken case, directly call hostedCheckoutsApi
-                UserStoreSingleton.shared.clientToken = clientToken
-                self.hostedCheckoutsApi { success in
-                    if success {
-                        print("Hosted Checkout API call succeeded")
-                        UserStoreSingleton.shared.price = String(self.amount ?? 0)
-                    } else {
-                        print("Hosted Checkout API call failed")
-                    }
-                }
-            }
-        }
+//        else {
+//            if clientToken == nil {
+//                // Proceed with normal payment flow for API key/secret case
+//                self.paymentIntentApi { success in
+//                    if success {
+//                        print("Payment Intent API call succeeded")
+//                        UserStoreSingleton.shared.price = String(self.amount ?? 0)
+//                        print("Saved amount: \(UserStoreSingleton.shared.price ?? "No amount")")
+//                    } else {
+//                        print("Payment Intent API call failed")
+//                    }
+//                }
+//            } else {
+//                // For clientToken case, directly call hostedCheckoutsApi
+//                UserStoreSingleton.shared.clientToken = clientToken
+//                self.hostedCheckoutsApi { success in
+//                    if success {
+//                        print("Hosted Checkout API call succeeded")
+//                        UserStoreSingleton.shared.price = String(self.amount ?? 0)
+//                    } else {
+//                        print("Hosted Checkout API call failed")
+//                    }
+//                }
+//            }
+//        }
         
         if referenceID == true {
             fetchReferenceData { response in
@@ -798,11 +800,22 @@ public final class Request: NSObject {
                 "status": false,
                 "message": message
             ]
-            let result = SDKResult(type: .error, chargeData: chargeData, billingInfo: nil, additionalInfo: nil)
+            let result = SDKResult(type: .error, data: chargeData as NSDictionary)
             NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
         }
     }
     
+    // MARK: - Clear cached values on token change
+       private func clearCachedValues() {
+           UserStoreSingleton.shared.amount = nil
+           UserStoreSingleton.shared.price = nil
+           UserStoreSingleton.shared.isRecurring = nil
+           UserStoreSingleton.shared.allowCycles = nil
+           UserStoreSingleton.shared.interval = nil
+           UserStoreSingleton.shared.startDateType = nil
+           UserStoreSingleton.shared.startDate = nil
+       }
+    
     // MARK: - Hosted Checkout API
     func hostedCheckoutsApi(completion: @escaping (Bool) -> Void) {
         // Build the URL using EnvironmentConfig
@@ -857,6 +870,18 @@ public final class Request: NSObject {
                            let dataObject = responseObject["data"] as? [String: Any] {
                             print("Hosted Checkout API Response: \(dataObject)")
                             
+                            if let paymentAmount = dataObject["payment_intent_amount"] as? Double {
+                                // ✅ Update Request + Singleton with fresh value
+                                self.amount = paymentAmount
+                                UserStoreSingleton.shared.amount = String(paymentAmount)
+                                UserStoreSingleton.shared.price = String(paymentAmount)
+                            }
+                            
+                            if let recurring = dataObject["is_recurring"] as? Bool {
+                                self.is_recurring = recurring
+                                UserStoreSingleton.shared.isRecurring = recurring ? "1" : "0"
+                            }
+                            
                             // Persist the exact token used for the request (header value),
                             // not self.clientToken which may be nil on first-run flows.
                             UserStoreSingleton.shared.clientToken = token

package/ios/Models/SDKResult.swift

@@ -6,46 +6,53 @@
 //
 
 import UIKit
-
+ 
 @objc
 public enum ResultType: Int {
     case cancelled
     case success
     case error
 }
-
+ 
 @objc
 public final class SDKResult: NSObject {
     
     @objc public let type: ResultType
-    @objc public let error: NSError?
-    @objc public let chargeData: [String: Any]?
+    @objc public let data: NSDictionary?
     
-    @objc public let billingInfo: [String: Any]?
-    @objc public let additionalInfo: [String: Any]?
+    // Computed properties for backward compatibility
+    @objc public var chargeData: [String: Any]? {
+        guard let data = data as? [String: Any] else { return nil }
+        
+        // Extract everything except billingInfo and additionalInfo as chargeData
+        var chargeData: [String: Any] = [:]
+        for (key, value) in data {
+            if key != "billingInfo" && key != "additionalInfo" {
+                chargeData[key] = value
+            }
+        }
+        return chargeData.isEmpty ? nil : chargeData
+    }
     
-    // Initializer for error type result
-    internal init(error: NSError) {
-        self.type = .error
-        self.error = error
-        self.chargeData = nil
-        self.billingInfo = nil
-        self.additionalInfo = nil
-        super.init()
+    @objc public var billingInfo: [String: Any]? {
+        return data?["billingInfo"] as? [String: Any]
+    }
+    
+    @objc public var additionalInfo: [String: Any]? {
+        return data?["additionalInfo"] as? [String: Any]
+    }
+    
+    @objc public var error: NSError? {
+        // For backward compatibility, create NSError from data if type is error
+        guard type == .error, let data = data as? [String: Any] else { return nil }
+        let message = data["message"] as? String ?? "Unknown error"
+        return NSError(domain: "SDKResult", code: 0, userInfo: [NSLocalizedDescriptionKey: message])
     }
     
-    // Initializer for success/cancelled result types
-    internal init(type: ResultType,
-                  chargeData: [String: Any]? = nil,
-                  billingInfo: [String: Any]? = nil,
-                  additionalInfo: [String: Any]? = nil) {
+    // Initializer for all result types
+    internal init(type: ResultType, data: NSDictionary? = nil) {
         self.type = type
-        self.error = nil
-        self.chargeData = chargeData
-        self.billingInfo = billingInfo
-        self.additionalInfo = additionalInfo
+        self.data = data
         super.init()
     }
 }
-
-

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -320,8 +320,7 @@ class UserStoreSingleton: NSObject {
             "payment_methods",
             "bank_widget_key",
             "vendor_id",
-            
-//            "amount",
+//            "amount"
 //            "allowCycles",
 //            "interval",
 //            "isRecurring",
@@ -348,61 +347,61 @@ class UserStoreSingleton: NSObject {
     
 }
 
-var amount : String? {
-    get {
-        return (UserDefaults().object(forKey: "amount") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "amount")
-    }
-}
-
-//Recurring params
-var allowCycles : String? {
-    get {
-        return (UserDefaults().object(forKey: "allowCycles") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "allowCycles")
-    }
-}
-
-var interval : String? {
-    get {
-        return (UserDefaults().object(forKey: "interval") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "interval")
-    }
-}
-
-var isRecurring : String? {
-    get {
-        return (UserDefaults().object(forKey: "isRecurring") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "isRecurring")
-    }
-}
-
-var startDate : String? {
-    get {
-        return (UserDefaults().object(forKey: "startDate") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "startDate")
-    }
-}
-
-var startDateType : String? {
-    get {
-        return (UserDefaults().object(forKey: "startDateType") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "startDateType")
-    }
-}
-
-var paymentIntentId : String? {
-    get {
-        return (UserDefaults().object(forKey: "paymentIntentId") as? String)
-    } set {
-        UserDefaults.standard.setValue(newValue, forKey: "paymentIntentId")
-    }
-}
-
-
+//var amount : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "amount") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "amount")
+//    }
+//}
+//
+////Recurring params
+//var allowCycles : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "allowCycles") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "allowCycles")
+//    }
+//}
+//
+//var interval : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "interval") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "interval")
+//    }
+//}
+//
+//var isRecurring : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "isRecurring") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "isRecurring")
+//    }
+//}
+//
+//var startDate : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "startDate") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "startDate")
+//    }
+//}
+//
+//var startDateType : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "startDateType") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "startDateType")
+//    }
+//}
+//
+//var paymentIntentId : String? {
+//    get {
+//        return (UserDefaults().object(forKey: "paymentIntentId") as? String)
+//    } set {
+//        UserDefaults.standard.setValue(newValue, forKey: "paymentIntentId")
+//    }
+//}
+//
+//