@jimrising/easymerchantsdk-react-native 1.0.8 → 1.1.0

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -12,7 +12,7 @@ struct PaymentsData {
     var image = String()
 }
 
-let EasyPaySdk = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle)
+let EasyPaySdk = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle)
 
 class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
@@ -239,14 +239,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        //        viewCardFields.layer.borderColor = UIColor.systemGray.cgColor
-        //        viewCardFields.layer.borderWidth = 1
-        //        viewCardFields.layer.cornerRadius = 8
-        
-        //        viewBankFields.layer.borderColor = UIColor.systemGray.cgColor
-        //        viewBankFields.layer.borderWidth = 1
-        //        viewBankFields.layer.cornerRadius = 8
-        
         viewCryptoTryAgain.layer.borderColor = UIColor.systemGray.cgColor
         viewCryptoTryAgain.layer.borderWidth = 1
         viewCryptoTryAgain.layer.cornerRadius = 8
@@ -1551,31 +1543,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func emailVerificationApi() {
         showLoadingIndicator()
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/customer/send_otp"
+        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
         
-        guard let serviceURL = components.url else {
+        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")
         
+        // Use the clientToken from your singleton
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Define the parameters for the request
         let params: [String: Any] = [
             "card_search_value": txtFieldEmail.text ?? "",
             "card_search_key": "email"
         ]
         
         do {
+            // Convert the dictionary to JSON
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
@@ -1608,11 +1601,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if let data = serviceData {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-                            
                             print("Response Data: \(responseObject)")
-                            
                             DispatchQueue.main.async {
-                                
+                                // Handle successful response
                             }
                         } else {
                             print("Invalid JSON format")
@@ -1633,18 +1624,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - OTP Verification Api
     func otpVerificationApi() {
         showLoadingIndicator()
+
+        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.verifyOtp.path()
         
-        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 {
+        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")
@@ -1776,12 +1765,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func getShowCardsApi() {
         showLoadingIndicator()
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/card"
-        
-        guard let serviceURL = components.url else {
+//        var components = URLComponents()
+//        components.scheme = "https"
+//        components.host = "stage-api.stage-easymerchant.io"
+//        components.path = "/api/v1/card"
+//        
+//        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.getCards.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -1847,12 +1845,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     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")
+//            hideLoadingIndicator()
+//            return
+//        }
+        
+        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -1948,12 +1955,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromShowSavedCardApi() {
         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.creditCharges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2052,12 +2068,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromAddNewCardApi(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.creditCharges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2220,12 +2245,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func updateCardApi(cardID: String) {
         showLoadingIndicator()
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
-        
-        guard let serviceURL = components.url else {
+//        var components = URLComponents()
+//        components.scheme = "https"
+//        components.host = "stage-api.stage-easymerchant.io"
+//        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
+//        
+//        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.getCards.path()+"/\(cardID)"
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2373,12 +2407,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func deleteCardApi(cardID: String, at index: Int) {
         showLoadingIndicator()
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
-        
-        guard let serviceURL = components.url else {
+//        var components = URLComponents()
+//        components.scheme = "https"
+//        components.host = "stage-api.stage-easymerchant.io"
+//        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
+//        
+//        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.getCards.path()+"/\(cardID)"
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2456,12 +2499,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func getShowBankAccountsApi() {
         showLoadingIndicator()
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/ach/account"
-        
-        guard let serviceURL = components.url else {
+//        var components = URLComponents()
+//        components.scheme = "https"
+//        components.host = "stage-api.stage-easymerchant.io"
+//        components.path = "/api/v1/ach/account"
+//        
+//        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.account.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2561,12 +2613,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     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
@@ -2663,12 +2724,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     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
@@ -2762,12 +2832,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func accountChargeAddNewAccountApi() {
         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
@@ -2871,12 +2950,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     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
@@ -2990,12 +3078,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func deleteAccountApi(accountID: String, at index: Int) {
         showLoadingIndicator()
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/ach/account/\(accountID)" // Append the account_id to the path
-        
-        guard let serviceURL = components.url else {
+//        var components = URLComponents()
+//        components.scheme = "https"
+//        components.host = "stage-api.stage-easymerchant.io"
+//        components.path = "/api/v1/ach/account/\(accountID)" // Append the account_id to the path
+//        
+//        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()+"/\(accountID)"
+        
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -3061,12 +3158,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     // MARK: - Crypto Charge API
     func cryptoChargeApi() {
         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
@@ -3199,13 +3305,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - GET Crypto Payment Info API
     func getCryptoPaymentInfoApi(chargeId: String) {
         
-        var components = URLComponents()
-        components.scheme = "https"
-        components.host = "stage-api.stage-easymerchant.io"
-        components.path = "/api/v1/charges/\(chargeId)" // Append chargeId to the path
+//        var components = URLComponents()
+//        components.scheme = "https"
+//        components.host = "stage-api.stage-easymerchant.io"
+//        components.path = "/api/v1/charges/\(chargeId)" // Append chargeId to the path
+//        
+//        guard let serviceURL = components.url else {
+//            print("Invalid URL")
+//            return
+//        }
+        
+        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()+"/\(chargeId)"
         
-        guard let serviceURL = components.url else {
+        guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
+            hideLoadingIndicator()
             return
         }
         

package/ios/easymerchantsdk.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.source           = { :path => '.' }
 
   # Platforms and version constraints
-  s.platform         = :ios, '13.4'
+  s.platform         = :ios, '16.0'
 
   # Specify the source files for the SDK
 #   s.source_files = 'Classes/**/*.{h,m,swift}'

package/package.json

@@ -1,18 +1,27 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "1.0.8",
-  "description": "",
+  "version": "1.1.0",
+  "description": "A React Native SDK for EasyMerchant",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
-    "react-native"
+    "react-native",
+    "easymerchant",
+    "sdk"
   ],
   "author": "",
-  "license": "",
+  "license": "MIT",
   "peerDependencies": {
-    "react-native": "^0.77.0",
-    "react-native-windows": "^0.77.1"
+    "react-native": "^0.76.4",
+    "react-native-windows": "^0.76.2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/EasyMerchant/em-MobileCheckoutSDK-ReactNative.git#dev-branch"
+  },
+  "publishConfig": {
+    "access": "restricted"
   }
 }

package/src/index.js

@@ -14,7 +14,7 @@ const platformVersion = async () => {
   }
 };
 
-const billing = async (amount, billingInfo) => {
+const billing = async (amount, billingInfo,env,apiKey,secretKey) => {
   return new Promise((resolve, reject) => {
     const successCallback = (response) => {
       resolve(response);
@@ -26,7 +26,7 @@ const billing = async (amount, billingInfo) => {
 
     try {
       if (Platform.OS === 'android') {
-        RNEasymerchantsdk.billing(amount, billingInfo, successCallback, errorCallback);
+        RNEasymerchantsdk.billing(amount, billingInfo, env,apiKey,secretKey,successCallback, errorCallback);
       } else if (Platform.OS === 'ios') {
         EasyMerchantSdk.billing(amount, billingInfo)
           .then(successCallback)