npm - @jimrising/easymerchantsdk-react-native - Versions diffs - 1.3.9 → 1.4.2 - Mend

@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (80) hide show

package/ios/Pods/ViewControllers/GrailPayVC.swift CHANGED Viewed

@@ -1,9 +1,9 @@
-//
-//  GrailPayVC.swift
-//  EasyPay
-//
-//  Created by Mony's Mac on 02/05/25.
-//
+////
+////  GrailPayVC.swift
+////  EasyPay
+////
+////  Created by Mony's Mac on 02/05/25.
+////
 import UIKit
 import WebKit
@@ -15,6 +15,7 @@ public class GrailPayVC: UIViewController {
     private var request: GrailPayRequest
     public var onCompletion: ((Result) -> Void)?
+    private var didHandleBankConnection = false
     public init(request: GrailPayRequest) {
         self.request = request
@@ -25,8 +26,6 @@ public class GrailPayVC: UIViewController {
         fatalError("init(coder:) has not been implemented")
     }
-    private var didHandleBankConnection = false
     override public func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
@@ -36,12 +35,26 @@ public class GrailPayVC: UIViewController {
     private func setupUI() {
         view.backgroundColor = .white
-        let webConfig = WKWebViewConfiguration()
-        webConfig.userContentController.add(self, name: "grailpayHandler")
-        webConfig.allowsInlineMediaPlayback = true
-        webConfig.mediaTypesRequiringUserActionForPlayback = []
+        let config = WKWebViewConfiguration()
+        // Modern iOS 14+ JavaScript enablement
+        if #available(iOS 14.0, *) {
+            let webpagePreferences = WKWebpagePreferences()
+            webpagePreferences.allowsContentJavaScript = true
+            config.defaultWebpagePreferences = webpagePreferences
+        } else {
+            // Fallback for iOS < 14
+            let preferences = WKPreferences()
+            preferences.javaScriptEnabled = true
+            config.preferences = preferences
+        }
-        webView = WKWebView(frame: view.bounds, configuration: webConfig)
+        config.websiteDataStore = WKWebsiteDataStore.default()
+        config.userContentController.add(self, name: "grailpayHandler")
+        config.allowsInlineMediaPlayback = true
+        config.mediaTypesRequiringUserActionForPlayback = []
+        webView = WKWebView(frame: view.bounds, configuration: config)
         webView.navigationDelegate = self
         webView.uiDelegate = self
         webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
@@ -56,99 +69,102 @@ public class GrailPayVC: UIViewController {
     private func loadGrailPaySDK() {
         loadingIndicator.startAnimating()
-        WKWebsiteDataStore.default().removeData(ofTypes: [WKWebsiteDataTypeCookies], modifiedSince: Date(timeIntervalSince1970: 0)) { [weak self] in
-            guard let self = self else { return }
-            let sdkURL = self.request.isSandbox ?
-            "https://bank-link-widget-sandbox.grailpay.com/sdk.js" :
-            "https://bank-link-widget.grailpay.com/sdk.js"
-            let html = """
-            <!DOCTYPE html>
-            <html>
-            <head>
-                <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-                <script>
-                    window.sdkInitialized = false;
-                    function initializeSDK() {
-                        if (window.sdkInitialized) return;
-                        if (typeof window.grailpay === 'undefined') {
-                            window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: 'SDK not loaded' });
-                            return;
-                        }
-                        window.grailpay.init({
-                            token: '\(self.request.accessToken)',
-                            vendorId: '\(self.request.vendorId)',
-                            role: '\(self.request.role)',
-                            timeout: \(self.request.timeout),
-                            theme: {
-                                branding_name: '\(self.request.brandingName)',
-                                screens: {
-                                    finder: {
-                                        subtitle: '\(self.request.finderSubtitle)',
-                                        searchPlaceholder: '\(self.request.searchPlaceholder)'
-                                    }
+        let sdkURL = request.isSandbox
+        ? "https://bank-link-widget-sandbox.grailpay.com/sdk.js"
+        : "https://bank-link-widget.grailpay.com/sdk.js"
+        let html = """
+        <!DOCTYPE html>
+        <html>
+        <head>
+            <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+            <script>
+                window.sdkInitialized = false;
+                function initializeSDK() {
+                    if (window.sdkInitialized) return;
+                    if (typeof window.grailpay === 'undefined') {
+                        window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: 'SDK not loaded' });
+                        return;
+                    }
+                    window.grailpay.init({
+                        token: '\(request.accessToken)',
+                        vendorId: '\(request.vendorId)',
+                        role: '\(request.role)',
+                        timeout: \(request.timeout),
+                        theme: {
+                            branding_name: '\(request.brandingName)',
+                            screens: {
+                                finder: {
+                                    subtitle: '\(request.finderSubtitle)',
+                                    searchPlaceholder: '\(request.searchPlaceholder)'
                                 }
-                            },
-                            onError: function(error) {
-                                console.log("JS onError:", error);
-                                window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: error });
-                            },
-                            onBankConnected: function(data) {
-                                console.log("✅ Bank connected:", data);
-                                window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'bankConnected', data: data });
-                            },
-                            onLinkExit: function(data) {
-                                console.log("⚠️ User exited:", data);
-                                window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'linkExit', data: data });
                             }
-                        }).then(function() {
-                            window.sdkInitialized = true;
-                            window.grailpay.open();
-                        }).catch(function(error) {
-                            console.log("❌ SDK init failed:", error);
+                        },
+                        onError: function(error) {
+                            console.log("JS onError:", error);
                             window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: error });
-                        });
-                    }
-                    function loadSDK() {
-                        const script = document.createElement('script');
-                        script.src = '\(sdkURL)';
-                        script.onload = function() {
-                            setTimeout(initializeSDK, 1000);
-                        };
-                        script.onerror = function(error) {
-                            console.log("❌ Failed to load SDK script");
-                            window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: 'Failed to load SDK script' });
-                        };
-                        document.head.appendChild(script);
-                    }
-                    document.addEventListener('DOMContentLoaded', loadSDK);
-                </script>
-            </head>
-            <body style="margin: 0; padding: 0;"></body>
-            </html>
-            """
-            let baseURL = URL(string: self.request.isSandbox ? "https://bank-link-widget-sandbox.grailpay.com" : "https://bank-link-widget.grailpay.com")
-            self.webView.loadHTMLString(html, baseURL: baseURL)
-        }
+                        },
+                        onBankConnected: function(data) {
+                            console.log("✅ Bank connected:", data);
+                            window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'bankConnected', data: data });
+                        },
+                        onLinkedDefaultAccount: function(data) {
+                            console.log("Default Account", data);
+                            window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'defaultAccountSelected', data: data });
+                        },
+                        onLinkExit: function(data) {
+                            console.log("⚠️ User exited:", data);
+                            window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'linkExit', data: data });
+                        }
+                    }).then(function() {
+                        window.sdkInitialized = true;
+                        window.grailpay.open();
+                    }).catch(function(error) {
+                        console.log("❌ SDK init failed:", error);
+                        window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: error });
+                    });
+                }
+                function loadSDK() {
+                    const script = document.createElement('script');
+                    script.src = '\(sdkURL)';
+                    script.onload = function() {
+                        setTimeout(initializeSDK, 1000);
+                    };
+                    script.onerror = function(error) {
+                        console.log("❌ Failed to load SDK script");
+                        window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'error', data: 'Failed to load SDK script' });
+                    };
+                    document.head.appendChild(script);
+                }
+                document.addEventListener('DOMContentLoaded', loadSDK);
+            </script>
+        </head>
+        <body style="margin:0;padding:0;"></body>
+        </html>
+        """
+        let baseURL = URL(string: request.isSandbox
+                          ? "https://bank-link-widget-sandbox.grailpay.com"
+                          : "https://bank-link-widget.grailpay.com")
+        webView.loadHTMLString(html, baseURL: baseURL)
     }
     private func handleError(_ error: Error) {
         DispatchQueue.main.async {
             self.loadingIndicator.stopAnimating()
-            let nsError = error as NSError
-            self.onCompletion?(Result(error: nsError))
+            self.onCompletion?(Result(error: error as NSError))
             self.dismiss(animated: true)
         }
     }
 }
+// MARK: - WKNavigationDelegate
 extension GrailPayVC: WKNavigationDelegate {
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         loadingIndicator.stopAnimating()
@@ -159,27 +175,34 @@ extension GrailPayVC: WKNavigationDelegate {
     }
 }
+// MARK: - WKScriptMessageHandler
 extension GrailPayVC: WKScriptMessageHandler {
     public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
-        print("📩 JS Message received: \(message.body)")
+        print("JS Message received: \(message.body)")
         guard let body = message.body as? [String: Any],
               let type = body["type"] as? String else {
-            print("⚠️ Malformed message")
+            print("Invalid message structure")
             return
         }
         switch type {
         case "bankConnected":
-            guard let dataArray = body["data"] as? [[String: Any]], let firstAccount = dataArray.first else {
-                print("⚠️ No valid accounts in bankConnected")
+            if let data = body["data"] {
+                print("All linked account data from GrailPay:", data)
+            }
+        case "defaultAccountSelected":
+            guard let dataG = body["data"] as? [String: Any] else {
+                print("No account data selected")
                 return
             }
+            print("Received defaultAccountSelected: \(dataG)")
             if !didHandleBankConnection {
-                didHandleBankConnection = true // ✅ Prevent duplicate triggers
-                print("✅ Received bankConnected: \(firstAccount)")
+                didHandleBankConnection = true
+                let dataArray: [[String: Any]] = [dataG]
                 DispatchQueue.main.async {
                     self.onCompletion?(Result(type: .success, chargeData: ["data": dataArray]))
                     self.dismiss(animated: true)
@@ -188,30 +211,31 @@ extension GrailPayVC: WKScriptMessageHandler {
         case "linkExit":
             if didHandleBankConnection {
-                print("ℹ️ linkExit ignored because success already handled")
+                print("linkExit ignored (already handled)")
                 return
             }
-            print("⚠️ Received linkExit")
+            print("User exited linking flow")
             DispatchQueue.main.async {
                 self.onCompletion?(Result(type: .cancelled))
                 self.dismiss(animated: true)
             }
         case "error":
-            let errorMessage = (body["data"] as? String) ?? "Unknown error"
+            let errorMessage = body["data"] as? String ?? "Unknown error"
+            print("GrailPay Error:", errorMessage)
             let error = NSError(domain: "GrailPayError", code: 0, userInfo: [NSLocalizedDescriptionKey: errorMessage])
-            print("❌ GrailPay JS error: \(errorMessage)")
             handleError(error)
         default:
-            print("ℹ️ Unknown JS message type: \(type)")
+            print("Unknown JS message type:", type)
         }
     }
 }
+// MARK: - WKUIDelegate
 extension GrailPayVC: WKUIDelegate {
-    public func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
+    public func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration,
+                        for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
         if navigationAction.targetFrame == nil {
             webView.load(navigationAction.request)
         }