@jimrising/easymerchantsdk-react-native 1.5.1 → 1.5.3

package/README.md

@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^1.5.1"
+  "@jimrising/easymerchantsdk-react-native": "^1.5.3"
 },
 ```
 

package/ios/ApiManager/APIHeaders.swift

@@ -0,0 +1,31 @@
+//
+//  APIHeaders.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 19/06/25.
+//
+
+import Foundation
+
+struct APIHeaders {
+    static func commonHeaders(contentType: String = "application/json") -> [String: String] {
+        return ["Content-Type": contentType]
+    }
+
+    static func clientTokenHeader() -> [String: String] {
+        guard let token = UserStoreSingleton.shared.clientToken else { return [:] }
+        return ["Client-Token": token]
+    }
+
+    static func customerTokenHeader() -> [String: String] {
+        guard let token = UserStoreSingleton.shared.customerToken else { return [:] }
+        return ["Customer-Token": token]
+    }
+
+    static func apiAuthHeaders() -> [String: String] {
+        guard let key = EnvironmentConfig.apiKey,
+              let secret = EnvironmentConfig.apiSecret else { return [:] }
+        return ["x-api-key": key, "x-api-secret": secret]
+    }
+}
+

package/ios/ApiManager/APIRequest.swift

@@ -0,0 +1,63 @@
+//
+//  APIRequest.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 19/06/25.
+//
+
+import Foundation
+
+enum HTTPMethod: String {
+    case get = "GET"
+    case post = "POST"
+}
+
+struct APIRequest {
+    let endpoint: EnvironmentConfig.Endpoints
+    let method: HTTPMethod
+    var headers: [String: String] = [:]
+    var body: [String: Any]?
+
+    func buildURLRequest() -> URLRequest? {
+        let fullURL = EnvironmentConfig.baseURL + endpoint.path()
+        guard let url = URL(string: fullURL) else {
+            print("❌ Invalid URL: \(fullURL)")
+            return nil
+        }
+
+        var request = URLRequest(url: url)
+        request.httpMethod = method.rawValue
+
+        // Combine default headers with passed-in headers
+        var allHeaders = APIHeaders.commonHeaders()
+        allHeaders.merge(APIHeaders.clientTokenHeader(), uniquingKeysWith: { $1 })
+        allHeaders.merge(APIHeaders.customerTokenHeader(), uniquingKeysWith: { $1 })
+        allHeaders.merge(APIHeaders.apiAuthHeaders(), uniquingKeysWith: { $1 })
+        allHeaders.merge(headers, uniquingKeysWith: { $1 }) // override if needed
+
+        // Apply to request
+        allHeaders.forEach { key, value in
+            request.setValue(value, forHTTPHeaderField: key)
+        }
+
+        // Encode JSON body if present
+        if let body = body {
+            do {
+                let jsonData = try JSONSerialization.data(withJSONObject: body, options: [])
+                request.httpBody = jsonData
+
+                // Debug
+                if let jsonString = String(data: jsonData, encoding: .utf8) {
+                    print("JSON Payload Sent:\n\(jsonString)")
+                }
+
+            } catch {
+                print("Failed to serialize request body: \(error)")
+                return nil
+            }
+        }
+
+        return request
+    }
+    
+}

package/ios/ApiManager/APIService.swift

@@ -0,0 +1,105 @@
+//
+//  APIService.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 19/06/25.
+//
+
+import Foundation
+
+/// Singleton class to manage API requests
+class APIService {
+    static let shared = APIService()
+    private init() {}
+
+    // MARK: - Raw JSON Request (Dictionary Response)
+    /// Performs a request and returns a raw [String: Any] JSON response
+    func requestRaw(
+        _ apiRequest: APIRequest,
+        completion: @escaping (Result<[String: Any], Error>, Data?, HTTPURLResponse?) -> Void
+    ) {
+        guard let urlRequest = apiRequest.buildURLRequest() else {
+            completion(.failure(NSError(domain: "Invalid URLRequest", code: 0)), nil, nil)
+            return
+        }
+
+        let task = URLSession.shared.dataTask(with: urlRequest) { data, response, error in
+            let httpResponse = response as? HTTPURLResponse
+
+            // Debug print
+            if let data = data, let rawString = String(data: data, encoding: .utf8) {
+                print("🧾 Raw Response:\n\(rawString)")
+            }
+
+            if let error = error {
+                completion(.failure(error), data, httpResponse)
+                return
+            }
+
+            guard let data = data else {
+                completion(.failure(NSError(domain: "No data", code: 0)), nil, httpResponse)
+                return
+            }
+
+            do {
+                if let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                    if let statusCode = httpResponse?.statusCode, (200..<300).contains(statusCode) {
+                        completion(.success(json), data, httpResponse)
+                    } else {
+                        let apiError = NSError(domain: "", code: httpResponse?.statusCode ?? 0, userInfo: json)
+                        completion(.failure(apiError), data, httpResponse)
+                    }
+                } else {
+                    completion(.failure(NSError(domain: "Invalid JSON structure", code: 0)), data, httpResponse)
+                }
+            } catch {
+                completion(.failure(error), data, httpResponse)
+            }
+        }
+
+        task.resume()
+    }
+
+    // MARK: - Decodable Model Request
+    /// Performs a request and decodes a Codable model from the response
+    func request<T: Decodable>(
+        _ apiRequest: APIRequest,
+        responseType: T.Type,
+        completion: @escaping (Result<T, Error>) -> Void
+    ) {
+        guard let urlRequest = apiRequest.buildURLRequest() else {
+            completion(.failure(NSError(domain: "Invalid URLRequest", code: 0)))
+            return
+        }
+
+        let task = URLSession.shared.dataTask(with: urlRequest) { data, response, error in
+            // Handle error
+            if let error = error {
+                completion(.failure(error))
+                return
+            }
+
+            // Handle missing data
+            guard let data = data else {
+                completion(.failure(NSError(domain: "No data", code: 0)))
+                return
+            }
+
+            // Debug: optional - print raw response
+            if let rawString = String(data: data, encoding: .utf8) {
+                print("🧾 Raw Response:\n\(rawString)")
+            }
+
+            // Attempt decoding
+            do {
+                let decodedObject = try JSONDecoder().decode(T.self, from: data)
+                completion(.success(decodedObject))
+            } catch {
+                completion(.failure(error))
+            }
+        }
+
+        task.resume()
+    }
+    
+}

package/ios/Classes/EasyMerchantSdk.m

@@ -2,8 +2,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
 
-#import <easymerchantsdk-Swift.h>
-//#import <easymerchantsdk/easymerchantsdk-Swift.h>
+//#import <easymerchantsdk-Swift.h>
+#import <easymerchantsdk/easymerchantsdk-Swift.h>
 
 @interface EasyMerchantSdk ()
 @property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;

package/ios/Classes/EasyMerchantSdk.swift

@@ -330,7 +330,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
 
 // MARK: - Delegate Implementation
 extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
-    public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result) {
+    public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: SDKResult) {
         DispatchQueue.main.async {
             switch result.type {
             case .cancelled:

package/ios/Classes/EasyPayViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 // @available(iOS 16.0, *)
 @objc
 public protocol EasyPayViewControllerDelegate {
-    func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result)
+    func easyPayController(_ controller: EasyPayViewController, didFinishWith result: SDKResult)
 }
 
 // @available(iOS 16.0, *)

package/ios/Helper/GrailPayHelper.swift

@@ -9,7 +9,7 @@ public class GrailPayHelper {
     public static func presentGrailPay(
         from viewController: UIViewController,
         request: GrailPayRequest,
-        completion: @escaping (Result) -> Void
+        completion: @escaping (SDKResult) -> Void
     ) {
         let grailPayVC = GrailPayVC(request: request)
         grailPayVC.onCompletion = completion

package/ios/Models/Request.swift

@@ -340,7 +340,7 @@ public final class Request: NSObject {
         
         let params: [String: Any] = [
             "amount": amount ?? 0,
-            //            "allowed_cycles": String(recurringIntervals?.count ?? 0),
+            // "allowed_cycles": String(recurringIntervals?.count ?? 0),
             "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,

package/ios/Models/{Result.swift → SDKResult.swift}

@@ -1,8 +1,8 @@
 //
-//  Result.swift
+//  SDKResult.swift
 //  EasyPay
 //
-//  Created by iftekhar on 14/07/24.
+//  Created by Mony's Mac on 18/06/25.
 //
 
 import UIKit
@@ -15,7 +15,7 @@ public enum ResultType: Int {
 }
 
 @objc
-public final class Result: NSObject {
+public final class SDKResult: NSObject {
     
     @objc public let type: ResultType
     @objc public let error: NSError?
@@ -48,3 +48,4 @@ public final class Result: NSObject {
     }
 }
 
+

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -1389,7 +1389,7 @@ class AdditionalInfoVC: BaseVC {
         
         var params: [String: Any] = [
             "name": accountName ?? "",
-            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "email": userEmail ?? "",
             "currency": "usd",
             "account_type": accountType?.lowercased() ?? "",
             "routing_number": routingNumber ?? "",

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -1777,7 +1777,7 @@ class BillingInfoVC: BaseVC {
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         var params: [String: Any] = [
-            "name": UserStoreSingleton.shared.merchantName ?? "",
+            "name": nameOnCard ?? "",
             "account_id": accountID ?? "",
             "payment_method": "ach",
             "customer": customerID ?? "",
@@ -2110,7 +2110,7 @@ class BillingInfoVC: BaseVC {
         
         var params: [String: Any] = [
             "name": accountName ?? "",
-            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "email": userEmail ?? "",
             "currency": "usd",
             "account_type": accountType?.lowercased() ?? "",
             "routing_number": routingNumber ?? "",
@@ -2294,7 +2294,7 @@ class BillingInfoVC: BaseVC {
             "account_type": self.selectedGrailPayAccountType ?? "",
             "name": self.selectedGrailPayAccountName ?? "",
             "description": "payment checkout",
-            "email": UserStoreSingleton.shared.merchantEmail ?? ""
+            "email": userEmail ?? ""
         ]
         
         // Conditionally add billing info

package/ios/Pods/ViewControllers/GrailPayVC.swift

@@ -14,7 +14,7 @@ public class GrailPayVC: UIViewController {
     private var loadingIndicator: UIActivityIndicatorView!
     private var request: GrailPayRequest
     
-    public var onCompletion: ((Result) -> Void)?
+    public var onCompletion: ((SDKResult) -> Void)?
     private var didHandleBankConnection = false
     
     public init(request: GrailPayRequest) {
@@ -158,7 +158,7 @@ public class GrailPayVC: UIViewController {
     private func handleError(_ error: Error) {
         DispatchQueue.main.async {
             self.loadingIndicator.stopAnimating()
-            self.onCompletion?(Result(error: error as NSError))
+            self.onCompletion?(SDKResult(error: error as NSError))
             self.dismiss(animated: true)
         }
     }
@@ -204,7 +204,7 @@ extension GrailPayVC: WKScriptMessageHandler {
                 didHandleBankConnection = true
                 let dataArray: [[String: Any]] = [dataG]
                 DispatchQueue.main.async {
-                    self.onCompletion?(Result(type: .success, chargeData: ["data": dataArray]))
+                    self.onCompletion?(SDKResult(type: .success, chargeData: ["data": dataArray]))
                     self.dismiss(animated: true)
                 }
             }
@@ -216,7 +216,7 @@ extension GrailPayVC: WKScriptMessageHandler {
             }
             print("User exited linking flow")
             DispatchQueue.main.async {
-                self.onCompletion?(Result(type: .cancelled))
+                self.onCompletion?(SDKResult(type: .cancelled))
                 self.dismiss(animated: true)
             }
             

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -52,7 +52,7 @@ class OTPVerificationVC: BaseVC {
     
     var isSavedForFuture: Bool = false
     
-    private var timeRemaining = 180 // 3 minutes
+    private var timeRemaining = 60 // 3 minutes
     private var timer: Timer?
     
     //GrailPay Params
@@ -233,7 +233,7 @@ class OTPVerificationVC: BaseVC {
     }
     
     private func startTimer() {
-        timeRemaining = 180 // 3 minutes
+        timeRemaining = 60 // 3 minutes
         lblOtpTimer.text = formatTime(timeRemaining)
         timer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(updateTimer), userInfo: nil, repeats: true)
     }
@@ -490,17 +490,6 @@ 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")
                         }
@@ -515,9 +504,8 @@ class OTPVerificationVC: BaseVC {
                 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)")
+                   // self.presentPaymentErrorVC(errorMessage: message)
+                    self.showToast(message: message)
                 }
             }
         }
@@ -565,7 +553,7 @@ class OTPVerificationVC: BaseVC {
             "save_card": 1,
             "is_default": "1",
             // "create_customer": "1"
-            // "email": userEmail ?? ""
+            "email": userEmail ?? ""
         ]
         
         if let customerId = customerId {
@@ -941,7 +929,7 @@ class OTPVerificationVC: BaseVC {
         
         var params: [String: Any] = [
             "name": accountName ?? "",
-            "email": email ?? "",
+            "email": userEmail ?? "",
             "currency": "usd",
             "account_type": accountType?.lowercased() ?? "",
             "routing_number": routingNumber ?? "",

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -203,7 +203,7 @@ class PaymentDoneVC: UIViewController {
     }
     
     @IBAction func actionBtnDone(_ sender: UIButton) {
-        let result = Result(type: .success,
+        let result = SDKResult(type: .success,
                             chargeData: chargeData,
                             billingInfo: billingInfo,
                             additionalInfo: additionalInfo)

package/ios/Pods/ViewControllers/PaymentErrorVC.swift

@@ -66,7 +66,7 @@ class PaymentErrorVC: UIViewController {
     }
     
     @IBAction func actionBtnDone(_ sender: UIButton) {
-        let result = Result(type: .error, chargeData: nil)
+        let result = SDKResult(type: .error, chargeData: nil)
         // Pass the error message back using the delegate
         easyPayDelegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
         
@@ -75,7 +75,7 @@ class PaymentErrorVC: UIViewController {
                 // Ensure the error message is sent back to the starting screen
                 if let delegate = easyPayVC.easyPayDelegate {
                     UserStoreSingleton.shared.isLoggedIn = false
-                    let errorResult = Result(type: .error, chargeData: ["errorMessage": self.errorMessage ?? "Unknown error"])
+                    let errorResult = SDKResult(type: .error, chargeData: ["errorMessage": self.errorMessage ?? "Unknown error"])
                     delegate.easyPayController(easyPayVC, didFinishWith: errorResult)
                 }
             })