@jimrising/easymerchantsdk-react-native 2.1.6 → 2.1.7

package/android/build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.6.0-debug'
+    implementation 'com.app:paysdk:1.6.0.1'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"

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

@@ -52,208 +52,10 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
 
         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.hasKey("apiKey") ? configMap.getString("apiKey") : defaultApiKey;
-                String secretKey = configMap.hasKey("secretKey") ? configMap.getString("secretKey") : defaultSecretKey;
-
-                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
-                );
-                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("isEmail",
-                        jsonConfigMap.hasKey("isEmail") ? jsonConfigMap.getBoolean("isEmail") : false
-                );
-                jsonConfig.put("email",
-                        jsonConfigMap.hasKey("email") ? jsonConfigMap.getString("email") : ""
-                );
-                jsonConfig.put("name",
-                        jsonConfigMap.hasKey("name") ? jsonConfigMap.getString("name") : ""
-                );
-
-                if (jsonConfigMap.hasKey("metadata")) {
-                    ReadableMap metadataMap = jsonConfigMap.getMap("metadata");
-                    JSONObject metadata = new JSONObject();
-                    for (Map.Entry<String, Object> entry : metadataMap.toHashMap().entrySet()) {
-                        metadata.put(entry.getKey(), entry.getValue());
-                    }
-                    jsonConfig.put("metadata", metadata);
-                }
-
-
-                // Payment Methods
-                if (jsonConfigMap.hasKey("paymentMethods") && !jsonConfigMap.isNull("paymentMethods")) {
-                    ReadableArray methods = jsonConfigMap.getArray("paymentMethods");
-                    JSONArray paymentMethods = new JSONArray();
-
-                    for (int i = 0; i < methods.size(); i++) {
-                        if (methods.getType(i) == ReadableType.String) {
-                            // Case: simple array of strings
-                            paymentMethods.put(methods.getString(i));
-                        } else if (methods.getType(i) == ReadableType.Map) {
-                            // Case: array of objects
-                            ReadableMap item = methods.getMap(i);
-                            JSONObject obj = new JSONObject(item.toHashMap());
-                            paymentMethods.put(obj);
-                        }
-                    }
-
-                    jsonConfig.put("paymentMethods", paymentMethods);
-                }
-
-
-                // Recurring (flattened to match SDK)
-                if (jsonConfigMap.hasKey("recurring")) {
-                    ReadableMap recurringMap = jsonConfigMap.getMap("recurring");
-
-                    if (recurringMap.hasKey("enableRecurring") && recurringMap.getBoolean("enableRecurring")) {
-                        jsonConfig.put("is_recurring", true);
-
-                        if (recurringMap.hasKey("recurringData")) {
-                            ReadableMap data = recurringMap.getMap("recurringData");
-
-                            if (data.hasKey("allowCycles")) {
-                                jsonConfig.put("numOfCycle", data.getInt("allowCycles"));
-                            }
-
-                            if (data.hasKey("intervals")) {
-                                JSONArray intervals = new JSONArray();
-                                ReadableArray intervalArray = data.getArray("intervals");
-                                for (int i = 0; i < intervalArray.size(); i++) {
-                                    intervals.put(intervalArray.getString(i));
-                                }
-                                jsonConfig.put("recurringIntervals", intervals);
-                            }
-
-                            if (data.hasKey("recurringStartType")) {
-                                jsonConfig.put("recurringStartDateType", data.getString("recurringStartType"));
-                            }
-
-                            if (data.hasKey("recurringStartDate")) {
-                                jsonConfig.put("recurringStartDate", data.getString("recurringStartDate"));
-                            }
-                        }
-                    }
-                }
-
-// Appearance settings (fix typo handling)
-                if (jsonConfigMap.hasKey("appearanceSettings")) {
-                    JSONObject appearance = new JSONObject();
-                    ReadableMap appMap = jsonConfigMap.getMap("appearanceSettings");
-                    for (Map.Entry<String, Object> entry : appMap.toHashMap().entrySet()) {
-                        appearance.put(entry.getKey(), entry.getValue());
-                    }
-                    jsonConfig.put("appearanceSettings", appearance);
-                    jsonConfig.put("apperanceSettings", appearance); // duplicate for SDK compatibility
-                } else if (jsonConfigMap.hasKey("apperanceSettings")) {
-                    // backwards case: copy typo version into correct key
-                    JSONObject appearance = new JSONObject();
-                    ReadableMap appMap = jsonConfigMap.getMap("apperanceSettings");
-                    for (Map.Entry<String, Object> entry : appMap.toHashMap().entrySet()) {
-                        appearance.put(entry.getKey(), entry.getValue());
-                    }
-                    jsonConfig.put("appearanceSettings", appearance);
-                    jsonConfig.put("apperanceSettings", appearance);
-                }
-
-
-                // 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);
-                }
-
-
-
-
+               
+                JSONObject jsonConfig = new JSONObject(configMap.toHashMap());
                 EasyPaymentFactory factory = EasyPaymentFactory.INSTANCE;
                 EasyPaymentService service = factory.create(currentActivity);
-                jsonConfig.put("apiKey", apiKey);
-                jsonConfig.put("secretKey", secretKey);
-                jsonConfig.put("environment", jsonConfig.getString("environment"));
-
-
-
                 service.makePayment(jsonConfig, new EasyPaymentFactory.OnTransactionListener() {
 
                     @Override

package/ios/Classes/EasyMerchantSdk.m

@@ -28,6 +28,30 @@ RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env
     }
 }
 
+RCT_EXPORT_METHOD(
+    billingWithConfig:(NSString *)jsonConfig
+    resolver:(RCTPromiseResolveBlock)resolve
+    rejecter:(RCTPromiseRejectBlock)reject
+)
+{
+    if (!self.sdkPluginInstance) {
+        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
+    }
+    @try {
+        [self.sdkPluginInstance billingWithConfig:jsonConfig
+                                        resolver:^(id result) {
+                                            resolve(result);
+                                            self.sdkPluginInstance = nil;
+                                        }
+                                        rejecter:^(NSString *code, NSString *message, NSError *error) {
+                                            reject(code, message, error);
+                                            self.sdkPluginInstance = nil;
+                                        }];
+    } @catch (NSException *exception) {
+        reject(@"BRIDGE_ERROR", [NSString stringWithFormat:@"Failed to call billingWithConfig: %@", exception.reason], nil);
+    }
+}
+
 RCT_EXPORT_METHOD(
     billing:(NSString *)amount
     currency:(NSString *)currency
@@ -41,7 +65,7 @@ RCT_EXPORT_METHOD(
     grailPayParams:(NSDictionary *)grailPayParams
     submitButtonText:(NSString *)submitButtonText
     isRecurring:(BOOL)isRecurring
-    numOfCycle:(int)numOfCycle
+    numOfCycle:(NSInteger)numOfCycle
     recurringIntervals:(NSArray *)recurringIntervals
     recurringStartDateType:(NSString *)recurringStartDateType
     recurringStartDate:(NSString *)recurringStartDate
@@ -52,7 +76,8 @@ RCT_EXPORT_METHOD(
     isEmail:(BOOL)isEmail
     email:(NSString *)email
     name:(NSString *)name
-        metadata:(NSDictionary *)metadata
+    enable3DS:(BOOL)enable3DS
+    metadata:(NSDictionary *)metadata
     resolver:(RCTPromiseResolveBlock)resolve
     rejecter:(RCTPromiseRejectBlock)reject
 )
@@ -84,7 +109,7 @@ RCT_EXPORT_METHOD(
                                 isEmail:isEmail
                                   email:email
                                    name:name
-                              enable3DS:secureAuthentication
+                              enable3DS:enable3DS
                                metadata:metadata
                                resolver:^(id result) {
                                    resolve(result);

package/ios/Classes/EasyMerchantSdk.swift

@@ -58,6 +58,139 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
     }
 
+    // MARK: - billingWithConfig(...) Exposed to RN - Unified Config Method
+    @objc public func billingWithConfig(
+        _ jsonConfig: String,
+        resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        // Parse the JSON config string
+        guard let configData = jsonConfig.data(using: .utf8),
+              let config = try? JSONSerialization.jsonObject(with: configData) as? [String: Any] else {
+            rejecter("INVALID_CONFIG", "Failed to parse JSON config", nil)
+            return
+        }
+        
+        // Extract values from config with defaults
+        let amount: String
+        if let amountValue = config["amount"] {
+            if let amountString = amountValue as? String {
+                amount = amountString
+            } else if let amountNumber = amountValue as? NSNumber {
+                amount = amountNumber.stringValue
+            } else if let amountDouble = amountValue as? Double {
+                amount = String(amountDouble)
+            } else {
+                amount = "0"
+            }
+        } else {
+            amount = "0"
+        }
+        
+        let currency = config["currency"] as? String ?? "usd"
+        let fields = config["fields"] as? [String: Any]
+        var paymentMethods = config["paymentMethods"] as? [String] ?? ["card"]
+        
+        // If "ach" is present and "bank" is not, convert "ach" to "bank"
+        if paymentMethods.contains("ach") && !paymentMethods.contains("bank") {
+            print("🔄 iOS SDK: Converting 'ach' to 'bank' for payment methods")
+            paymentMethods = paymentMethods.map { method in
+                method.lowercased() == "ach" ? "bank" : method
+            }
+        }
+        let appearanceSettings = config["appearanceSettings"] as? [String: Any]
+        let tokenOnly = config["tokenOnly"] as? Bool ?? false
+        let saveCard = config["saveCard"] as? Bool ?? true
+        let saveAccount = config["saveAccount"] as? Bool ?? true
+        let authenticatedACH = config["authenticatedACH"] as? Bool ?? false
+        let grailPayParams = config["grailPayParams"] as? [String: Any]
+        let submitButtonText = config["submitButtonText"] as? String ?? "Submit"
+        let isRecurring = config["is_recurring"] as? Bool ?? false
+        let numOfCycle = config["numOfCycle"] as? Int ?? 1
+        let recurringIntervals = config["recurringIntervals"] as? [String]
+        let recurringStartDateType = config["recurringStartDateType"] as? String
+        let recurringStartDate = config["recurringStartDate"] as? String
+        let secureAuthentication = config["secureAuthentication"] as? Bool ?? false
+        let showReceipt = config["showReceipt"] as? Bool ?? true
+        let showTotal = config["showTotal"] as? Bool ?? true
+        let showSubmitButton = config["showSubmitButton"] as? Bool ?? true
+        let isEmail = config["isEmail"] as? Bool ?? true
+        let email = config["email"] as? String
+        let name = config["name"] as? String
+        let enable3DS = false // Default to false for now
+        let metadata = config["metadata"] as? [String : Any]
+        
+        // Log what iOS is reading - clean and concise
+        print("=== iOS SDK: VALUES READ FROM JSON ===")
+        print("Amount: \(amount)")
+        print("Currency: \(currency ?? "nil")")
+        print("Payment Methods: \(paymentMethods)")
+        print("Email: \(email ?? "nil")")
+        print("Name: \(name ?? "nil")")
+        print("Token Only: \(tokenOnly)")
+        print("Save Card: \(saveCard)")
+        print("Save Account: \(saveAccount)")
+        print("Authenticated ACH: \(authenticatedACH)")
+        print("Is Recurring: \(isRecurring)")
+        print("Recurring Cycles: \(numOfCycle)")
+        print("Recurring Intervals: \(recurringIntervals ?? [])")
+        print("Recurring Start Date: \(recurringStartDate ?? "nil")")
+        print("Secure Authentication: \(secureAuthentication)")
+        print("Show Receipt: \(showReceipt)")
+        print("Show Total: \(showTotal)")
+        print("Show Submit Button: \(showSubmitButton)")
+        print("Is Email: \(isEmail)")
+        
+        if let appearance = appearanceSettings {
+            print("Appearance Settings: \(appearance)")
+        }
+        
+        if let grail = grailPayParams {
+            print("Grail Pay Params: \(grail)")
+        }
+        
+        if let fieldsData = fields {
+            print("Fields: \(fieldsData)")
+        }
+        
+        if let meta = metadata {
+            print("Metadata: \(meta)")
+        } else {
+            print("⚠️ Metadata is nil!")
+        }
+        
+        // Call the existing billing method with extracted parameters
+        billing(
+            amount,
+            currency: currency,
+            fields: fields,
+            paymentMethods: paymentMethods,
+            appearanceSettings: appearanceSettings,
+            tokenOnly: tokenOnly,
+            saveCard: saveCard,
+            saveAccount: saveAccount,
+            authenticatedACH: authenticatedACH,
+            grailPayParams: grailPayParams,
+            submitButtonText: submitButtonText,
+            isRecurring: isRecurring,
+            numOfCycle: numOfCycle,
+            recurringIntervals: recurringIntervals,
+            recurringStartDateType: recurringStartDateType,
+            recurringStartDate: recurringStartDate,
+            secureAuthentication: secureAuthentication,
+            showReceipt: showReceipt,
+            showTotal: showTotal,
+            showSubmitButton: showSubmitButton,
+            isEmail: isEmail,
+            email: email,
+            name: name,
+            enable3DS: enable3DS,
+            metadata: metadata,
+            resolver: resolver,
+            rejecter: rejecter
+        )
+    }
+
     // MARK: - billing(...) Exposed to RN
     @objc public func billing(
         _ amount: String,
@@ -103,23 +236,27 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             var additionalVisibility = true
 
             // Parse billing fields
-            if let billing = billingDict["billing"] as? [String: Any] {
-                for (key, value) in billing {
-                    guard let fieldValue = value as? String else { continue }
-                    let required = (billingDict["billingRequired"] as? [String: Bool])?[key] ?? false
-                    if let billingField = BillingFieldName(rawValue: key) {
-                        billingFields.append(FieldItem(name: billingField, required: required, value: fieldValue))
+            if let billing = billingDict["billing"] as? [[String: Any]] {
+                for field in billing {
+                    guard let name = field["name"] as? String,
+                          let value = field["value"] as? String,
+                          let required = field["required"] as? Bool else { continue }
+                    
+                    if let billingField = BillingFieldName(rawValue: name) {
+                        billingFields.append(FieldItem(name: billingField, required: required, value: value))
                     }
                 }
             }
 
             // Parse additional fields
-            if let additional = billingDict["additional"] as? [String: Any] {
-                for (key, value) in additional {
-                    guard let fieldValue = value as? String else { continue }
-                    let required = (billingDict["additionalRequired"] as? [String: Bool])?[key] ?? false
-                    if let additionalField = AdditionalFieldName(rawValue: key) {
-                        additionalFields.append(FieldItem(name: additionalField, required: required, value: fieldValue))
+            if let additional = billingDict["additional"] as? [[String: Any]] {
+                for field in additional {
+                    guard let name = field["name"] as? String,
+                          let value = field["value"] as? String,
+                          let required = field["required"] as? Bool else { continue }
+                    
+                    if let additionalField = AdditionalFieldName(rawValue: name) {
+                        additionalFields.append(FieldItem(name: additionalField, required: required, value: value))
                     }
                 }
             }
@@ -144,8 +281,18 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             }
         }
 
-        // 3) Map payment methods
-        let methods: [PaymentMethod] = paymentMethods.compactMap {
+        // 3) Map payment methods with ACH to Bank conversion
+        var processedPaymentMethods = paymentMethods
+        
+        // If "ach" is present and "bank" is not, convert "ach" to "bank"
+        if processedPaymentMethods.contains("ach") && !processedPaymentMethods.contains("bank") {
+            print("🔄 iOS SDK: Converting 'ach' to 'bank' for payment methods")
+            processedPaymentMethods = processedPaymentMethods.map { method in
+                method.lowercased() == "ach" ? "bank" : method
+            }
+        }
+        
+        let methods: [PaymentMethod] = processedPaymentMethods.compactMap {
             switch $0.lowercased() {
             case "card":   return .Card
             case "bank":   return .Bank
@@ -154,6 +301,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             default:       return nil
             }
         }
+        
+        print("📱 iOS SDK: Payment Methods - Original: \(paymentMethods), Processed: \(processedPaymentMethods), Mapped: \(methods)")
 
         // 4) Prepare GrailPayRequest if needed
         var grailParams: GrailPayRequest? = nil

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '2.1.6'
+  s.version          = '2.1.7'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "",
   "main": "index.js",
   "scripts": {