@jimrising/easymerchantsdk-react-native 1.3.2 → 1.3.4

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -55,6 +55,11 @@ class OTPVerificationVC: BaseVC {
     private var timeRemaining = 180 // 3 minutes
     private var timer: Timer?
     
+    //GrailPay Params
+    var grailPayAccountID: String?
+    var selectedGrailPayAccountType: String?
+    var selectedGrailPayAccountName: String?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -215,18 +220,6 @@ class OTPVerificationVC: BaseVC {
     func otpVerificationApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/customer/verify_otp"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.verifyOtp.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -243,6 +236,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "card_search_value": email ?? "",
             "card_search_key": "email",
@@ -322,6 +322,17 @@ class OTPVerificationVC: BaseVC {
                                 }
                                 
                             }
+                            else if self.selectedPaymentMethod == "GrailPay" {
+                                if let dataSection = responseObject["data"] as? [String: Any],
+                                   let innerData = dataSection["data"] as? [String: Any],
+                                   let customerId = innerData["customer_id"] as? String {
+                                    print("Extracted customer_id: \(customerId)")
+                                    self.grailPayAccountChargeApi(customerId: customerId)
+                                } else {
+                                    print("customer_id not found. Sending empty customerId.")
+                                    self.grailPayAccountChargeApi(customerId: nil)
+                                }
+                            }
                         } else {
                             print("Invalid JSON format")
                         }
@@ -341,18 +352,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Send OTP Email Verification Api
     func emailVerificationApi() {
         showLoadingIndicator()
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/customer/send_otp"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+       
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -369,6 +369,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "card_search_value": email ?? "",
             "card_search_key": "email"
@@ -428,19 +435,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Card Charge Api
     func paymentIntentApi(customerId: String?) {
         showLoadingIndicator()
-        
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+       
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -457,6 +452,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
@@ -566,7 +568,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -576,18 +584,6 @@ class OTPVerificationVC: BaseVC {
     func paymentIntentWithSavedCardApi(customerId: String?) {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -604,6 +600,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let emailPrefix = email?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
@@ -689,7 +692,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -708,19 +717,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Account Charge Api
     func accountChargeApi(customerId: String?) {
         showLoadingIndicator()
-        
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/ach/charge"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+       
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -737,6 +734,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
@@ -845,7 +849,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -854,19 +864,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Account Charge Api if billing info is nil and saved account
     func accountChargeWithSavedAccountApi(customerId: String?) {
         showLoadingIndicator()
-        
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/ach/charge"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+       
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -883,6 +881,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let emailPrefix = email?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
@@ -967,7 +972,123 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - GrailPay Account Charge Api if user saved account
+    func grailPayAccountChargeApi(customerId: String?) {
+        showLoadingIndicator()
+       
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        let params: [String: Any] = [
+            "account_id": self.grailPayAccountID ?? "",
+            "account_type": self.selectedGrailPayAccountType ?? "",
+            "name": self.selectedGrailPayAccountName ?? "",
+            "description": "payment checkout",
+            "save_account": 1,
+            "is_default": 1,
+            "customer_id": customerId ?? ""
+        ]
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -18,7 +18,10 @@ class PaymentDoneVC: UIViewController {
     @IBOutlet weak var lblHeadingDate: UILabel!
     @IBOutlet weak var lblHeadingTransactionID: UILabel!
     @IBOutlet weak var lbHeadingPaymentMethod: UILabel!
-    @IBOutlet weak var lblHeadingTotal: UILabel!    
+    @IBOutlet weak var lblHeadingTotal: UILabel!
+    
+    @IBOutlet weak var viewSubscriptionId: UIStackView!
+    @IBOutlet weak var lblSubscriptionId: UILabel!
     
     var chargeData: [String: Any]?
     var selectedPaymentMethod: String?