@jimrising/easymerchantsdk-react-native 2.3.3 → 2.3.5

package/ios/Models/Request.swift

@@ -291,11 +291,11 @@ public final class Request: NSObject {
         super.init()
       
         // Environment must be set by host app
-//        if EnvironmentConfig.isEnvironmentSet == false {
-//            self.initializationErrorMessage = "environment not set"
-//            Request.notifyValidationError(self.initializationErrorMessage!)
-//            return
-//        }
+        if EnvironmentConfig.isEnvironmentSet == false {
+            self.initializationErrorMessage = "environment not set"
+            Request.notifyValidationError(self.initializationErrorMessage!)
+            return
+        }
         
         // ✅ Override amount if clientToken flow is used
         if let token = clientToken, !token.isEmpty {
@@ -347,11 +347,14 @@ public final class Request: NSObject {
             return
         }
         
-        // ✅ Use recurring details from HostedCheckout API only if clientToken is present
+        // 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" { // API returns "1" for true
+               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) {
@@ -359,7 +362,6 @@ public final class Request: NSObject {
                 }
                 
                 if let intervals = UserStoreSingleton.shared.interval {
-                    // API gives "daily,weekly,monthly" → split into array
                     let parts = intervals.split(separator: ",").map { String($0).trimmingCharacters(in: .whitespaces) }
                     self.recurringIntervals = parts.compactMap { RecurringIntervals(rawValue: $0) }
                 }
@@ -374,23 +376,29 @@ public final class Request: NSObject {
             } 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)")
         }
-        
-        // 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."
+
+        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
+                }
+            } 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
@@ -476,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
@@ -512,6 +520,136 @@ public final class Request: NSObject {
     }
     
     //MARK: - Payment Intent Api
+//    func paymentIntentApi(completion: @escaping (Bool) -> Void) {
+//        guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
+//            Request.notifyValidationError("Invalid payment URL.")
+//            print("Invalid payment URL for Payment Intent API")
+//            completion(false)
+//            return
+//        }
+//        
+//        var request = URLRequest(url: serviceURL)
+//        request.httpMethod = "POST"
+//        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+//        request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
+//        request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
+//        
+//        // Recurring date validation
+//        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 {
+//                Request.notifyValidationError("The recurring start date cannot be in the past. Please select today or a future date.")
+//                print("Recurring start date validation failed")
+//                completion(false)
+//                return
+//            }
+//        } else if recurringStartDate != nil {
+//            Request.notifyValidationError("Recurring date format should be dd/MM/yyyy")
+//            print("Invalid recurring date format")
+//            completion(false)
+//            return
+//        }
+//        
+//        let params: [String: Any] = [
+//            "amount": ((amount ?? 0) * 100).rounded() / 100,
+//            "allowed_cycles": numOfCycle ?? 0,
+//            "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
+//            "is_recurring": self.is_recurring ?? false,
+//            "recurring_start_date": recurringStartDate ?? "",
+//            "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
+//        ]
+//        
+//        print("Payment Intent API Request Params: \(params)")
+//        
+//        do {
+//            request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+//        } catch {
+//            Request.notifyValidationError("Failed to encode Payment Intent API data: \(error.localizedDescription)")
+//            print("Error encoding Payment Intent API data: \(error)")
+//            completion(false)
+//            return
+//        }
+//        
+//        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+//            if let error = error {
+//                Request.notifyValidationError("Payment Intent API error: \(error.localizedDescription)")
+//                print("Payment Intent API error: \(error)")
+//                completion(false)
+//                return
+//            }
+//            
+//            guard let httpResponse = response as? HTTPURLResponse else {
+//                Request.notifyValidationError("Invalid response from Payment Intent API")
+//                print("Invalid response from Payment Intent API")
+//                completion(false)
+//                return
+//            }
+//            
+//            print("Payment Intent API Response Status Code: \(httpResponse.statusCode)")
+//            
+//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+//                if let data = data {
+//                    do {
+//                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+//                            print("Payment Intent API Response: \(responseObject)")
+//                            if let clientToken = responseObject["client_token"] as? String {
+//                                UserStoreSingleton.shared.clientToken = clientToken
+//                                print("Received clientToken: \(clientToken)")
+//                            } else {
+//                                Request.notifyValidationError("No client_token in Payment Intent API response")
+//                                print("No client_token in Payment Intent API response")
+//                                completion(false)
+//                                return
+//                            }
+//                            if let paymentIntent = responseObject["payment_intent"] as? String {
+//                                UserStoreSingleton.shared.paymentIntent = paymentIntent
+//                                print("Received paymentIntent: \(paymentIntent)")
+//                            }
+//                            self.hostedCheckoutsApi { success in
+//                                completion(success)
+//                            }
+//                            return
+//                        } else {
+//                            Request.notifyValidationError("Invalid response format from Payment Intent API")
+//                            print("Invalid response format from Payment Intent API")
+//                            completion(false)
+//                        }
+//                    } catch {
+//                        Request.notifyValidationError("Failed to parse Payment Intent API response: \(error.localizedDescription)")
+//                        print("Error parsing Payment Intent API response: \(error)")
+//                        completion(false)
+//                    }
+//                } else {
+//                    Request.notifyValidationError("No response data received from Payment Intent API")
+//                    print("No response data received from Payment Intent API")
+//                    completion(false)
+//                }
+//            } else {
+//                // Default error message
+//                var message = "Payment Intent API failed with status code: \(httpResponse.statusCode)"
+//                
+//                if let data = data,
+//                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+//                    
+//                    // Prefer the "message" key from API response
+//                    if let msg = responseObj["message"] as? String, !msg.isEmpty {
+//                        message = "Payment Intent API error: \(msg)"
+//                    }
+//                }
+//                
+//                // Send back the exact server error
+//                Request.notifyValidationError(message)
+//                print(message)
+//                completion(false)
+//            }
+//        }
+//        task.resume()
+//    }
+    
+    // MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
             Request.notifyValidationError("Invalid payment URL.")
@@ -527,8 +665,10 @@ public final class Request: NSObject {
         request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
         
         // Recurring date validation
+        var apiStartDate = ""
         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)
             
@@ -538,6 +678,12 @@ public final class Request: NSObject {
                 completion(false)
                 return
             }
+            
+            // ✅ Convert dd/MM/yyyy -> MM/dd/yyyy for API
+            let apiFormatter = DateFormatter()
+            apiFormatter.dateFormat = "MM/dd/yyyy"
+            apiStartDate = apiFormatter.string(from: startDate)
+            
         } else if recurringStartDate != nil {
             Request.notifyValidationError("Recurring date format should be dd/MM/yyyy")
             print("Invalid recurring date format")
@@ -550,7 +696,7 @@ public final class Request: NSObject {
             "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
-            "recurring_start_date": recurringStartDate ?? "",
+            "recurring_start_date": apiStartDate,  // ✅ Correct format for API
             "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
         ]
         
@@ -587,6 +733,7 @@ public final class Request: NSObject {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Payment Intent API Response: \(responseObject)")
+                            
                             if let clientToken = responseObject["client_token"] as? String {
                                 UserStoreSingleton.shared.clientToken = clientToken
                                 print("Received clientToken: \(clientToken)")
@@ -596,10 +743,12 @@ public final class Request: NSObject {
                                 completion(false)
                                 return
                             }
+                            
                             if let paymentIntent = responseObject["payment_intent"] as? String {
                                 UserStoreSingleton.shared.paymentIntent = paymentIntent
                                 print("Received paymentIntent: \(paymentIntent)")
                             }
+                            
                             self.hostedCheckoutsApi { success in
                                 completion(success)
                             }
@@ -620,14 +769,17 @@ public final class Request: NSObject {
                     completion(false)
                 }
             } else {
+                // Default error message
                 var message = "Payment Intent API failed with status code: \(httpResponse.statusCode)"
+                
                 if let data = data,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let msg = responseObj["message"] as? String, !msg.isEmpty {
-                    message = msg
+                    message = "Payment Intent API error: \(msg)"
                 }
+                
                 Request.notifyValidationError(message)
-                print("Payment Intent API error: \(message)")
+                print(message)
                 completion(false)
             }
         }
@@ -648,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
@@ -707,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
@@ -790,7 +965,11 @@ public final class Request: NSObject {
                                 if let isRecurring = recurringDetails["is_recurring"] {
                                     UserStoreSingleton.shared.isRecurring = "\(isRecurring)"
                                     print("Saved is_recurring: \(isRecurring)")
+                                    self.is_recurring = (UserStoreSingleton.shared.isRecurring == "1")
+                                } else {
+                                    self.is_recurring = false
                                 }
+
                                 if let paymentIntentId = recurringDetails["payment_intent_id"] {
                                     UserStoreSingleton.shared.paymentIntentId = "\(paymentIntentId)"
                                     print("Saved payment_intent_id: \(paymentIntentId)")
@@ -803,8 +982,11 @@ public final class Request: NSObject {
                                     UserStoreSingleton.shared.startDateType = "\(startDateType)"
                                     print("Saved start_date_type: \(startDateType)")
                                 }
+                            } else {
+                                self.is_recurring = false
+                                UserStoreSingleton.shared.isRecurring = "0"
                             }
-                            
+
                             if self.appearanceSettings == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
                                 UserStoreSingleton.shared.body_bg_col = appearanceSettings["body_bg_col"] as? String
                                 UserStoreSingleton.shared.border_radious = appearanceSettings["border_radious"] as? String
@@ -920,6 +1102,15 @@ extension DateFormatter {
     }()
 }
 
+//extension DateFormatter {
+//    static let recurringDateFormatter: DateFormatter = {
+//        let formatter = DateFormatter()
+//        formatter.dateFormat = "MM/dd/yyyy"
+//        formatter.timeZone = .current
+//        return formatter
+//    }()
+//}
+
 
 
 //extension UIApplication {

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")
+//    }
+//}
+//
+//