@jimrising/easymerchantsdk-react-native 1.4.2 → 1.4.4

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -72,8 +72,13 @@ class OTPVerificationVC: BaseVC {
     var billingInfo: [FieldItem]?
     var visibility: FieldsVisibility?
     
+    var amount: Int?
+    
+    var isSavedNewCard: Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        emailVerificationApi()
         
         uiFinishingTouchElements()
         
@@ -267,6 +272,89 @@ class OTPVerificationVC: BaseVC {
         }
     }
     
+    //MARK: - Send OTP Email Verification Api
+    func emailVerificationApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.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")
+        
+        // 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"
+        ]
+        
+        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 {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("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)")
+                            
+                        } else {
+                            print("Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        print("Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    print("No data received")
+                }
+            } else {
+                print("HTTP Status Code: \(httpResponse.statusCode)")
+            }
+        }
+        task.resume()
+    }
+    
     //MARK: - OTP Verification Api
     func otpVerificationApi() {
         showLoadingIndicator()
@@ -334,7 +422,7 @@ class OTPVerificationVC: BaseVC {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
-                            if self.selectedPaymentMethod == "Card" {
+                            if self.selectedPaymentMethod == "Card"{
                                 if let dataSection = responseObject["data"] as? [String: Any],
                                    let innerData = dataSection["data"] as? [String: Any],
                                    let customerId = innerData["customer_id"] as? String {
@@ -359,7 +447,14 @@ class OTPVerificationVC: BaseVC {
                                     }
                                 } else {
                                     print("customer_id not found in nested data. Falling back to nil.")
-                                    self.paymentIntentApi(customerId: nil)
+                                    if let request = self.request {
+                                        if request.secureAuthentication == true {
+                                            self.threeDSecurePaymentSavedCardApi(customerId: nil)
+                                        }
+                                        else {
+                                            self.paymentIntentApi(customerId: nil)
+                                        }
+                                    }
                                 }
                             }
                             else if self.selectedPaymentMethod == "Bank" {
@@ -395,100 +490,17 @@ class OTPVerificationVC: BaseVC {
                                     self.grailPayAccountChargeApi(customerId: nil)
                                 }
                             }
-                            else if self.selectedPaymentMethod == "NewGrailPayAccount" {
-                                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")
-                        }
-                    } catch let jsonError {
-                        print("Error parsing JSON: \(jsonError)")
-                    }
-                } else {
-                    print("No data received")
-                }
-            } else {
-                print("HTTP Status Code: \(httpResponse.statusCode)")
-            }
-        }
-        task.resume()
-    }
-    
-    //MARK: - Send OTP Email Verification Api
-    func emailVerificationApi() {
-        showLoadingIndicator()
-        
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.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")
-        
-        // 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"
-        ]
-        
-        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 {
-                print("Error: \(error.localizedDescription)")
-                return
-            }
-            
-            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
-                print("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)")
-                            
+//                            else if self.selectedPaymentMethod == "NewGrailPayAccount" {
+//                                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")
                         }
@@ -1225,23 +1237,43 @@ class OTPVerificationVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
+        let emailPrefix = userEmail?.components(separatedBy: "@").first ?? ""
+        
         var 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 ?? "",
-            "email": UserStoreSingleton.shared.merchantEmail ?? ""
+            "email": userEmail ?? "",
+            "create_customer": "1",
         ]
         
-        // Billing Info
-        if let visibility = visibility, visibility.billing == true,
-           let billing = billingInfo, !billing.isEmpty {
+        if let customerId = customerId {
+            params["customer"] = customerId
+        } else {
+            params["username"] = emailPrefix
+        }
+        
+//        // Billing Info
+//        if let visibility = visibility, visibility.billing == true,
+//           let billing = billingInfo, !billing.isEmpty {
+//            var billingDict: [String: Any] = [:]
+//            billing.forEach { billingDict[$0.name] = $0.value }
+//            
+//            params["address"] = billingDict["address"] as? String ?? ""
+//            params["country"] = billingDict["country"] as? String ?? ""
+//            params["state"] = billingDict["state"] as? String ?? ""
+//            params["city"] = billingDict["city"] as? String ?? ""
+//            params["zip"] = billingDict["postal_code"] as? String ?? ""
+//        }
+        
+        // Always include Billing Info if available
+        if let billing = billingInfo, !billing.isEmpty {
             var billingDict: [String: Any] = [:]
             billing.forEach { billingDict[$0.name] = $0.value }
-            
+
             params["address"] = billingDict["address"] as? String ?? ""
             params["country"] = billingDict["country"] as? String ?? ""
             params["state"] = billingDict["state"] as? String ?? ""
@@ -1249,18 +1281,34 @@ class OTPVerificationVC: BaseVC {
             params["zip"] = billingDict["postal_code"] as? String ?? ""
         }
         
-        // Additional Info or default description
-        var descriptionValue: String = "Hosted payment checkout" // default
-        if let visibility = visibility, visibility.additional == true,
-           let additional = additionalInfo, !additional.isEmpty {
-            
+//        // Additional Info or default description
+//        var descriptionValue: String = "Hosted payment checkout" // default
+//        if let visibility = visibility, visibility.additional == true,
+//           let additional = additionalInfo, !additional.isEmpty {
+//            
+//            var additionalDict: [String: Any] = [:]
+//            additional.forEach { additionalDict[$0.name] = $0.value }
+//            
+//            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+//                descriptionValue = desc
+//            }
+//            
+//            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+//                params["phone_number"] = phone
+//            }
+//        }
+//        params["description"] = descriptionValue
+        
+        // Always include Additional Info if available
+        var descriptionValue: String = "Hosted payment checkout"
+        if let additional = additionalInfo, !additional.isEmpty {
             var additionalDict: [String: Any] = [:]
             additional.forEach { additionalDict[$0.name] = $0.value }
-            
+
             if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                 descriptionValue = desc
             }
-            
+
             if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                 params["phone_number"] = phone
             }
@@ -1341,19 +1389,19 @@ class OTPVerificationVC: BaseVC {
                                         // Conditionally pass raw FieldItem array
                                         paymentDoneVC.visibility = self.visibility
                                         
-                                        if self.visibility?.billing == true {
+                                      //  if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]
                                             self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
                                             paymentDoneVC.billingInfo = billingDict
-                                        }
+                                      //  }
                                         
-                                        if self.visibility?.additional == true {
+                                      //  if self.visibility?.additional == true {
                                             paymentDoneVC.additionalInfoData = self.additionalInfo
                                             var additionalDict: [String: Any] = [:]
                                             self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
                                             paymentDoneVC.additionalInfo = additionalDict
-                                        }
+                                      //  }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1411,7 +1459,7 @@ class OTPVerificationVC: BaseVC {
         
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
-            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "email": userEmail ?? "",
             "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
             "cardholder_name": nameOnCard ?? "",
             "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
@@ -1565,12 +1613,42 @@ class OTPVerificationVC: BaseVC {
             "customer_id": customerId ?? ""
         ]
         
-        // Billing Info
-        if let visibility = visibility, visibility.billing == true,
-           let billing = billingInfo, !billing.isEmpty {
+//        // Billing Info
+//        if let visibility = visibility, visibility.billing == true,
+//           let billing = billingInfo, !billing.isEmpty {
+//            var billingDict: [String: Any] = [:]
+//            billing.forEach { billingDict[$0.name] = $0.value }
+//            
+//            params["address"] = billingDict["address"] as? String ?? ""
+//            params["country"] = billingDict["country"] as? String ?? ""
+//            params["state"] = billingDict["state"] as? String ?? ""
+//            params["city"] = billingDict["city"] as? String ?? ""
+//            params["zip"] = billingDict["postal_code"] as? String ?? ""
+//        }
+//        
+//        // Additional Info or default description
+//        var descriptionValue: String = "Hosted payment checkout" // default
+//        if let visibility = visibility, visibility.additional == true,
+//           let additional = additionalInfo, !additional.isEmpty {
+//            
+//            var additionalDict: [String: Any] = [:]
+//            additional.forEach { additionalDict[$0.name] = $0.value }
+//            
+//            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+//                descriptionValue = desc
+//            }
+//            
+//            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+//                params["phone_number"] = phone
+//            }
+//        }
+//        params["description"] = descriptionValue
+        
+        // Always include Billing Info if available
+        if let billing = billingInfo, !billing.isEmpty {
             var billingDict: [String: Any] = [:]
             billing.forEach { billingDict[$0.name] = $0.value }
-            
+
             params["address"] = billingDict["address"] as? String ?? ""
             params["country"] = billingDict["country"] as? String ?? ""
             params["state"] = billingDict["state"] as? String ?? ""
@@ -1578,18 +1656,16 @@ class OTPVerificationVC: BaseVC {
             params["zip"] = billingDict["postal_code"] as? String ?? ""
         }
         
-        // Additional Info or default description
-        var descriptionValue: String = "Hosted payment checkout" // default
-        if let visibility = visibility, visibility.additional == true,
-           let additional = additionalInfo, !additional.isEmpty {
-            
+        // Always include Additional Info if available
+        var descriptionValue: String = "Hosted payment checkout"
+        if let additional = additionalInfo, !additional.isEmpty {
             var additionalDict: [String: Any] = [:]
             additional.forEach { additionalDict[$0.name] = $0.value }
-            
+
             if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                 descriptionValue = desc
             }
-            
+
             if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                 params["phone_number"] = phone
             }
@@ -1619,6 +1695,8 @@ class OTPVerificationVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             uRLRequest.httpBody = jsonData
@@ -1669,20 +1747,21 @@ class OTPVerificationVC: BaseVC {
                                         // Pass billing and additional info
                                         // Conditionally pass raw FieldItem array
                                         paymentDoneVC.visibility = self.visibility
+                                        paymentDoneVC.amount = self.amount
                                         
-                                        if self.visibility?.billing == true {
+                                      //  if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]
                                             self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
                                             paymentDoneVC.billingInfo = billingDict
-                                        }
+                                      //  }
                                         
-                                        if self.visibility?.additional == true {
+                                      //  if self.visibility?.additional == true {
                                             paymentDoneVC.additionalInfoData = self.additionalInfo
                                             var additionalDict: [String: Any] = [:]
                                             self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
                                             paymentDoneVC.additionalInfo = additionalDict
-                                        }
+                                     //   }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }