@jimrising/easymerchantsdk-react-native 2.3.3 → 2.3.4

package/README.md

@@ -19,7 +19,7 @@ Add the EasyMerchant SDK to your `package.json` under `dependencies`:
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^2.3.3"
+  "@jimrising/easymerchantsdk-react-native": "^2.3.4"
 }
 ```
 

package/android/build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.6.0.15'
+    implementation 'com.app:paysdk:1.6.0.16'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"

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,34 +347,40 @@ public final class Request: NSObject {
             return
         }
         
-        // ✅ Use recurring details from HostedCheckout API only if clientToken is present
-        if let token = clientToken, !token.isEmpty {
-            if let savedIsRecurring = UserStoreSingleton.shared.isRecurring,
-               savedIsRecurring == "1" { // API returns "1" for true
-                self.is_recurring = true
-                
-                if let cycles = UserStoreSingleton.shared.allowCycles,
-                   let num = Int(cycles) {
-                    self.numOfCycle = num
-                }
-                
-                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) }
-                }
-                
-                if let startType = UserStoreSingleton.shared.startDateType {
-                    self.recurringStartDateType = RecurringStartDateType(rawValue: startType)
-                }
-                
-                if let startDate = UserStoreSingleton.shared.startDate {
-                    self.recurringStartDate = startDate
+        // ✅ 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)")
                 }
-            } else {
-                self.is_recurring = false
-            }
-        }
         
         // Validate recurring start date not in past
         if let startDateString = recurringStartDate,
@@ -512,6 +518,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 +663,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 +676,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 +694,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 +731,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 +741,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 +767,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)
             }
         }
@@ -790,7 +940,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 +957,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 +1077,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/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '2.3.3'
+  s.version          = '2.3.4'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "",
   "main": "index.js",
   "scripts": {