@jimrising/easymerchantsdk-react-native 1.5.7 → 1.5.9

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.7"
+  "@jimrising/easymerchantsdk-react-native": "^1.5.9"
 },
 ```
 
@@ -24,11 +24,11 @@ allprojects {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
-        maven {
-            url = uri("https://maven.pkg.github.com/EasyMerchant/em-MobileCheckoutSDK-Android")
+           maven {
+            url = uri(properties.getProperty('GITHUB_URL'))
             credentials {
-                username = "EasyMerchant"
-                password = "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"
+                username = properties.getProperty('GITHUB_USERNAME')
+                password = properties.getProperty('GITHUB_PASSWORD')
             }
         }
     }

package/android/build.gradle

@@ -39,14 +39,11 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.2.8'
+    implementation 'com.app:paysdk:1.2.9'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
     implementation 'com.github.androidmads:QRGenerator:1.0.1'
-//    implementation('com.microblink:blinkcard:2.10.0@aar') {
-//        transitive = true
-//    }
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.facebook.react:react-native:+'

package/android/src/main/java/com/reactlibrary/RNEasymerchantsdkModule.java

@@ -4,14 +4,14 @@ import android.app.Activity;
 import androidx.annotation.NonNull;
 import com.app.paysdk.init.EasyPaymentFactory;
 import com.app.paysdk.service.EasyPaymentService;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
-import org.json.JSONObject;
+import com.facebook.react.bridge.*;
+import org.json.*;
+import java.util.Map;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
 
 public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
     private final ReactApplicationContext reactContext;
@@ -27,14 +27,16 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
         return "RNEasymerchantsdk";
     }
 
-    @ReactMethod
-    public void platformVersion(Promise promise) {
+    private Properties loadConfigProperties() {
+        Properties properties = new Properties();
         try {
-            String platformVersion = "Android " + android.os.Build.VERSION.RELEASE;
-            promise.resolve(platformVersion);
-        } catch (Exception e) {
-            promise.reject("PLATFORM_ERROR", "Failed to get platform version: " + e.getMessage());
+            FileInputStream fis = new FileInputStream(new File(reactContext.getFilesDir(), "../config.properties"));
+            properties.load(fis);
+            fis.close();
+        } catch (IOException e) {
+            android.util.Log.e("RNEasymerchantsdk", "Failed to load config.properties: " + e.getMessage());
         }
+        return properties;
     }
 
     @ReactMethod
@@ -45,65 +47,171 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
             return;
         }
 
-        try {
-            // Validate required fields
-            if (!configMap.hasKey("amount") || configMap.getString("amount") == null || configMap.getString("amount").isEmpty() || Float.parseFloat(configMap.getString("amount")) <= 0) {
-                promise.reject("VALIDATION_ERROR", "Invalid or missing amount.");
-                return;
-            }
-            if (!configMap.hasKey("apiKey") || configMap.getString("apiKey") == null || configMap.getString("apiKey").isEmpty()) {
-                promise.reject("VALIDATION_ERROR", "Missing or empty apiKey.");
-                return;
-            }
-            if (!configMap.hasKey("secretKey") || configMap.getString("secretKey") == null || configMap.getString("secretKey").isEmpty()) {
-                promise.reject("VALIDATION_ERROR", "Missing or empty secretKey.");
-                return;
-            }
-            if (!configMap.hasKey("jsonConfig") || configMap.getMap("jsonConfig") == null) {
-                promise.reject("VALIDATION_ERROR", "Missing jsonConfig.");
-                return;
-            }
+        new android.os.Handler(android.os.Looper.getMainLooper()).post(() -> {
+            try {
+                Properties configProps = loadConfigProperties();
+                String defaultApiKey = configProps.getProperty("SDK_API_KEY");
+                String defaultSecretKey = configProps.getProperty("SDK_SECRET_KEY");
 
-            String amount = configMap.getString("amount");
-            String apiKey = configMap.getString("apiKey");
-            String secretKey = configMap.getString("secretKey");
-            JSONObject jsonConfig = new JSONObject(configMap.getMap("jsonConfig").toHashMap());
+                String amount = configMap.getString("amount");
+                String apiKey = configMap.hasKey("apiKey") ? configMap.getString("apiKey") : defaultApiKey;
+                String secretKey = configMap.hasKey("secretKey") ? configMap.getString("secretKey") : defaultSecretKey;
 
-            String environment = jsonConfig.optString("environment", "sandbox").toLowerCase();
-            if (!environment.equals("staging") && !environment.equals("sandbox") && !environment.equals("production")) {
-                promise.reject("CONFIG_ERROR", "Invalid environment: " + environment);
-                return;
-            }
+                ReadableMap jsonConfigMap = configMap.getMap("jsonConfig");
+                JSONObject jsonConfig = new JSONObject();
+                jsonConfig.put("environment",
+                        jsonConfigMap.hasKey("environment") ? jsonConfigMap.getString("environment") : "sandbox"
+                );
+                jsonConfig.put("amount", amount);
+                jsonConfig.put("tokenOnly",
+                        jsonConfigMap.hasKey("tokenOnly") ? jsonConfigMap.getBoolean("tokenOnly") : false
+                );
+                jsonConfig.put("currency",
+                        jsonConfigMap.hasKey("currency") ? jsonConfigMap.getString("currency") : "usd"
+                );
+                jsonConfig.put("saveCard",
+                        jsonConfigMap.hasKey("saveCard") ? jsonConfigMap.getBoolean("saveCard") : false
+                );
+                jsonConfig.put("saveAccount",
+                        jsonConfigMap.hasKey("saveAccount") ? jsonConfigMap.getBoolean("saveAccount") : false
+                );
+                jsonConfig.put("authenticatedACH",
+                        jsonConfigMap.hasKey("authenticatedACH") ? jsonConfigMap.getBoolean("authenticatedACH") : false
+                );
+                jsonConfig.put("secureAuthentication",
+                        jsonConfigMap.hasKey("secureAuthentication") && !jsonConfigMap.isNull("secureAuthentication")
+                                ? jsonConfigMap.getBoolean("secureAuthentication")
+                                : false
+                );
 
-            EasyPaymentFactory easyPaymentFactory = EasyPaymentFactory.INSTANCE;
-            EasyPaymentService easyPaymentService = easyPaymentFactory.create(
-                    currentActivity,
-                    environment,
-                    apiKey,
-                    secretKey
-            );
-
-            easyPaymentService.makePayment(
-                    jsonConfig,
-                    new EasyPaymentFactory.OnTransactionListener() {
-                        @Override
-                        public void onSuccess(String response) {
-                            WritableMap result = Arguments.createMap();
-                            result.putString("response", response);
-                            promise.resolve(result);
-                        }
+                jsonConfig.put("showReceipt",
+                        jsonConfigMap.hasKey("showReceipt") ? jsonConfigMap.getBoolean("showReceipt") : true
+                );
+                jsonConfig.put("showDonate",
+                        jsonConfigMap.hasKey("showDonate") ? jsonConfigMap.getBoolean("showDonate") : false
+                );
+                jsonConfig.put("showTotal",
+                        jsonConfigMap.hasKey("showTotal") ? jsonConfigMap.getBoolean("showTotal") : true
+                );
+                jsonConfig.put("showSubmitButton",
+                        jsonConfigMap.hasKey("showSubmitButton") ? jsonConfigMap.getBoolean("showSubmitButton") : true
+                );
+                jsonConfig.put("email",
+                        jsonConfigMap.hasKey("email") ? jsonConfigMap.getString("email") : ""
+                );
+                jsonConfig.put("name",
+                        jsonConfigMap.hasKey("name") ? jsonConfigMap.getString("name") : ""
+                );
 
-                        @Override
-                        public void onError(String error) {
-                            promise.reject("PAYMENT_ERROR", error);
+
+                JSONArray paymentMethods = new JSONArray();
+                ReadableArray methods = jsonConfigMap.getArray("paymentMethod");
+                for (int i = 0; i < methods.size(); i++) {
+                    paymentMethods.put(methods.getString(i));
+                }
+                jsonConfig.put("paymentMethod", paymentMethods);
+
+                // Recurring
+                if (jsonConfigMap.hasKey("recurring")) {
+                    ReadableMap recurringMap = jsonConfigMap.getMap("recurring");
+                    JSONObject recurring = new JSONObject();
+                    recurring.put("enableRecurring", recurringMap.getBoolean("enableRecurring"));
+                    if (recurringMap.hasKey("recurringData")) {
+                        ReadableMap data = recurringMap.getMap("recurringData");
+                        JSONObject recurringData = new JSONObject();
+                        recurringData.put("allowCycles", data.getInt("allowCycles"));
+                        JSONArray intervals = new JSONArray();
+                        ReadableArray intervalArray = data.getArray("intervals");
+                        for (int i = 0; i < intervalArray.size(); i++) {
+                            intervals.put(intervalArray.getString(i));
                         }
+                        recurringData.put("intervals", intervals);
+                        recurringData.put("recurringStartType", data.getString("recurringStartType"));
+                        recurringData.put("recurringStartDate", data.getString("recurringStartDate"));
+                        recurring.put("recurringData", recurringData);
                     }
-            );
-        } catch (NumberFormatException ex) {
-            promise.reject("VALIDATION_ERROR", "Invalid amount format: " + ex.getMessage());
-        } catch (Exception ex) {
-            promise.reject("ERROR", "Payment failed: " + ex.getMessage());
-        }
+                    jsonConfig.put("recurring", recurring);
+                }
+
+                // Fields
+                if (jsonConfigMap.hasKey("fields")) {
+                    ReadableMap fieldsMap = jsonConfigMap.getMap("fields");
+                    JSONObject fields = new JSONObject();
+                    JSONObject visibility = new JSONObject();
+                    ReadableMap vis = fieldsMap.getMap("visibility");
+                    visibility.put("billing", vis.getBoolean("billing"));
+                    visibility.put("additional", vis.getBoolean("additional"));
+                    fields.put("visibility", visibility);
+
+                    JSONArray billing = new JSONArray();
+                    ReadableArray billingArray = fieldsMap.getArray("billing");
+                    for (int i = 0; i < billingArray.size(); i++) {
+                        ReadableMap item = billingArray.getMap(i);
+                        JSONObject obj = new JSONObject();
+                        obj.put("name", item.getString("name"));
+                        obj.put("required", item.getBoolean("required"));
+                        obj.put("value", item.getString("value"));
+                        billing.put(obj);
+                    }
+                    fields.put("billing", billing);
+
+                    JSONArray additional = new JSONArray();
+                    ReadableArray additionalArray = fieldsMap.getArray("additional");
+                    for (int i = 0; i < additionalArray.size(); i++) {
+                        ReadableMap item = additionalArray.getMap(i);
+                        JSONObject obj = new JSONObject();
+                        obj.put("name", item.getString("name"));
+                        obj.put("required", item.getBoolean("required"));
+                        obj.put("value", item.getString("value"));
+                        additional.put(obj);
+                    }
+                    fields.put("additional", additional);
+                    jsonConfig.put("fields", fields);
+                }
+
+                // GrailPay Params
+                if (jsonConfigMap.hasKey("grailPayParams")) {
+                    ReadableMap gp = jsonConfigMap.getMap("grailPayParams");
+                    JSONObject grail = new JSONObject();
+                    grail.put("role", gp.getString("role"));
+                    grail.put("timeout", gp.getInt("timeout"));
+                    grail.put("isSandbox", gp.getBoolean("isSandbox"));
+                    grail.put("brandingName", gp.getString("brandingName"));
+                    grail.put("finderSubtitle", gp.getString("finderSubtitle"));
+                    grail.put("searchPlaceholder", gp.getString("searchPlaceholder"));
+                    jsonConfig.put("grailPayParams", grail);
+                }
+
+                // Appearance Settings
+                if (jsonConfigMap.hasKey("appearanceSettings")) {
+                    ReadableMap a = jsonConfigMap.getMap("appearanceSettings");
+                    JSONObject appearance = new JSONObject();
+                    for (Map.Entry<String, Object> entry : a.toHashMap().entrySet()) {
+                        appearance.put(entry.getKey(), entry.getValue());
+                    }
+                    jsonConfig.put("appearanceSettings", appearance);
+                }
+
+                EasyPaymentFactory factory = EasyPaymentFactory.INSTANCE;
+                EasyPaymentService service = factory.create(currentActivity, jsonConfig.getString("environment"), apiKey, secretKey);
+
+                service.makePayment(jsonConfig, new EasyPaymentFactory.OnTransactionListener() {
+                    @Override
+                    public void onSuccess(String response) {
+                        WritableMap result = Arguments.createMap();
+                        result.putString("response", response);
+                        promise.resolve(result);
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        promise.reject("PAYMENT_ERROR", error);
+                    }
+                });
+            } catch (Exception e) {
+                promise.reject("ERROR", e.getMessage());
+            }
+        });
     }
 
     @ReactMethod
@@ -114,26 +222,29 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
             return;
         }
 
-        try {
-            EasyPaymentFactory easyPaymentFactory = EasyPaymentFactory.INSTANCE;
-            easyPaymentFactory.checkPaymentStatus(
-                    currentActivity,
-                    new EasyPaymentFactory.OnPaymentStatusCheckListener() {
-                        @Override
-                        public void onSuccess(JSONObject response) {
-                            WritableMap result = Arguments.createMap();
-                            result.putString("response", response.toString());
-                            promise.resolve(result);
-                        }
+        new android.os.Handler(android.os.Looper.getMainLooper()).post(() -> {
+            try {
+                EasyPaymentFactory.INSTANCE.checkPaymentStatus(currentActivity, new EasyPaymentFactory.OnPaymentStatusCheckListener() {
+                    @Override
+                    public void onSuccess(JSONObject response) {
+                        WritableMap result = Arguments.createMap();
+                        result.putString("response", response.toString());
+                        promise.resolve(result);
+                    }
 
-                        @Override
-                        public void onFailure(JSONObject error) {
-                            promise.reject("STATUS_CHECK_ERROR", error.toString());
-                        }
+                    @Override
+                    public void onFailure(JSONObject error) {
+                        promise.reject("STATUS_CHECK_ERROR", error.toString());
                     }
-            );
-        } catch (Exception ex) {
-            promise.reject("ERROR", "Failed to check payment status: " + ex.getMessage());
-        }
+                });
+            } catch (Exception e) {
+                promise.reject("ERROR", "Failed to check payment status: " + e.getMessage());
+            }
+        });
+    }
+
+    @ReactMethod
+    public void paymentReference(String referenceToken, Promise promise) {
+        promise.reject("UNSUPPORTED_ERROR", "Payment reference is not supported on Android.");
     }
 }

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/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -633,7 +633,9 @@ class AdditionalInfoVC: BaseVC {
             "customer" : selectedCard?.customerId ?? "",
             "customer_id" : selectedCard?.customerId ?? "",
             "card_id" : selectedCard?.cardId ?? "",
-            "cvc" : cvvText ?? ""
+            "cvc" : cvvText ?? "",
+            "name": UserStoreSingleton.shared.merchantName ?? "",
+            "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
         // Conditionally add billing info
@@ -710,6 +712,8 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             uRLRequest.httpBody = jsonData
@@ -834,7 +838,7 @@ class AdditionalInfoVC: BaseVC {
         
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
-            "email": userEmail ?? "",
+            "email": UserStoreSingleton.shared.verificationEmail ?? "",
             "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
             "cardholder_name": nameOnCard ?? "",
             "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
@@ -1214,6 +1218,7 @@ class AdditionalInfoVC: BaseVC {
             "payment_method": "ach",
             "customer": customerID ?? "",
             "currency": "usd",
+            "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
         // Conditionally add billing info

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

@@ -1606,7 +1606,9 @@ class BillingInfoVC: BaseVC {
             "customer" : selectedCard?.customerId ?? "",
             "customer_id" : selectedCard?.customerId ?? "",
             "card_id" : selectedCard?.cardId ?? "",
-            "cvc" : cvvText ?? ""
+            "cvc" : cvvText ?? "",
+            "name": UserStoreSingleton.shared.merchantName ?? "",
+            "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
         // Conditionally add billing info
@@ -1668,6 +1670,8 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             uRLRequest.httpBody = jsonData
@@ -1777,11 +1781,12 @@ class BillingInfoVC: BaseVC {
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         var params: [String: Any] = [
-            "name": nameOnCard ?? "",
+            "name": UserStoreSingleton.shared.merchantName ?? "",
             "account_id": accountID ?? "",
             "payment_method": "ach",
             "customer": customerID ?? "",
             "currency": "usd",
+            "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
         // Conditionally add billing info

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -550,7 +550,7 @@ class OTPVerificationVC: BaseVC {
             "cvc": cvv ?? "",
             "currency": "usd",
             // "payment_method": selectedPaymentMethod ?? "",
-            "save_card": 1,
+            "save_card": "1",
             "is_default": "1",
             // "create_customer": "1"
             "email": userEmail ?? ""