@jimrising/easymerchantsdk-react-native 2.4.7 → 2.4.9

package/ios/Helper/GrailPayHelper.swift

@@ -5,40 +5,44 @@
 //  Created by Mony's Mac on 02/05/25.
 //
 
-import SafariServices
+import UIKit
 
 @objc public class GrailPayHelper: NSObject {
     
-    private static var safariViewController: SFSafariViewController?
     private static var completionHandler: ((SDKResult) -> Void)?
     private static var presentingViewController: UIViewController?
+    private static var currentWebViewController: GrailPayWebViewController?
     
     public static func presentGrailPay(
         from viewController: UIViewController,
         request: GrailPayRequest,
+        deepLinkScheme: String? = nil,
         completion: @escaping (SDKResult) -> Void
     ) {
         // Store references
         completionHandler = completion
         presentingViewController = viewController
         
-        // Launch Safari directly (like Android Chrome Custom Tabs)
-        launchSafariDirectly(from: viewController, request: request, completion: completion)
+        // Get deep link scheme - use provided one or get from bundle identifier
+        let scheme = deepLinkScheme ?? Bundle.main.bundleIdentifier ?? "grailpay"
+        
+        // Launch WebView (in-app browser)
+        launchWebView(from: viewController, request: request, deepLinkScheme: scheme, completion: completion)
     }
     
-    private static func launchSafariDirectly(
+    private static func launchWebView(
         from viewController: UIViewController,
         request: GrailPayRequest,
+        deepLinkScheme: String,
         completion: @escaping (SDKResult) -> Void
     ) {
-        print("🚀 Loading GrailPay with Safari (direct launch, no intermediate VC)")
         
         // Build configuration JSON
         let configDict: [String: Any] = [
             "token": UserStoreSingleton.shared.bankWidgetKey ?? "",
             "vendorId": UserStoreSingleton.shared.vendorID ?? "",
             "role": request.role,
-            "timeout": request.timeout * 1000, // Convert to milliseconds
+            "timeout": max(request.timeout, 11) * 1000, // Convert to milliseconds; GrailPay minimum is 11 seconds
             "brandingName": request.brandingName,
             "finderSubtitle": request.finderSubtitle,
             "searchPlaceholder": request.searchPlaceholder,
@@ -49,90 +53,187 @@ import SafariServices
         guard let jsonData = try? JSONSerialization.data(withJSONObject: configDict, options: []),
               let jsonString = String(data: jsonData, encoding: .utf8),
               let base64Config = jsonString.data(using: .utf8)?.base64EncodedString() else {
-            print("❌ Failed to encode configuration")
             let errorData: NSDictionary = ["status": false, "message": "Failed to encode configuration"]
             completion(SDKResult(type: .error, data: errorData))
             return
         }
         
-        print("🔧 Base64 Config:", base64Config)
         
-        // Build URL with Base64 config parameter
+        // Build URL with Base64 config parameter and deep link scheme
         let serverHTMLURL = "https://js.lyfepay.io/authenticated-ach.html"
+        let timestamp = Int(Date().timeIntervalSince1970 * 1000)
         var components = URLComponents(string: serverHTMLURL)!
         components.queryItems = [
-            URLQueryItem(name: "config", value: base64Config)
+            URLQueryItem(name: "config", value: base64Config),
+            URLQueryItem(name: "scheme", value: deepLinkScheme),
+            URLQueryItem(name: "v", value: "\(timestamp)")
         ]
         
         guard let url = components.url else {
-            print("❌ Failed to build URL")
             let errorData: NSDictionary = ["status": false, "message": "Invalid URL configuration"]
             completion(SDKResult(type: .error, data: errorData))
             return
         }
         
-        print("🌐 Safari URL:", url.absoluteString)
         
-        // Configure Safari View Controller
-        let safari = SFSafariViewController(url: url)
-        safari.delegate = SafariDelegateHandler.shared
-        SafariDelegateHandler.shared.completion = completion
+        // Create and present WebView controller
+        let webViewController = GrailPayWebViewController(url: url, completion: completion)
+        webViewController.modalPresentationStyle = .fullScreen
+        
+        // Store reference to current WebView controller
+        currentWebViewController = webViewController
         
-        if #available(iOS 11.0, *) {
-            safari.dismissButtonStyle = .close
-            safari.preferredBarTintColor = .white
-            safari.preferredControlTintColor = .systemBlue
+        viewController.present(webViewController, animated: true) {
         }
+    }
+    
+    /// Find the currently open GrailPayWebViewController
+    private static func findOpenWebViewController() -> GrailPayWebViewController? {
+        // First check stored reference
+        if let webVC = currentWebViewController, webVC.isViewLoaded && webVC.view.window != nil {
+            return webVC
+        }
+        
+        // Search through presented view controllers
+        guard let topVC = getTopViewController() else { return nil }
         
-        // Present Safari directly from the current view controller
-        safariViewController = safari
-        viewController.present(safari, animated: true) {
-            print("✅ Safari presented directly (no white screen)")
+        // Check if top VC is GrailPayWebViewController
+        if let webVC = topVC as? GrailPayWebViewController {
+            return webVC
+        }
+        
+        // Check presented view controller
+        if let presented = topVC.presentedViewController as? GrailPayWebViewController {
+            return presented
+        }
+        
+        // Check navigation stack
+        if let navVC = topVC as? UINavigationController,
+           let webVC = navVC.topViewController as? GrailPayWebViewController {
+            return webVC
+        }
+        
+        // Search through parent hierarchy
+        var currentVC: UIViewController? = topVC
+        while let vc = currentVC {
+            if let webVC = vc as? GrailPayWebViewController {
+                return webVC
+            }
+            currentVC = vc.presentedViewController ?? vc.parent
         }
+        
+        return nil
+    }
+    
+    /// Handle GrailPay OAuth callback intercepted from bank app redirect.
+    /// Note: With WebView, OAuth callbacks are handled within the WebView itself.
+    @objc(handleGrailPayOAuthCallbackWithUrl:) public static func handleGrailPayOAuthCallback(url: URL) {
+        // With WebView implementation, OAuth callbacks are automatically handled
+        // within the WebView's navigation delegate
+    }
+    
+    /// Get the top-most view controller
+    private static func getTopViewController() -> UIViewController? {
+        guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+              let rootVC = windowScene.windows.first?.rootViewController else {
+            return nil
+        }
+        
+        var topVC = rootVC
+        while let presentedVC = topVC.presentedViewController {
+            topVC = presentedVC
+        }
+        return topVC
+    }
+    
+    /// Clear the current WebView controller reference
+    static func clearWebViewController() {
+        currentWebViewController = nil
     }
     
     // Handle deep link callback
-    @objc public static func handleDeepLinkCallback(url: URL) {
-        guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
-              let dataParam = components.queryItems?.first(where: { $0.name == "data" })?.value else {
-            print("❌ Invalid deep link format")
+    @objc(handleDeepLinkCallbackWithUrl:) public static func handleDeepLinkCallback(url: URL) {
+        let urlString = url.absoluteString
+        let scheme = url.scheme?.lowercased() ?? ""
+        
+        
+        // Handle expediter/expeditor schemes - these contain OAuth data directly in query params
+        if scheme == "expediter" || scheme == "expeditor" {
+            
+            // Extract all query parameters as OAuth data
+            guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
+                return
+            }
+            
+            var oauthData: [String: String] = [:]
+            components.queryItems?.forEach { item in
+                if let value = item.value {
+                    oauthData[item.name] = value
+                }
+            }
+            oauthData["url"] = urlString
+            
+            // Try to find open WebView and inject OAuth data
+            if let openWebViewController = findOpenWebViewController() {
+                DispatchQueue.main.async {
+                    openWebViewController.forwardOAuthDataToMainWebView(oauthData)
+                }
+                return
+            }
+            
+            // If no WebView is open, try to use completion handler
+            if let storedCompletionHandler = completionHandler {
+                // For expediter/expeditor, we might not have eventType/data structure
+                // So we'll wrap it in a success result
+                let resultData: NSDictionary = ["data": [oauthData]]
+                let result = SDKResult(type: .success, data: resultData)
+                completionHandler = nil
+                storedCompletionHandler(result)
+            } else {
+            }
+            return
+        }
+        
+        // Handle grailpay:// scheme with base64 encoded data
+        guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
+            return
+        }
+        
+        guard let dataParam = components.queryItems?.first(where: { $0.name == "data" })?.value else {
+            if let queryItems = components.queryItems {
+                let itemNames = queryItems.map { $0.name }
+            } else {
+            }
             return
         }
         
-        print("🔗 Deep link received:", url.absoluteString)
-        print("📦 Data param:", dataParam)
         
         // URL decode
         guard let urlDecoded = dataParam.removingPercentEncoding else {
-            print("❌ Failed to URL decode")
             return
         }
         
         // Base64 decode
         guard let decodedData = Data(base64Encoded: urlDecoded),
               let decodedString = String(data: decodedData, encoding: .utf8) else {
-            print("❌ Failed to Base64 decode")
             return
         }
         
-        print("📋 Decoded JSON:", decodedString)
         
         // Parse JSON
         guard let jsonData = decodedString.data(using: .utf8),
               let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any],
               let eventType = json["eventType"] as? String,
               let data = json["data"] else {
-            print("❌ Failed to parse JSON")
             return
         }
         
-        print("✅ Event type:", eventType)
-        print("📊 Data:", data)
         
-        // Dismiss Safari
-        safariViewController?.dismiss(animated: true) {
-            print("🚪 Safari dismissed")
-        }
+        // Store reference before clearing
+        let storedCompletionHandler = completionHandler
+        
+        // Clear static reference immediately
+        completionHandler = nil
         
         // Handle callback based on event type
         switch eventType {
@@ -140,7 +241,7 @@ import SafariServices
             // Wrap account data in an array to match expected format
             let resultData: NSDictionary = ["data": [data]]
             let result = SDKResult(type: .success, data: resultData)
-            completionHandler?(result)
+            storedCompletionHandler?(result)
             
         case "linkExit":
             if let exitData = data as? [String: Any],
@@ -149,32 +250,19 @@ import SafariServices
                 // Wrap account data in an array to match expected format
                 let resultData: NSDictionary = ["data": [data]]
                 let result = SDKResult(type: .success, data: resultData)
-                completionHandler?(result)
+                storedCompletionHandler?(result)
             } else {
                 let resultData: NSDictionary = ["data": data]
                 let result = SDKResult(type: .cancelled, data: resultData)
-                completionHandler?(result)
+                storedCompletionHandler?(result)
             }
             
         case "error":
             let errorData: NSDictionary = ["status": false, "message": "GrailPay error: \(data)"]
             let result = SDKResult(type: .error, data: errorData)
-            completionHandler?(result)
+            storedCompletionHandler?(result)
             
         default:
-            print("⚠️ Unknown event type:", eventType)
         }
     }
 }
-
-// MARK: - Safari Delegate Handler
-private class SafariDelegateHandler: NSObject, SFSafariViewControllerDelegate {
-    static let shared = SafariDelegateHandler()
-    var completion: ((SDKResult) -> Void)?
-    
-    func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
-        print("🚪 Safari dismissed by user (cancel)")
-        // Only call completion if no deep link was received
-        // (deep link handler will call completion with success)
-    }
-}