@jimrising/easymerchantsdk-react-native 2.2.9 → 2.3.1

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -65,6 +65,63 @@ class UserStoreSingleton: NSObject {
         }
     }
     
+    var amount : String? {
+        get {
+            return (UserDefaults().object(forKey: "amount") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "amount")
+        }
+    }
+    
+    //Recurring params
+    var allowCycles : String? {
+        get {
+            return (UserDefaults().object(forKey: "allowCycles") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "allowCycles")
+        }
+    }
+    
+    var interval : String? {
+        get {
+            return (UserDefaults().object(forKey: "interval") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "interval")
+        }
+    }
+    
+    var isRecurring : String? {
+        get {
+            return (UserDefaults().object(forKey: "isRecurring") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "isRecurring")
+        }
+    }
+    
+    var startDate : String? {
+        get {
+            return (UserDefaults().object(forKey: "startDate") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "startDate")
+        }
+    }
+    
+    var startDateType : String? {
+        get {
+            return (UserDefaults().object(forKey: "startDateType") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "startDateType")
+        }
+    }
+    
+    var paymentIntentId : String? {
+        get {
+            return (UserDefaults().object(forKey: "paymentIntentId") as? String)
+        } set {
+            UserDefaults.standard.setValue(newValue, forKey: "paymentIntentId")
+        }
+    }
+    
     var isLoggedIn : Bool? {
         get {
             return (UserDefaults().object(forKey: "isLoggedIn") as? Bool)
@@ -248,19 +305,9 @@ class UserStoreSingleton: NSObject {
         self.border_radious = themeConfiguration.borderRadius
         self.fontSize = themeConfiguration.fontSize
     }
-
-    // Method to clear user data from UserDefaults
-//    func clearUserData() {
-//        UserDefaults.standard.removeObject(forKey: "customer_id")
-//        UserDefaults.standard.removeObject(forKey: "verificationEmail")
-//        UserDefaults.standard.removeObject(forKey: "customer_token")
-//        UserDefaults.standard.removeObject(forKey: "client_token")
-//        UserDefaults.standard.synchronize() // Optional, but can help ensure the changes are applied immediately
-//    }
     
     func clearUserData() {
         let keysToRemove = [
-            "client_token",
             "payment_intent",
             "merchant_email",
             "merchant_name",
@@ -273,6 +320,14 @@ class UserStoreSingleton: NSObject {
             "payment_methods",
             "bank_widget_key",
             "vendor_id",
+            
+//            "amount",
+//            "allowCycles",
+//            "interval",
+//            "isRecurring",
+//            "startDate",
+//            "startDateType",
+//            "paymentIntentId"
         ]
 
         for key in keysToRemove {
@@ -281,7 +336,7 @@ class UserStoreSingleton: NSObject {
 
         UserDefaults.standard.synchronize()
     }
-        
+            
     @objc private func handleAppTermination() {
         print("App is terminating. Clearing user data...")
         clearUserData()
@@ -293,12 +348,61 @@ class UserStoreSingleton: NSObject {
     
 }
 
+var amount : String? {
+    get {
+        return (UserDefaults().object(forKey: "amount") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "amount")
+    }
+}
 
+//Recurring params
+var allowCycles : String? {
+    get {
+        return (UserDefaults().object(forKey: "allowCycles") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "allowCycles")
+    }
+}
 
+var interval : String? {
+    get {
+        return (UserDefaults().object(forKey: "interval") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "interval")
+    }
+}
 
+var isRecurring : String? {
+    get {
+        return (UserDefaults().object(forKey: "isRecurring") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "isRecurring")
+    }
+}
 
+var startDate : String? {
+    get {
+        return (UserDefaults().object(forKey: "startDate") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "startDate")
+    }
+}
 
+var startDateType : String? {
+    get {
+        return (UserDefaults().object(forKey: "startDateType") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "startDateType")
+    }
+}
 
-
+var paymentIntentId : String? {
+    get {
+        return (UserDefaults().object(forKey: "paymentIntentId") as? String)
+    } set {
+        UserDefaults.standard.setValue(newValue, forKey: "paymentIntentId")
+    }
+}
 
 

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -1161,7 +1161,6 @@ class AdditionalInfoVC: BaseVC {
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
         ]
         
@@ -1567,7 +1566,6 @@ class AdditionalInfoVC: BaseVC {
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
             "save_account": 1,
             "payment_method": "ach"
@@ -1758,14 +1756,7 @@ class AdditionalInfoVC: BaseVC {
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
+    
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
@@ -1979,13 +1970,6 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
@@ -2184,13 +2168,6 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
@@ -2404,14 +2381,7 @@ class AdditionalInfoVC: BaseVC {
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
+       
         let emailPrefix = userEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [

package/ios/Pods/ViewControllers/GrailPayVC.swift

@@ -5,6 +5,254 @@
 ////  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)
+//    }
+//}
+//
+//// 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)
+//        }
+//    }
+//}
+//
+//// 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
 
@@ -13,9 +261,9 @@ 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
@@ -36,14 +284,11 @@ public class GrailPayVC: UIViewController {
         view.backgroundColor = .white
         
         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
@@ -69,9 +314,8 @@ public class GrailPayVC: UIViewController {
     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 baseURL = URL(string: EnvironmentConfig.grailPayBaseURL)
         
         let html = """
         <!DOCTYPE html>
@@ -112,7 +356,7 @@ public class GrailPayVC: UIViewController {
                             window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'bankConnected', data: data });
                         },
                         onLinkedDefaultAccount: function(data) {
-                            console.log("Default Account", data);
+                            console.log("✅ Default Account selected:", data);
                             window.webkit.messageHandlers.grailpayHandler.postMessage({ type: 'defaultAccountSelected', data: data });
                         },
                         onLinkExit: function(data) {
@@ -148,10 +392,6 @@ public class GrailPayVC: UIViewController {
         </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)
     }
     
@@ -188,23 +428,23 @@ extension GrailPayVC: WKScriptMessageHandler {
         
         switch type {
         case "bankConnected":
-            if let data = body["data"] {
-                print("All linked account data from GrailPay:", data)
+            if let data = body["data"] as? [[String: Any]] {
+                print("✅ All linked accounts:", data)
+                self.allLinkedAccounts = data
             }
             
         case "defaultAccountSelected":
-            guard let dataG = body["data"] as? [String: Any] else {
+            guard let selectedAccount = body["data"] as? [String: Any] else {
                 print("No account data selected")
                 return
             }
             
-            print("Received defaultAccountSelected: \(dataG)")
+            print("✅ Selected default account: \(selectedAccount)")
             
             if !didHandleBankConnection {
                 didHandleBankConnection = true
-                let dataArray: [[String: Any]] = [dataG]
                 DispatchQueue.main.async {
-                    self.onCompletion?(SDKResult(type: .success, chargeData: ["data": dataArray]))
+                    self.onCompletion?(SDKResult(type: .success, chargeData: ["data": [selectedAccount]]))
                     self.dismiss(animated: true)
                 }
             }