@jimrising/easymerchantsdk-react-native 2.2.9 → 2.3.1

package/ios/Classes/EasyMerchantSdk.m

@@ -2,7 +2,7 @@
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
 
-//#import <easymerchantsdk-Swift.h>
+//#import "easymerchantsdk-Swift.h"
 #import <easymerchantsdk/easymerchantsdk-Swift.h>
 
 
@@ -14,171 +14,154 @@
 
 RCT_EXPORT_MODULE()
 
+- (instancetype)init {
+  if (self = [super init]) {
+    _sdkPluginInstance = [EasyMerchantSdkPlugin new];
+  }
+  return self;
+}
+
 RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env
                   apiKey:(NSString *)apiKey
-                  apiSecret:(NSString *)apiSecret)
+                  apiSecret:(NSString *)apiSecret
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
+  dispatch_async(dispatch_get_main_queue(), ^{
     if (!self.sdkPluginInstance) {
-        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
+      reject(@"NO_SDK_INSTANCE", @"SDK plugin instance is not initialized", nil);
+      return;
     }
-    @try {
-        [self.sdkPluginInstance configureEnvironment:env apiKey:apiKey apiSecret:apiSecret];
-    } @catch (NSException *exception) {
-        RCTLogError(@"Failed to call configureEnvironment: %@", exception.reason);
+
+    NSArray<NSString *> *validEnvs = @[@"production", @"sandbox", @"staging"];
+    if (![validEnvs containsObject:env.lowercaseString]) {
+      reject(@"INVALID_ENVIRONMENT", @"Environment must be 'production', 'sandbox', or 'staging'", nil);
+      return;
     }
+
+    [self.sdkPluginInstance configureEnvironment:env
+                                          apiKey:apiKey
+                                       apiSecret:apiSecret
+                                         resolver:resolve
+                                         rejecter:reject];
+  });
 }
 
-RCT_EXPORT_METHOD(
-    makePayment:(NSString *)jsonConfig
-    resolver:(RCTPromiseResolveBlock)resolve
-    rejecter:(RCTPromiseRejectBlock)reject
-)
+RCT_EXPORT_METHOD(makePayment:(NSString *)jsonConfig
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    if (!self.sdkPluginInstance) {
-        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
-    }
-    @try {
-        [self.sdkPluginInstance makePayment: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 makePayment: %@", exception.reason], nil);
-    }
+  if (!self.sdkPluginInstance) {
+    reject(@"NO_SDK_INSTANCE", @"SDK plugin instance is not initialized", nil);
+    return;
+  }
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.sdkPluginInstance makePayment:jsonConfig resolver:resolve rejecter:reject];
+  });
 }
 
-RCT_EXPORT_METHOD(
-    billing:(NSString *)amount
-    currency:(NSString *)currency
-    fields:(NSDictionary *)fields
-    paymentMethods:(NSArray *)paymentMethods
-    appearanceSettings:(NSDictionary *)appearanceSettings
-    tokenOnly:(BOOL)tokenOnly
-    saveCard:(BOOL)saveCard
-    saveAccount:(BOOL)saveAccount
-    authenticatedACH:(BOOL)authenticatedACH
-    grailPayParams:(NSDictionary *)grailPayParams
-    submitButtonText:(NSString *)submitButtonText
-    isRecurring:(BOOL)isRecurring
-    numOfCycle:(NSInteger)numOfCycle
-    recurringIntervals:(NSArray *)recurringIntervals
-    recurringStartDateType:(NSString *)recurringStartDateType
-    recurringStartDate:(NSString *)recurringStartDate
-    secureAuthentication:(BOOL)secureAuthentication
-    showReceipt:(BOOL)showReceipt
-    showTotal:(BOOL)showTotal
-    showSubmitButton:(BOOL)showSubmitButton
-    isEmail:(BOOL)isEmail
-    email:(NSString *)email
-    name:(NSString *)name
-    enable3DS:(BOOL)enable3DS
-    metadata:(NSDictionary *)metadata
-    resolver:(RCTPromiseResolveBlock)resolve
-    rejecter:(RCTPromiseRejectBlock)reject
-)
+RCT_EXPORT_METHOD(makePaymentV2:(NSString *)jsonConfig
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    if (!self.sdkPluginInstance) {
-        self.sdkPluginInstance = [[EasyMerchantSdkPlugin alloc] init];
-    }
-    @try {
-        [self.sdkPluginInstance 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:^(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);
-    }
+  if (!self.sdkPluginInstance) {
+    reject(@"NO_SDK_INSTANCE", @"SDK plugin instance is not initialized", nil);
+    return;
+  }
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.sdkPluginInstance makePaymentV2:jsonConfig resolver:resolve rejecter:reject];
+  });
 }
 
-RCT_EXPORT_METHOD(
-    paymentReference:(NSString *)referenceToken
-    resolver:(RCTPromiseResolveBlock)resolve
-    rejecter:(RCTPromiseRejectBlock)reject
-)
+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);
-    }
+  if (!self.sdkPluginInstance) {
+    reject(@"NO_SDK_INSTANCE", @"SDK plugin instance is not initialized", nil);
+    return;
+  }
+
+  if (!referenceToken || [referenceToken length] == 0) {
+    reject(@"INVALID_TOKEN", @"Reference token is required", nil);
+    return;
+  }
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.sdkPluginInstance paymentReference:referenceToken resolver:resolve rejecter:reject];
+  });
 }
 
-RCT_REMAP_METHOD(setViewController,
-                 setViewControllerWithResolver:(RCTPromiseResolveBlock)resolve
-                 rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(setViewController:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    @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);
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (!self.sdkPluginInstance) {
+      reject(@"NO_SDK_INSTANCE", @"SDK plugin instance is not initialized", nil);
+      return;
     }
+
+    UIViewController *topVC = [self topMostViewController];
+    if (!topVC) {
+      reject(@"NO_VIEW_CONTROLLER", @"No valid view controller found", nil);
+      return;
+    }
+
+    [self.sdkPluginInstance setViewController:topVC resolver:resolve rejecter:reject];
+  });
 }
 
 RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    @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);
+  if (!self.sdkPluginInstance) {
+    reject(@"NO_SDK_INSTANCE", @"SDK plugin instance is not initialized", nil);
+    return;
+  }
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.sdkPluginInstance getPlatformVersion:resolve rejecter:reject];
+  });
+}
+
+// Helper method to find the top-most view controller
+- (UIViewController *)topMostViewController {
+  UIWindow *keyWindow = nil;
+
+  for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
+      if (scene.activationState == UISceneActivationStateForegroundActive ||
+          scene.activationState == UISceneActivationStateForegroundInactive) {
+      if ([scene isKindOfClass:[UIWindowScene class]]) {
+        UIWindowScene *windowScene = (UIWindowScene *)scene;
+        for (UIWindow *window in windowScene.windows) {
+          if (window.isKeyWindow) {
+            keyWindow = window;
+            break;
+          }
+        }
+      }
+    }
+    if (keyWindow) break;
+  }
+
+  if (!keyWindow) {
+    keyWindow = UIApplication.sharedApplication.keyWindow;
+  }
+
+  UIViewController *base = keyWindow.rootViewController;
+
+  while (true) {
+    if ([base isKindOfClass:[UINavigationController class]]) {
+      base = [(UINavigationController *)base visibleViewController];
+    } else if ([base isKindOfClass:[UITabBarController class]]) {
+      base = [(UITabBarController *)base selectedViewController];
+    } else if (base.presentedViewController) {
+      base = base.presentedViewController;
+    } else {
+      break;
     }
+  }
+
+  return base;
 }
 
 @end