npm - @jimrising/easymerchantsdk-react-native - Versions diffs - 2.5.2 → 2.5.3 - Mend

@jimrising/easymerchantsdk-react-native 2.5.2 → 2.5.3

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 (19) hide show

package/android/build.gradle +1 -1
package/ios/ApiManager/APIHeaders.swift +0 -6
package/ios/ApiManager/APIRequest.swift +3 -8
package/ios/Classes/EasyMerchantSdk.m +2 -2
package/ios/Classes/EasyMerchantSdk.swift +25 -13
package/ios/Helper/GrailPayHelper.swift +1 -0
package/ios/Models/Request.swift +3 -3
package/ios/Pods/Storyboard/EasyPaySdk.storyboard +83 -83
package/ios/Pods/ViewControllers/AdditionalInfoVC.swift +26 -3
package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift +10 -10
package/ios/Pods/ViewControllers/GrailPayVC.swift +260 -268
package/ios/Pods/ViewControllers/OTPVerificationVC.swift +74 -13
package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift +266 -131
package/ios/Pods/ViewControllers/PaymentInformation/RecurringTVC.swift +3 -0
package/ios/Pods/ViewControllers/PaymentStatusWebViewVC.swift +1 -32
package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift +10 -6
package/ios/easymerchantsdk.podspec +1 -1
package/package.json +1 -1
package/ACH_CHARGE_ENDPOINT_TRACE.md +0 -69

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

@@ -1,258 +1,10 @@
-//////
-//////  GrailPayVC.swift
-//////  EasyPay
-//////
-//////  Created by Mony's Mac on 02/05/25.
-//////
-//
-////import UIKit
-////import WebKit
-////
-////public class GrailPayVC: UIViewController {
-////
-////    private var webView: WKWebView!
-////    private var loadingIndicator: UIActivityIndicatorView!
-////    private var request: GrailPayRequest
-////    public var onCompletion: ((EasyPay.SDKResult) -> Void)?
-////    private var didHandleBankConnection = false
-////    private var allLinkedAccounts: [[String: Any]] = []
-////
-////    public init(request: GrailPayRequest) {
-////        self.request = request
-////        super.init(nibName: nil, bundle: nil)
-////    }
-////
-////    required init?(coder: NSCoder) {
-////        fatalError("init(coder:) has not been implemented")
-////    }
-////
-////    override public func viewDidLoad() {
-////        super.viewDidLoad()
-////        setupUI()
-////        loadGrailPaySDK()
-////    }
-////
-////    private func setupUI() {
-////        view.backgroundColor = .white
-////
-////        let config = WKWebViewConfiguration()
-////        if #available(iOS 14.0, *) {
-////            let webpagePreferences = WKWebpagePreferences()
-////            webpagePreferences.allowsContentJavaScript = true
-////            config.defaultWebpagePreferences = webpagePreferences
-////        } else {
-////            let preferences = WKPreferences()
-////            preferences.javaScriptEnabled = true
-////            config.preferences = preferences
-////        }
-////
-////        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]
-////        view.addSubview(webView)
-////
-////        loadingIndicator = UIActivityIndicatorView(style: .large)
-////        loadingIndicator.center = view.center
-////        loadingIndicator.hidesWhenStopped = true
-////        view.addSubview(loadingIndicator)
-////    }
-////
-////    private func loadGrailPaySDK() {
-////        loadingIndicator.startAnimating()
-////
-//////        let sdkURL = request.isSandbox
-//////        ? "https://bank-link-widget-sandbox.grailpay.com/sdk.js"
-//////        : "https://bank-link-widget.grailpay.com/sdk.js"
-////
-////        let sdkURL = EnvironmentConfig.grailPaySDKURL
-////
-////        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: '\(UserStoreSingleton.shared.bankWidgetKey ?? "")',
-////                        vendorId: '\(UserStoreSingleton.shared.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 });
-////                        },
-////                        onLinkedDefaultAccount: function(data) {
-////                            console.log("✅ Default Account selected:", 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")
-////
-////        let baseURL = URL(string: EnvironmentConfig.grailPayBaseURL)
-////
-////        webView.loadHTMLString(html, baseURL: baseURL)
-////    }
-////
-////    private func handleError(_ error: Error) {
-////        DispatchQueue.main.async {
-////            self.loadingIndicator.stopAnimating()
-////            self.onCompletion?(EasyPay.SDKResult(error: error as NSError))
-////            self.dismiss(animated: true)
-////        }
-////    }
-////}
 ////
-////// MARK: - WKNavigationDelegate
-////extension GrailPayVC: WKNavigationDelegate {
-////    public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-////        loadingIndicator.stopAnimating()
-////    }
-////
-////    public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-////        handleError(error)
-////    }
-////}
+////  GrailPayVC.swift
+////  EasyPay
 ////
-////// MARK: - WKScriptMessageHandler
-////extension GrailPayVC: WKScriptMessageHandler {
-////    public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
-////        print("JS Message received: \(message.body)")
-////
-////        guard let body = message.body as? [String: Any],
-////              let type = body["type"] as? String else {
-////            print("Invalid message structure")
-////            return
-////        }
-////
-////        switch type {
-////        case "bankConnected":
-////            if let data = body["data"] as? [[String: Any]] {
-////                print("✅ All linked accounts:", data)
-////                self.allLinkedAccounts = data
-////            }
-////
-////        case "defaultAccountSelected":
-////            guard let selectedAccount = body["data"] as? [String: Any] else {
-////                print("No account data selected")
-////                return
-////            }
-////
-////            print("✅ Selected default account: \(selectedAccount)")
-////
-////            if !didHandleBankConnection {
-////                didHandleBankConnection = true
-////                DispatchQueue.main.async {
-////                    self.onCompletion?(EasyPay.SDKResult(type: .success, chargeData: ["data": [selectedAccount]]))
-////                    self.dismiss(animated: true)
-////                }
-////            }
-////
-////        case "linkExit":
-////            if didHandleBankConnection {
-////                print("linkExit ignored (already handled)")
-////                return
-////            }
-////            print("User exited linking flow")
-////            DispatchQueue.main.async {
-////                self.onCompletion?(EasyPay.SDKResult(type: .cancelled))
-////                self.dismiss(animated: true)
-////            }
-////
-////        case "error":
-////            let errorMessage = body["data"] as? String ?? "Unknown error"
-////            print("GrailPay Error:", errorMessage)
-////            let error = NSError(domain: "GrailPayError", code: 0, userInfo: [NSLocalizedDescriptionKey: errorMessage])
-////            handleError(error)
-////
-////        default:
-////            print("Unknown JS message type:", type)
-////        }
-////    }
-////}
+////  Created by Mony's Mac on 02/05/25.
 ////
-////// MARK: - WKUIDelegate
-////extension GrailPayVC: WKUIDelegate {
-////    public func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration,
-////                        for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
-////        if navigationAction.targetFrame == nil {
-////            webView.load(navigationAction.request)
-////        }
-////        return nil
-////    }
-////}
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 //import UIKit
 //import WebKit
 //
@@ -261,7 +13,7 @@
 //    private var webView: WKWebView!
 //    private var loadingIndicator: UIActivityIndicatorView!
 //    private var request: GrailPayRequest
-//    public var onCompletion: ((SDKResult) -> Void)?
+//    public var onCompletion: ((EasyPay.SDKResult) -> Void)?
 //    private var didHandleBankConnection = false
 //    private var allLinkedAccounts: [[String: Any]] = []
 //
@@ -314,14 +66,17 @@
 //    private func loadGrailPaySDK() {
 //        loadingIndicator.startAnimating()
 //
-//        let sdkURL = EnvironmentConfig.grailPaySDKURL
-//        let baseURL = URL(string: EnvironmentConfig.grailPayBaseURL)
+////        let sdkURL = request.isSandbox
+////        ? "https://bank-link-widget-sandbox.grailpay.com/sdk.js"
+////        : "https://bank-link-widget.grailpay.com/sdk.js"
 //
+//        let sdkURL = EnvironmentConfig.grailPaySDKURL
+//
 //        let html = """
 //        <!DOCTYPE html>
 //        <html>
 //        <head>
-//            <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+//            <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no\">
 //            <script>
 //                window.sdkInitialized = false;
 //
@@ -388,21 +143,23 @@
 //                document.addEventListener('DOMContentLoaded', loadSDK);
 //            </script>
 //        </head>
-//        <body style="margin:0;padding:0;"></body>
+//        <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")
+//
+//        let baseURL = URL(string: EnvironmentConfig.grailPayBaseURL)
+//
 //        webView.loadHTMLString(html, baseURL: baseURL)
 //    }
 //
 //    private func handleError(_ error: Error) {
 //        DispatchQueue.main.async {
 //            self.loadingIndicator.stopAnimating()
-//            let errorData: [String: Any] = [
-//                "status": false,
-//                "message": error.localizedDescription
-//            ]
-//            self.onCompletion?(SDKResult(type: .error, data: errorData as NSDictionary))
+//            self.onCompletion?(EasyPay.SDKResult(error: error as NSError))
 //            self.dismiss(animated: true)
 //        }
 //    }
@@ -443,7 +200,7 @@
 //            if !didHandleBankConnection {
 //                didHandleBankConnection = true
 //                DispatchQueue.main.async {
-//                    self.onCompletion?(SDKResult(type: .success, data: ["data": [selectedAccount]] as NSDictionary))
+//                    self.onCompletion?(EasyPay.SDKResult(type: .success, chargeData: ["data": [selectedAccount]]))
 //                    self.dismiss(animated: true)
 //                }
 //            }
@@ -453,11 +210,7 @@
 //                return
 //            }
 //            DispatchQueue.main.async {
-//                let cancelData: [String: Any] = [
-//                    "status": false,
-//                    "message": "User cancelled the payment"
-//                ]
-//                self.onCompletion?(SDKResult(type: .cancelled, data: cancelData as NSDictionary))
+//                self.onCompletion?(EasyPay.SDKResult(type: .cancelled))
 //                self.dismiss(animated: true)
 //            }
 //
@@ -481,3 +234,242 @@
 //        return nil
 //    }
 //}
+import UIKit
+import WebKit
+public class GrailPayVC: UIViewController {
+    private var webView: WKWebView!
+    private var loadingIndicator: UIActivityIndicatorView!
+    private var request: GrailPayRequest
+    public var onCompletion: ((SDKResult) -> Void)?
+    private var didHandleBankConnection = false
+    private var allLinkedAccounts: [[String: Any]] = []
+    public init(request: GrailPayRequest) {
+        self.request = request
+        super.init(nibName: nil, bundle: nil)
+    }
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    override public func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+        loadGrailPaySDK()
+    }
+    private func setupUI() {
+        view.backgroundColor = .white
+        let config = WKWebViewConfiguration()
+        if #available(iOS 14.0, *) {
+            let webpagePreferences = WKWebpagePreferences()
+            webpagePreferences.allowsContentJavaScript = true
+            config.defaultWebpagePreferences = webpagePreferences
+        } else {
+            let preferences = WKPreferences()
+            preferences.javaScriptEnabled = true
+            config.preferences = preferences
+        }
+        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]
+        view.addSubview(webView)
+        loadingIndicator = UIActivityIndicatorView(style: .large)
+        loadingIndicator.center = view.center
+        loadingIndicator.hidesWhenStopped = true
+        view.addSubview(loadingIndicator)
+    }
+    private func loadGrailPaySDK() {
+        loadingIndicator.startAnimating()
+        let sdkURL = EnvironmentConfig.grailPaySDKURL
+        let baseURL = URL(string: EnvironmentConfig.grailPayBaseURL)
+        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: '\(UserStoreSingleton.shared.bankWidgetKey ?? "")',
+                        vendorId: '\(UserStoreSingleton.shared.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 });
+                        },
+                        onLinkedDefaultAccount: function(data) {
+                            console.log("✅ Default Account selected:", 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>
+        """
+        webView.loadHTMLString(html, baseURL: baseURL)
+    }
+    private func handleError(_ error: Error) {
+        DispatchQueue.main.async {
+            self.loadingIndicator.stopAnimating()
+            let errorData: [String: Any] = [
+                "status": false,
+                "message": error.localizedDescription
+            ]
+            self.onCompletion?(SDKResult(type: .error, data: errorData as NSDictionary))
+            self.dismiss(animated: true)
+        }
+    }
+}
+// MARK: - WKNavigationDelegate
+extension GrailPayVC: WKNavigationDelegate {
+    public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        loadingIndicator.stopAnimating()
+    }
+    public func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        handleError(error)
+    }
+}
+// MARK: - WKScriptMessageHandler
+extension GrailPayVC: WKScriptMessageHandler {
+    public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        guard let body = message.body as? [String: Any],
+              let type = body["type"] as? String else {
+            return
+        }
+        switch type {
+        case "bankConnected":
+            if let data = body["data"] as? [[String: Any]] {
+                self.allLinkedAccounts = data
+            }
+        case "defaultAccountSelected":
+            guard let selectedAccount = body["data"] as? [String: Any] else {
+                return
+            }
+            if !didHandleBankConnection {
+                didHandleBankConnection = true
+                DispatchQueue.main.async {
+                    self.onCompletion?(SDKResult(type: .success, data: ["data": [selectedAccount]] as NSDictionary))
+                    self.dismiss(animated: true)
+                }
+            }
+        case "linkExit":
+            if didHandleBankConnection {
+                return
+            }
+            DispatchQueue.main.async {
+                let cancelData: [String: Any] = [
+                    "status": false,
+                    "message": "User cancelled the payment"
+                ]
+                self.onCompletion?(SDKResult(type: .cancelled, data: cancelData as NSDictionary))
+                self.dismiss(animated: true)
+            }
+        case "error":
+            let errorMessage = body["data"] as? String ?? "Unknown error"
+            let error = NSError(domain: "GrailPayError", code: 0, userInfo: [NSLocalizedDescriptionKey: errorMessage])
+            handleError(error)
+        default:
+            break
+        }
+    }
+}
+// MARK: - WKUIDelegate
+extension GrailPayVC: WKUIDelegate {
+    public func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration,
+                        for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
+        if navigationAction.targetFrame == nil {
+            webView.load(navigationAction.request)
+        }
+        return nil
+    }
+}