@jimrising/easymerchantsdk-react-native 1.0.8 → 1.1.0

package/ios/Example/ViewController.swift

@@ -1,10 +1,3 @@
-//
-//  ViewController.swift
-//  EasyPaySDKDemo
-//
-//  Created by iftekhar on 13/07/24.
-//
-
 import UIKit
 
 class ViewController: UIViewController {
@@ -14,12 +7,24 @@ class ViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Do any additional setup after loading the view.
-
+        
+        // Developer selects the environment
+        EnvironmentConfig.setEnvironment(.staging) // Or .sandbox, .production
     }
     
     @IBAction private func payAction() {
-        // Create JSON Object with the given data
+        //Staging Keys
+        let apiKey = "mobilesdk1980IUuCzwWl"
+        let apiSecret = "mobilesdk1980LVHnN0Oh"
+        
+        //Sandboxing Keys
+        // let apiKey = "f149cf5afc3a67c79e0aa87e7"
+        // let apiSecret = "22b9dd1e588146077ca77da82"
+        
+        // Configure the SDK with custom API keys
+        EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
+        
+        // Create the payment request
         let additionalInfoRequest = [
             "name": "Test User",
             "email": "test@gmail.com",
@@ -37,13 +42,12 @@ class ViewController: UIViewController {
             "additional_info": additionalInfoRequest
         ]
         
-        // Convert the dictionary to JSON
         guard let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []) else {
             print("Failed to serialize JSON")
             return
         }
         
-        //        let request = EasyPay.Request(amount: 99, billingInfoData: nil)
+        // Send the payment request
         let request = Request(amount: 99, billingInfoData: jsonData)
         let controller = EasyPayViewController(request: request, delegate: self)
         self.present(controller, animated: true)
@@ -62,7 +66,6 @@ extension ViewController: EasyPayViewControllerDelegate {
                 handleSuccess(with: chargeData)
             }
         case .error:
-            // Handle the error and display the message on lblResponseShow
             if let chargeData = result.chargeData, let errorMessage = chargeData["errorMessage"] as? String {
                 lblResponseShow.isHidden = false
                 lblResponseShow.text = "Error: \(errorMessage)"
@@ -79,4 +82,3 @@ extension ViewController: EasyPayViewControllerDelegate {
     }
     
 }
-

package/ios/Models/Request.swift

@@ -11,7 +11,7 @@ import UIKit
 public final class Request: NSObject {
     public let amount: Double
     public let billingInfoData: Data?
-        
+    
     public init(amount: Double, billingInfoData: Data? = nil) {
         self.amount = amount
         self.billingInfoData = billingInfoData
@@ -29,15 +29,12 @@ public final class Request: NSObject {
         }
         
     }
-        
+    
+    //MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
         // Start loader when API call starts
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/paymentintent"
         
-        guard let serviceURL = components.url else {
+        guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
             print("Invalid URL")
             completion(false)
             return
@@ -46,8 +43,8 @@ public final class Request: NSObject {
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.addValue("mobilesdk1980IUuCzwWl", forHTTPHeaderField: "X-Api-Key")
-        request.addValue("mobilesdk1980LVHnN0Oh", forHTTPHeaderField: "X-Api-Secret")
+        request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
+        request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
         
         let params: [String: Any] = [
             "amount": amount,
@@ -63,7 +60,7 @@ public final class Request: NSObject {
         
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
             DispatchQueue.main.async {
-                 // Stop loader when response is received
+                // Stop loader when response is received
             }
             
             guard let httpResponse = response as? HTTPURLResponse, error == nil else {
@@ -111,19 +108,19 @@ public final class Request: NSObject {
         task.resume()
     }
     
+    // MARK: - Hosted Checkout API
     func hostedCheckoutsApi(completion: @escaping (Bool) -> Void) {
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/hostedcheckouts"
-        
-        guard let serviceURL = components.url else {
-            print("Invalid URL")
+        // Build the URL using EnvironmentConfig
+        guard let baseURL = URL(string: EnvironmentConfig.baseURL) else {
+            print("Invalid base URL")
             completion(false)
             return
         }
         
+        let endpointPath = EnvironmentConfig.Endpoints.hostedCheckouts.path()
+        let serviceURL = baseURL.appendingPathComponent(endpointPath)
+        
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -161,12 +158,12 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.merchantEmail = merchantEmail
                                 print("Saved merchantEmail: \(merchantEmail)")
                             }
-
+                            
                             if let merchantName = dataObject["merchant_name"] as? String {
                                 UserStoreSingleton.shared.merchantName = merchantName
                                 print("Saved merchantName: \(merchantName)")
                             }
-
+                            
                             // Save payment methods (crypto payment account)
                             if let paymentMethods = dataObject["payment_methods"] as? [String: Any],
                                let cryptoSection = paymentMethods["crypto"] as? [String: Any],
@@ -174,7 +171,7 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.paymentAccount = paymentAccount
                                 print("Saved paymentAccount (Crypto): \(paymentAccount)")
                             }
-
+                            
                             // Save appearance settings
                             if let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
                                 if let bodyBgCol = appearanceSettings["body_bg_col"] as? String {
@@ -244,21 +241,5 @@ public final class Request: NSObject {
         }
         task.resume()
     }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     
-
+}

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 
+@available(iOS 16.0, *)
 class AdditionalInfoVC: BaseVC {
     
     @IBOutlet weak var viewAdditionalInfo: UIView!
@@ -207,14 +208,23 @@ class AdditionalInfoVC: BaseVC {
     func paymentIntentApi() {
         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 {
+//        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")
+//            self.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 {
             print("Invalid URL")
-            self.hideLoadingIndicator()
+            hideLoadingIndicator()
             return
         }
         
@@ -337,12 +347,21 @@ class AdditionalInfoVC: BaseVC {
     //MARK: - Credit Card Charge Api from Saved cards
     func paymentIntentFromShowCardApi() {
         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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -467,12 +486,21 @@ class AdditionalInfoVC: BaseVC {
     func paymentIntentAddNewCardApi(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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -609,12 +637,21 @@ class AdditionalInfoVC: BaseVC {
     func accountChargeApi() {
         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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -742,12 +779,21 @@ class AdditionalInfoVC: BaseVC {
     func accountChargeSavedBankAccountApi() {
         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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -872,12 +918,21 @@ class AdditionalInfoVC: BaseVC {
     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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return

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

@@ -720,4 +720,4 @@ extension BillingInfoVC: UITextFieldDelegate {
             break
         }
     }
-}
+}

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -48,15 +48,24 @@ class EmailVerificationVC: BaseVC {
         view.endEditing(true)
     }
     
-    //Send OTP Email Verification Api
+    // 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"
+//        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
+//        }
         
-        guard let serviceURL = components.url else {
+        // 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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -116,12 +116,21 @@ 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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -233,12 +242,21 @@ 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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -312,12 +330,21 @@ class OTPVerificationVC: BaseVC {
     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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -450,12 +477,21 @@ 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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -574,12 +610,21 @@ class OTPVerificationVC: BaseVC {
     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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -711,12 +756,21 @@ class OTPVerificationVC: BaseVC {
     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 {
+//        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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return