@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,17 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:1-4:12
+INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:1-4:12
+	package
+		ADDED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:3:11-37
+		INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:11-69
+uses-sdk
+INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/appdev/Documents/GitHub/lyfecycle-sample-RN-sdk/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -39,11 +39,14 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.1.7'
+    implementation 'com.app:paysdk:1.2.2'
     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

@@ -1,28 +1,33 @@
 package com.reactlibrary;
 
+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 java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import android.app.Activity;
-
-import com.facebook.react.bridge.Callback;
-
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.Arguments;
 import org.json.JSONObject;
-
-
-import com.app.paysdk.init.EasyPaymentFactory;
-import com.app.paysdk.service.EasyPaymentService;
+import org.json.JSONArray;
+import org.json.JSONException;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 
 public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
-    RNEasymerchantsdkModule(ReactApplicationContext context) {
+    private final ReactApplicationContext reactContext;
+
+    public RNEasymerchantsdkModule(ReactApplicationContext context) {
         super(context);
+        this.reactContext = context;
     }
 
+    @NonNull
     @Override
     public String getName() {
         return "RNEasymerchantsdk";
@@ -34,40 +39,157 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
             String platformVersion = "Android " + android.os.Build.VERSION.RELEASE;
             promise.resolve(platformVersion);
         } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
+            promise.reject("ERROR", "Failed to get platform version: " + e.getMessage());
         }
     }
 
     @ReactMethod
-    public void billing(String amount, String billinginfo, Promise promise) {
+    public void makePayment(ReadableMap configMap, Promise promise) {
         Activity currentActivity = getCurrentActivity();
         if (currentActivity == null) {
-            promise.reject("ERROR", "Activity is not initialized");
+            promise.reject("ERROR", "Activity is not initialized.");
             return;
         }
 
         try {
+            // Validate required fields
+            if (!configMap.hasKey("amount") || configMap.getString("amount").isEmpty() || Float.parseFloat(configMap.getString("amount")) <= 0) {
+                promise.reject("ERROR", "Invalid or missing amount.");
+                return;
+            }
 
-            // Making the payment call
-            new EasyPaymentService(currentActivity).makePayment(amount, (billinginfo == null) ? null : new JSONObject(billinginfo), new EasyPaymentFactory.OnTransactionListener() {
-                @Override
-                public void onSuccess(String response) {
-                    promise.resolve(response); // Resolve the promise on success
-                }
-
-                @Override
-                public void onError(String error) {
-                    promise.reject("ERROR", error); // Reject the promise on error
-                }
-            });
-        } catch (Exception e) {
-            promise.reject("ERROR", e.getMessage());
+            if (!configMap.hasKey("apiKey") || !configMap.hasKey("secretKey")) {
+                promise.reject("ERROR", "Missing apiKey or secretKey.");
+                return;
+            }
+
+            // Extract configurations
+            String amountStr = configMap.getString("amount");
+            String apiKey = configMap.getString("apiKey");
+            String secretKey = configMap.getString("secretKey");
+            JSONObject jsonConfig = new JSONObject(configMap.getMap("jsonConfig").toHashMap());
+            ReadableMap hashMapConfig = configMap.getMap("hashMapConfig");
+
+            // Build hashMap configuration
+            HashMap<String, Object> hashMap = new HashMap<>();
+            hashMap.put("amount", hashMapConfig.getString("amount"));
+            hashMap.put("currency", hashMapConfig.getString("currency"));
+            hashMap.put("tokenOnly", hashMapConfig.getBoolean("tokenOnly"));
+            hashMap.put("saveCard", hashMapConfig.getBoolean("saveCard"));
+            hashMap.put("saveAccount", hashMapConfig.getBoolean("saveAccount"));
+
+            // Handle payment methods
+            ReadableArray paymentMethodsArray = hashMapConfig.getArray("paymentMethods");
+            List<String> paymentMethods = new ArrayList<>();
+            for (int i = 0; i < paymentMethodsArray.size(); i++) {
+                paymentMethods.add(paymentMethodsArray.getString(i));
+            }
+            hashMap.put("paymentMethods", paymentMethods);
+
+            hashMap.put("fontSize", (float) hashMapConfig.getDouble("fontSize"));
+            hashMap.put("showDonate", hashMapConfig.getBoolean("showDonate"));
+            hashMap.put("enableRecurring", hashMapConfig.getBoolean("enableRecurring"));
+
+            // Handle recurring data
+            ReadableMap recurringDataMap = hashMapConfig.getMap("recurringData");
+            JSONObject recurringInfo = new JSONObject();
+            recurringInfo.put("allowCycles", recurringDataMap.getInt("allowCycles"));
+            ReadableArray intervalsArray = recurringDataMap.getArray("intervals");
+            JSONArray intervals = new JSONArray();
+            for (int i = 0; i < intervalsArray.size(); i++) {
+                intervals.put(intervalsArray.getString(i));
+            }
+            recurringInfo.put("intervals", intervals);
+            recurringInfo.put("recurringStartType", recurringDataMap.getString("recurringStartType"));
+            hashMap.put("recurringData", recurringInfo);
+
+            hashMap.put("authenticateBank", hashMapConfig.getBoolean("authenticateBank"));
+
+            // Handle GrailPayParams
+            ReadableMap grailPayParamsMap = hashMapConfig.getMap("grailPayParams");
+            JSONObject grailPayParamsJson = new JSONObject();
+            grailPayParamsJson.put("accessToken", grailPayParamsMap.getString("accessToken"));
+            grailPayParamsJson.put("vendorId", grailPayParamsMap.getString("vendorId"));
+            grailPayParamsJson.put("role", grailPayParamsMap.getString("role"));
+            grailPayParamsJson.put("timeout", grailPayParamsMap.getInt("timeout"));
+            grailPayParamsJson.put("isSandbox", grailPayParamsMap.getBoolean("isSandbox"));
+            grailPayParamsJson.put("brandingName", grailPayParamsMap.getString("brandingName"));
+            grailPayParamsJson.put("finderSubtitle", grailPayParamsMap.getString("finderSubtitle"));
+            grailPayParamsJson.put("searchPlaceholder", grailPayParamsMap.getString("searchPlaceholder"));
+            hashMap.put("grailPayParams", grailPayParamsJson);
+
+            hashMap.put("is3DSecureEnable", hashMapConfig.getBoolean("is3DSecureEnable"));
+            hashMap.put("showPrice", hashMapConfig.getBoolean("showPrice"));
+
+            // Handle billing info
+            if (hashMapConfig.hasKey("billingInfo")) {
+                JSONObject billingInfo = new JSONObject(hashMapConfig.getMap("billingInfo").toHashMap());
+                hashMap.put("billingInfo", billingInfo);
+            }
+
+
+
+            EasyPaymentFactory easyPaymentFactory = EasyPaymentFactory.INSTANCE;
+            EasyPaymentService easyPaymentService  = easyPaymentFactory.create(
+                    currentActivity,
+                    jsonConfig.getString("environment"),
+                    apiKey,
+                    secretKey);
+
+
+            // Make payment
+            easyPaymentService.makePayment(
+                    jsonConfig,
+                    hashMap,
+                    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 (JSONException ex) {
+            promise.reject("JSON_ERROR", "Invalid JSON configuration: " + ex.getMessage());
+        } catch (Exception ex) {
+            promise.reject("ERROR", "Payment failed: " + ex.getMessage());
         }
+    }
 
-//        } catch (Exception e) {
-//          promise.reject("ERROR", e.getMessage() != null ? e.getMessage() : "Unknown error");
-//        }
-//      }
-//    });
+    @ReactMethod
+    public void checkPaymentStatus(Promise promise) {
+        Activity currentActivity = getCurrentActivity();
+        if (currentActivity == null) {
+            promise.reject("ERROR", "Activity is not initialized.");
+            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);
+                        }
+
+                        @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());
+        }
     }
-}
+}

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

@@ -1,28 +1,60 @@
-package com.reactlibrary;
+//package com.reactlibrary;
+//
+//import java.util.Arrays;
+//import java.util.Collections;
+//import java.util.List;
+//
+//import com.facebook.react.ReactPackage;
+//import com.facebook.react.bridge.NativeModule;
+//import com.facebook.react.bridge.ReactApplicationContext;
+//import com.facebook.react.uimanager.ViewManager;
+//import com.facebook.react.bridge.JavaScriptModule;
+//
+//public class RNEasymerchantsdkPackage implements ReactPackage {
+//    @Override
+//    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+//      return Arrays.<NativeModule>asList(new RNEasymerchantsdkModule(reactContext));
+//    }
+//
+//    // Deprecated from RN 0.47
+//    public List<Class<? extends JavaScriptModule>> createJSModules() {
+//      return Collections.emptyList();
+//    }
+//
+//    @Override
+//    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+//      return Collections.emptyList();
+//    }
+//}
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+
+
+
+
+package com.reactlibrary;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class RNEasymerchantsdkPackage implements ReactPackage {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-      return Arrays.<NativeModule>asList(new RNEasymerchantsdkModule(reactContext));
-    }
-
-    // Deprecated from RN 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-      return Collections.emptyList();
+        List<NativeModule> modules = new ArrayList<>();
+        modules.add(new RNEasymerchantsdkModule(reactContext));
+        return modules;
     }
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-      return Collections.emptyList();
+        return Collections.emptyList();
     }
-}
+}
+
+
+

package/ios/Classes/EasyMerchantSdk.m

@@ -1,11 +1,11 @@
 #import "EasyMerchantSdk.h"
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
-#import <easymerchantsdk/easymerchantsdk-Swift.h>
 
-//  #import <easymerchantsdk-Swift.h>
+#import <easymerchantsdk-Swift.h>
+//#import <easymerchantsdk/easymerchantsdk-Swift.h>
 
-@interface EasyMerchantSdk()
+@interface EasyMerchantSdk ()
 @property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;
 @end
 
@@ -20,78 +20,129 @@ RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env
     if (!self.sdkPluginInstance) {
         self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
     }
-    [self.sdkPluginInstance configureEnvironment:env apiKey:apiKey apiSecret:apiSecret];
+    @try {
+        [self.sdkPluginInstance configureEnvironment:env apiKey:apiKey apiSecret:apiSecret];
+    } @catch (NSException *exception) {
+        RCTLogError(@"Failed to call configureEnvironment: %@", exception.reason);
+    }
 }
 
 RCT_EXPORT_METHOD(
-        billing:(NSString *)amount
-        billingInfo:(NSString *)billingInfo
-        paymentMethods:(NSArray *)paymentMethods
-        themeConfiguration:(NSDictionary *)themeConfiguration
-        tokenOnly:(BOOL)tokenOnly
-        saveCard:(BOOL)saveCard
-        saveAccount:(BOOL)saveAccount
-        authenticatedACH:(BOOL)authenticatedACH
-        grailPayParams:(NSDictionary *)grailPayParams
-        submitButtonText:(NSString *)submitButtonText
-        isRecurring:(BOOL)isRecurring
-        recurringIntervals:(NSArray *)recurringIntervals
-        recurringStartDateType:(NSString *)recurringStartDateType
-        recurringStartDate:(NSString *)recurringStartDate
-        enable3DS:(BOOL)enable3DS
-        resolver:(RCTPromiseResolveBlock)resolve
-        rejecter:(RCTPromiseRejectBlock)reject
+    billing:(NSString *)amount
+    currency:(NSString *)currency
+    billingInfo:(NSDictionary *)billingInfo
+    paymentMethods:(NSArray *)paymentMethods
+    themeConfiguration:(NSDictionary *)themeConfiguration
+    tokenOnly:(BOOL)tokenOnly
+    saveCard:(BOOL)saveCard
+    saveAccount:(BOOL)saveAccount
+    authenticatedACH:(BOOL)authenticatedACH
+    grailPayParams:(NSDictionary *)grailPayParams
+    submitButtonText:(NSString *)submitButtonText
+    isRecurring:(BOOL)isRecurring
+    recurringIntervals:(NSArray *)recurringIntervals
+    recurringStartDateType:(NSString *)recurringStartDateType
+    recurringStartDate:(NSString *)recurringStartDate
+    secureAuthentication:(BOOL)secureAuthentication
+    showReceipt:(BOOL)showReceipt
+    showTotal:(BOOL)showTotal
+    showSubmitButton:(BOOL)showSubmitButton
+    resolver:(RCTPromiseResolveBlock)resolve
+    rejecter:(RCTPromiseRejectBlock)reject
 )
 {
     if (!self.sdkPluginInstance) {
         self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
     }
-
-    [self.sdkPluginInstance billing:amount
-                        billinginfo:billingInfo
-                     paymentMethods:paymentMethods
-                 themeConfiguration:themeConfiguration
-                          tokenOnly:tokenOnly
-                           saveCard:saveCard
-                        saveAccount:saveAccount
-                   authenticatedACH:authenticatedACH
-                     grailPayParams:grailPayParams
-                   submitButtonText:submitButtonText
-                        isRecurring:isRecurring
-                 recurringIntervals:recurringIntervals
-             recurringStartDateType:recurringStartDateType
-                 recurringStartDate:recurringStartDate
-                          enable3DS:enable3DS
-                           resolver:^(id result) {
-                               resolve(result);
-                               self.sdkPluginInstance = nil;
-                           }
-                           rejecter:^(NSString *code, NSString *message, NSError *error) {
-                               reject(code, message, error);
-                               self.sdkPluginInstance = nil;
-                           }];
+    @try {
+        [self.sdkPluginInstance billing:amount
+                               currency:currency
+                            billingInfo:billingInfo
+                         paymentMethods:paymentMethods
+                     themeConfiguration:themeConfiguration
+                              tokenOnly:tokenOnly
+                               saveCard:saveCard
+                            saveAccount:saveAccount
+                       authenticatedACH:authenticatedACH
+                         grailPayParams:grailPayParams
+                       submitButtonText:submitButtonText
+                            isRecurring:isRecurring
+                     recurringIntervals:recurringIntervals
+                 recurringStartDateType:recurringStartDateType
+                     recurringStartDate:recurringStartDate
+                   secureAuthentication:secureAuthentication
+                            showReceipt:showReceipt
+                             showTotal:showTotal
+                       showSubmitButton:showSubmitButton
+                              enable3DS:secureAuthentication
+                               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 billing: %@", exception.reason], nil);
+    }
 }
 
-
-
-
+RCT_EXPORT_METHOD(
+    paymentReference:(NSString *)referenceToken
+    resolver:(RCTPromiseResolveBlock)resolve
+    rejecter:(RCTPromiseRejectBlock)reject
+)
+{
+    if (!self.sdkPluginInstance) {
+        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
+    }
+    @try {
+        [self.sdkPluginInstance paymentReference:referenceToken
+                                       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 paymentReference: %@", exception.reason], nil);
+    }
+}
 
 RCT_REMAP_METHOD(setViewController,
                  setViewControllerWithResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    UIViewController *rootVC = [UIApplication sharedApplication].delegate.window.rootViewController;
-    EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
-    [sdkPlugin setViewController:rootVC];
-    resolve(@"ViewController set");
+    @try {
+        UIViewController *rootVC = [UIApplication sharedApplication].delegate.window.rootViewController;
+        if (!rootVC) {
+            reject(@"NO_ROOT_VC", @"No root view controller found", nil);
+            return;
+        }
+        EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
+        [sdkPlugin setViewController:rootVC];
+        resolve(@"ViewController set");
+    } @catch (NSException *exception) {
+        reject(@"BRIDGE_ERROR", [NSString stringWithFormat:@"Failed to set view controller: %@", exception.reason], nil);
+    }
 }
 
-
 RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSString *platformVersion = [NSString stringWithFormat:@"iOS %@", [[UIDevice currentDevice] systemVersion]];
-    resolve(platformVersion);
+    @try {
+        EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
+        [sdkPlugin getPlatformVersion:^(id result) {
+            resolve(result);
+        } rejecter:^(NSString *code, NSString *message, NSError *error) {
+            reject(code, message, error);
+        }];
+    } @catch (NSException *exception) {
+        reject(@"BRIDGE_ERROR", [NSString stringWithFormat:@"Failed to get platform version: %@", exception.reason], nil);
+    }
 }
 
 @end