@jimrising/easymerchantsdk-react-native 2.5.2 → 2.5.4

package/android/build.gradle

@@ -96,7 +96,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
 
     // Third-party libs
-    implementation 'com.app:paysdk:1.6.6.3'
+    implementation 'com.app:paysdk:1.7.0'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:5.0.4'
     implementation 'com.github.androidmads:QRGenerator:1.0.5'

package/ios/ApiManager/APIHeaders.swift

@@ -22,12 +22,6 @@ struct APIHeaders {
         return ["Customer-Token": token]
     }
 
-    /// For verify_otp only: match Android — header "Customer-Token" (Pascal case), no Client-Token, no X-Api-Key/Secret
-    static func verifyOtpHeaders() -> [String: String] {
-        guard let token = UserStoreSingleton.shared.customerToken else { return [:] }
-        return ["Customer-Token": token]
-    }
-
     /// API key/secret headers (match Android SDK: X-Api-Key, X-Api-Secret)
     static func apiAuthHeaders() -> [String: String] {
         guard let key = EnvironmentConfig.apiKey,

package/ios/ApiManager/APIRequest.swift

@@ -29,14 +29,9 @@ struct APIRequest {
 
         // Combine default headers with passed-in headers
         var allHeaders = APIHeaders.commonHeaders()
-        if endpoint == .verifyOtp {
-            // verify_otp: match Android — only Customer-Token + Content-Type (no Client-Token, no X-Api-Key/Secret)
-            allHeaders.merge(APIHeaders.verifyOtpHeaders(), uniquingKeysWith: { $1 })
-        } else {
-            allHeaders.merge(APIHeaders.clientTokenHeader(), uniquingKeysWith: { $1 })
-            allHeaders.merge(APIHeaders.customerTokenHeader(), uniquingKeysWith: { $1 })
-            allHeaders.merge(APIHeaders.apiAuthHeaders(), uniquingKeysWith: { $1 })
-        }
+        allHeaders.merge(APIHeaders.clientTokenHeader(), uniquingKeysWith: { $1 })
+        allHeaders.merge(APIHeaders.customerTokenHeader(), uniquingKeysWith: { $1 })
+        allHeaders.merge(APIHeaders.apiAuthHeaders(), uniquingKeysWith: { $1 })
         allHeaders.merge(headers, uniquingKeysWith: { $1 }) // override if needed
 
         // Apply to request

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 ()

package/ios/Classes/EasyMerchantSdk.swift

@@ -84,8 +84,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             return
         }
         
-        guard let presentingVC = viewController ?? getTopViewController() else {
-            reject("NO_VIEW_CONTROLLER", "Unable to find a valid view controller", nil)
+        guard let (presentingVC, toDismiss) = presentingViewControllerAndOptionalDismiss() else {
+            reject("NO_VIEW_CONTROLLER", "Unable to find a view controller in the window hierarchy", nil)
             clearCallbacks()
             return
         }
@@ -98,8 +98,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         }
         
         let controller = EasyPayViewController(request: request, delegate: self)
-        DispatchQueue.main.async {
-            presentingVC.present(controller, animated: true)
+        DispatchQueue.main.async { [weak self] in
+            self?.presentPaymentController(controller, from: presentingVC, dismissFirst: toDismiss)
         }
     }
     
@@ -117,15 +117,15 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             return
         }
         
-        guard let presentingVC = viewController ?? getTopViewController() else {
-            reject("NO_VIEW_CONTROLLER", "Unable to find a valid view controller", nil)
+        guard let (presentingVC, toDismiss) = presentingViewControllerAndOptionalDismiss() else {
+            reject("NO_VIEW_CONTROLLER", "Unable to find a view controller in the window hierarchy", nil)
             clearCallbacks()
             return
         }
         
         let controller = EasyPayViewController(request: request, delegate: self)
-        DispatchQueue.main.async {
-            presentingVC.present(controller, animated: true)
+        DispatchQueue.main.async { [weak self] in
+            self?.presentPaymentController(controller, from: presentingVC, dismissFirst: toDismiss)
         }
     }
     
@@ -145,16 +145,75 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     
     // MARK: - Helpers
     
-    private func getTopViewController() -> UIViewController? {
-        guard let windowScene = UIApplication.shared.connectedScenes
-            .filter({ $0.activationState == .foregroundActive })
-            .first as? UIWindowScene,
-              let rootVC = windowScene.windows
-            .filter({ $0.isKeyWindow })
-            .first?.rootViewController else {
-            return nil
+    private func keyWindowRootViewController() -> UIViewController? {
+        if let windowScene = UIApplication.shared.connectedScenes
+            .first(where: { ($0 as? UIWindowScene)?.activationState == .foregroundActive }) as? UIWindowScene,
+           let keyWindow = windowScene.windows.first(where: { $0.isKeyWindow }),
+           let root = keyWindow.rootViewController {
+            return root
         }
-        
+        return UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController
+    }
+    
+    /// Returns (presenter, viewControllerToDismiss). If the top is a modal host or our EasyPay, we must dismiss it first so presenter is not "already presenting".
+    private func presentingViewControllerAndOptionalDismiss() -> (UIViewController, UIViewController?)? {
+        guard var vc = keyWindowRootViewController() else { return nil }
+        while let presented = vc.presentedViewController {
+            vc = presented
+        }
+        let top = vc
+        // Step back from modal host or our own payment VC to get the real presenter
+        while (isModalHostViewController(vc) || isEasyPayViewController(vc)), let presenter = vc.presentingViewController {
+            vc = presenter
+        }
+        if isModalHostViewController(vc) || isEasyPayViewController(vc) { return nil }
+        // If top was a modal or EasyPay, that top is currently presented by vc; we must dismiss it first
+        let dismissFirst: UIViewController? = (top !== vc) ? top : nil
+        return (vc, dismissFirst)
+    }
+    
+    private func presentPaymentController(_ controller: UIViewController, from presentingVC: UIViewController, dismissFirst: UIViewController?) {
+        if let toDismiss = dismissFirst {
+            toDismiss.dismiss(animated: false) { [weak self] in
+                DispatchQueue.main.async {
+                    // After dismiss, get top then step back from modal host / EasyPay so we never present from them
+                    guard let presenter = self?.presentingViewControllerInWindowHierarchy() else {
+                        presentingVC.present(controller, animated: true)
+                        return
+                    }
+                    presenter.present(controller, animated: true)
+                }
+            }
+        } else {
+            presentingVC.present(controller, animated: true)
+        }
+    }
+    
+    /// Present from a VC that can safely present (not RCTFabricModalHostViewController; not our EasyPayViewController).
+    private func presentingViewControllerInWindowHierarchy() -> UIViewController? {
+        guard var vc = keyWindowRootViewController() else { return nil }
+        while let presented = vc.presentedViewController {
+            vc = presented
+        }
+        while (isModalHostViewController(vc) || isEasyPayViewController(vc)), let presenter = vc.presentingViewController {
+            vc = presenter
+        }
+        if isModalHostViewController(vc) || isEasyPayViewController(vc) { return nil }
+        return vc
+    }
+    
+    private func isModalHostViewController(_ vc: UIViewController?) -> Bool {
+        guard let vc = vc else { return false }
+        let name = String(describing: type(of: vc))
+        return name.contains("ModalHost") || name.contains("RCTModalHost")
+    }
+    
+    private func isEasyPayViewController(_ vc: UIViewController?) -> Bool {
+        vc is EasyPayViewController
+    }
+    
+    private func getTopViewController() -> UIViewController? {
+        guard let rootVC = keyWindowRootViewController() else { return nil }
         var topVC = rootVC
         while let presentedVC = topVC.presentedViewController {
             topVC = presentedVC

package/ios/Helper/GrailPayHelper.swift

@@ -263,6 +263,7 @@ import UIKit
             storedCompletionHandler?(result)
             
         default:
+            break
         }
     }
 }

package/ios/Models/Request.swift

@@ -939,11 +939,11 @@ public final class Request: NSObject {
         let token = clientToken ?? UserStoreSingleton.shared.clientToken ?? ""
         uRLRequest.addValue(token, forHTTPHeaderField: "clientToken")
         
-        // Add API key/secret headers
+        // Add API key/secret headers (match Android SDK: X-Api-Key, X-Api-Secret)
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
         let task = URLSession.shared.dataTask(with: uRLRequest) { data, response, error in