@jimrising/easymerchantsdk-react-native 2.4.8 → 2.5.0

package/ACH_CHARGE_ENDPOINT_TRACE.md

@@ -0,0 +1,69 @@
+# Back-trace: `/api/v1/ach/charge` → PaymentInfoVC only (ignore billing/additional)
+
+Endpoint: **`/api/v1/ach/charge`**  
+Built as: `EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()`  
+File: **`em-MobileCheckoutSDK-ReactNative/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift`**
+
+Billing and Additional Info flows (BillingInfoVC / AdditionalInfoVC) are ignored here; only direct ACH charge from PaymentInfoVC is listed.
+
+---
+
+## 1. Manual bank form (bank fields) — **Next** button
+
+- **Action:** `actionBtnNext`
+- **When:** Bank selected, manual bank fields form, **no billing/additional** (or nil `request.fields`).
+- **Direct ACH call:**
+  - **`accountBankChargeApi()`** (~line 9023)
+  - **`accountChargeApi()`** (no-arg, ~line 8816)
+
+---
+
+## 2. New manual ACH (add new bank account) — **Pay** button
+
+- **Action:** `actionBtnPayNowNewAccountView`
+- **When:** Add-new-bank-account form, **no billing/additional** (and no OTP needed, or billing nil).
+- **Direct ACH call:**
+  - **`accountBankChargeAddNewAccountApi()`** (~line 9926) — when no billing/additional and no OTP
+  - **`accountChargeAddNewAccountApi()`** (~line 9724) — when `request.fields` is nil and not saving
+  - **`accountChargeApi(customerId:)`** (~line 10183) — when `request.fields` is nil and saving (has customerId)
+
+---
+
+## 3. Saved bank (single saved account) — **Pay** button
+
+- **Action:** `actionBtnPayNowSingleAccountView`
+- **When:** Saved bank selected, **no billing/additional**.
+- **Direct ACH call:**
+  - **`grailPayAaccountChargeSingleSavedAccountApi()`** (~line 4830)
+  - (In other branch when not authenticated ACH: **`accountBankChargeSavedBankAccountApi()`** — in PaymentInfoVC; if present it also hits ach/charge.)
+
+---
+
+## 4. GrailPay — existing linked account
+
+- **Action:** Same **Next**-button flow when GrailPay + existing account, **no billing/additional**.
+- **Direct ACH call:**
+  - **`grailPayAccountChargeApi()`** (~line 4149) — no save
+  - **`grailPayAccountChargeWithSaveApi()`** (~line 4365) — with save
+
+---
+
+## 5. GrailPay — new account
+
+- **Action:** New GrailPay account flow, **no billing/additional**.
+- **Direct ACH call:**
+  - **`grailPayNewAccountChargeApi()`** (~line 4598)
+
+---
+
+## Summary (PaymentInfoVC only, no billing/additional)
+
+| Button / flow                    | API method that calls ach/charge                    |
+|----------------------------------|-----------------------------------------------------|
+| **actionBtnNext** (manual bank)  | `accountBankChargeApi`, `accountChargeApi()`        |
+| **actionBtnPayNowNewAccountView**| `accountBankChargeAddNewAccountApi`, `accountChargeAddNewAccountApi`, `accountChargeApi(customerId:)` |
+| **actionBtnPayNowSingleAccountView** | `grailPayAaccountChargeSingleSavedAccountApi` (and `accountBankChargeSavedBankAccountApi` in another branch) |
+| GrailPay existing (Next)         | `grailPayAccountChargeApi`, `grailPayAccountChargeWithSaveApi` |
+| GrailPay new                     | `grailPayNewAccountChargeApi`                       |
+
+All of the above use **`EnvironmentConfig.Endpoints.achCharge.path()`** → **`/api/v1/ach/charge`**.

package/README.md

@@ -19,7 +19,7 @@ Add the EasyMerchant SDK to your `package.json` under `dependencies`:
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^2.4.8"
+  "@jimrising/easymerchantsdk-react-native": "^2.3.9"
 }
 ```
 

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +1,11 @@
-arguments=--init-script /var/folders/n2/0cwbnhxj2fnfrvxj2l226njc0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/n2/0cwbnhxj2fnfrvxj2l226njc0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+arguments=--init-script /var/folders/7t/r_0xdprj4qqdnkmccbx458sr0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/7t/r_0xdprj4qqdnkmccbx458sr0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/opt/homebrew/Cellar/openjdk@17/17.0.15/libexec/openjdk.jdk/Contents/Home
+java.home=/opt/homebrew/Cellar/openjdk@17/17.0.16/libexec/openjdk.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -64,8 +64,8 @@ repositories {
     maven {
         url = uri("https://maven.pkg.github.com/EasyMerchant/em-MobileCheckoutSDK-Android")
         credentials {
-            username = "jim-easymerchant"
-            password = "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"
+            username = project.findProperty("GITHUB_USERNAME") ?: System.getenv("GITHUB_USERNAME") ?: ""
+            password = project.findProperty("GITHUB_PASSWORD") ?: System.getenv("GITHUB_PASSWORD") ?: ""
         }
     }
 }
@@ -88,8 +88,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
 
     // Third-party libs
-    implementation 'androidx.browser:browser:1.8.0'
-    implementation 'com.app:paysdk:1.6.3.6'
+    implementation 'com.app:paysdk:1.6.6.3'
     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/android/config.properties

@@ -0,0 +1,5 @@
+# GitHub Packages credentials (only needed if resolving the Android SDK from GitHub Packages)
+# Set your own values. Do not commit real credentials.
+GITHUB_USERNAME=
+GITHUB_PASSWORD=
+GITHUB_URL=https://maven.pkg.github.com/EasyMerchant/em-MobileCheckoutSDK-Android

package/android/config.properties.example

@@ -0,0 +1,5 @@
+# GitHub Packages credentials (only needed if resolving the Android SDK from GitHub Packages)
+# Copy to config.properties and set your values. Do not commit config.properties with real credentials.
+GITHUB_USERNAME=your_github_username
+GITHUB_PASSWORD=your_github_token
+GITHUB_URL=https://maven.pkg.github.com/EasyMerchant/em-MobileCheckoutSDK-Android

package/ios/ApiManager/APIHeaders.swift

@@ -22,10 +22,17 @@ 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,
               let secret = EnvironmentConfig.apiSecret else { return [:] }
-        return ["x-api-key": key, "x-api-secret": secret]
+        return ["X-Api-Key": key, "X-Api-Secret": secret]
     }
 }
 

package/ios/ApiManager/APIRequest.swift

@@ -21,7 +21,6 @@ struct APIRequest {
     func buildURLRequest() -> URLRequest? {
         let fullURL = EnvironmentConfig.baseURL + endpoint.path()
         guard let url = URL(string: fullURL) else {
-            print("Invalid URL: \(fullURL)")
             return nil
         }
 
@@ -30,9 +29,14 @@ struct APIRequest {
 
         // Combine default headers with passed-in headers
         var allHeaders = APIHeaders.commonHeaders()
-        allHeaders.merge(APIHeaders.clientTokenHeader(), uniquingKeysWith: { $1 })
-        allHeaders.merge(APIHeaders.customerTokenHeader(), uniquingKeysWith: { $1 })
-        allHeaders.merge(APIHeaders.apiAuthHeaders(), uniquingKeysWith: { $1 })
+        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(headers, uniquingKeysWith: { $1 }) // override if needed
 
         // Apply to request
@@ -47,10 +51,8 @@ struct APIRequest {
                 request.httpBody = jsonData
                 // Debug
                 if let jsonString = String(data: jsonData, encoding: .utf8) {
-                    print("JSON Payload Sent:\n\(jsonString)")
                 }
             } catch {
-                print("Failed to serialize request body: \(error)")
                 return nil
             }
         }

package/ios/ApiManager/APIService.swift

@@ -28,7 +28,6 @@ class APIService {
 
             // Debug print
             if let data = data, let rawString = String(data: data, encoding: .utf8) {
-                print("🧾 Raw Response:\n\(rawString)")
             }
 
             if let error = error {
@@ -87,7 +86,6 @@ class APIService {
 
             // Debug: optional - print raw response
             if let rawString = String(data: data, encoding: .utf8) {
-                print("🧾 Raw Response:\n\(rawString)")
             }
 
             // Attempt decoding

package/ios/Classes/EasyMerchantSdk.h

@@ -2,7 +2,6 @@
 
 @interface EasyMerchantSdk : NSObject <RCTBridgeModule>
 
-// Deep link handling for GrailPay
 + (BOOL)handleDeepLink:(NSURL *)url;
 
 @end

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 ()
@@ -123,6 +123,27 @@ RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
   });
 }
 
+RCT_EXPORT_METHOD(handleDeepLink:(NSString *)url
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if (!url || [url length] == 0) {
+      reject(@"INVALID_URL", @"URL is required", nil);
+      return;
+    }
+    
+    NSURL *deepLinkURL = [NSURL URLWithString:url];
+    if (!deepLinkURL) {
+      reject(@"INVALID_URL", @"Invalid URL format", nil);
+      return;
+    }
+    
+    [GrailPayHelper handleDeepLinkCallbackWithUrl:deepLinkURL];
+    resolve(@"Deep link handled successfully");
+  });
+}
+
 // Helper method to find the top-most view controller
 - (UIViewController *)topMostViewController {
   UIWindow *keyWindow = nil;
@@ -164,10 +185,38 @@ RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
   return base;
 }
 
-// MARK: - Deep Link Handling
-
 + (BOOL)handleDeepLink:(NSURL *)url {
-  return [EasyMerchantSdkPlugin handleDeepLinkWithUrl:url];
+  if (!url || !url.scheme) {
+    return NO;
+  }
+  
+  NSString *scheme = url.scheme.lowercaseString;
+  NSString *host = url.host ? url.host.lowercaseString : @"";
+  NSString *urlString = url.absoluteString;
+  
+  // GrailPay backend OAuth callback (intercepted from bank app)
+  if (([scheme isEqualToString:@"https"] || [scheme isEqualToString:@"http"]) &&
+      [host isEqualToString:@"bank-link-sdk-api.grailpay.com"]) {
+    [GrailPayHelper handleGrailPayOAuthCallbackWithUrl:url];
+    return YES;
+  }
+  
+  // Expediter/expeditor schemes
+  if ([scheme isEqualToString:@"expediter"] || [scheme isEqualToString:@"expeditor"]) {
+    [GrailPayHelper handleDeepLinkCallbackWithUrl:url];
+    return YES;
+  }
+  
+  // grailpay deep link or app-specific scheme
+  if ([scheme isEqualToString:@"grailpay"] || 
+      [scheme hasPrefix:@"com."] || 
+      [scheme hasPrefix:@"org."] ||
+      [urlString containsString:@"callback"]) {
+    [GrailPayHelper handleDeepLinkCallbackWithUrl:url];
+    return YES;
+  }
+  
+  return NO;
 }
 
 @end

package/ios/Classes/EasyMerchantSdk.swift

@@ -143,20 +143,6 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         resolve("iOS \(UIDevice.current.systemVersion)")
     }
     
-    // MARK: - Deep Link Handling for GrailPay
-    
-    @objc public static func handleDeepLink(url: URL) -> Bool {
-        print("🔗 SDK: Deep link received: \(url)")
-        
-        if url.scheme == "grailpay" && url.host == "callback" {
-            print("✅ SDK: GrailPay callback detected")
-            GrailPayHelper.handleDeepLinkCallback(url: url)
-            return true
-        }
-        
-        return false
-    }
-    
     // MARK: - Helpers
     
     private func getTopViewController() -> UIViewController? {
@@ -230,7 +216,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         let grailPay = (json["grailPayParams"] as? [String: Any]).flatMap {
             GrailPayRequest(
                 role: $0["role"] as? String ?? "",
-                timeout: $0["timeout"] as? Int ?? 0,
+                timeout: max($0["timeout"] as? Int ?? 11, 11),
                 brandingName: $0["brandingName"] as? String ?? "",
                 finderSubtitle: $0["finderSubtitle"] as? String ?? "",
                 searchPlaceholder: $0["searchPlaceholder"] as? String ?? ""

package/ios/Classes/EasyPayViewController.swift

@@ -58,7 +58,7 @@ public final class EasyPayViewController: UINavigationController {
         // Disable interactive pop gesture to prevent dismissal by sliding from left
         self.interactivePopGestureRecognizer?.isEnabled = false
 
-        let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "PaymentInfoVC") as! PaymentInfoVC
+        let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "PaymentInfoVC") as! PaymentInfoVC
         vc.modalPresentationStyle = .overFullScreen
         vc.configureWith(request: request, delegate: easyPayDelegate)
         // For API key/secret flow, pass amount immediately. For clientToken flow,

package/ios/EnvironmentConfig.swift

@@ -75,7 +75,6 @@ public class EnvironmentConfig {
             case .hostedCheckouts: return "/api/v1/hostedcheckouts"
             case .emailVerification: return "/api/v1/customer/send_otp"
             case .verifyOtp: return "/api/v1/customer/verify_otp"
-            // case .getCards: return "/api/v1/customer/card"
             case .getCards: return "/api/v1/card"
             case .creditCharges: return "/api/v1/customer/charges"
             case .account: return "/api/v1/ach/account"

package/ios/Example/SceneDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  SceneDelegate.swift
-//  easymerchantsdkDemo
+//  EasyPaySDKDemo
 //
 //  Created by iftekhar on 13/07/24.
 //
@@ -17,6 +17,28 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
         // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
         guard let _ = (scene as? UIWindowScene) else { return }
+        
+        // Handle deep links on app launch
+        if let urlContext = connectionOptions.urlContexts.first {
+            handleDeepLink(url: urlContext.url)
+        }
+    }
+    
+    // MARK: - Deep Link Handling for GrailPay
+    
+    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
+        if let url = URLContexts.first?.url {
+            handleDeepLink(url: url)
+        }
+    }
+    
+    private func handleDeepLink(url: URL) {
+        
+        if url.scheme == "grailpay" && url.host == "callback" {
+            
+            // Handle deep link via GrailPayHelper (no more GrailPayVC lookup)
+            //GrailPayHelper.handleDeepLinkCallback(url: url)
+        }
     }
 
     func sceneDidDisconnect(_ scene: UIScene) {

package/ios/Example/ViewController.swift

@@ -85,7 +85,6 @@
 //        )
 //        
 //        guard let billingData = try? JSONEncoder().encode(fields) else {
-//            print("Failed to encode fields")
 //            return
 //        }
 //        
@@ -192,7 +191,6 @@
 //        )
 //        
 //        guard let billingData = try? JSONEncoder().encode(fields) else {
-//            print("Failed to encode fields")
 //            return
 //        }
 //        
@@ -304,7 +302,6 @@
 //                // Combine into one string for the label
 //                lblResponseShow.text = "Status: \(status), Message: \(message)"
 //                
-//                print("Cancel Data:", chargeData) // Debug print
 //            }
 //            
 //        case .success:
@@ -336,7 +333,6 @@
 //            do {
 //                let jsonData = try JSONSerialization.data(withJSONObject: fullResponse, options: .prettyPrinted)
 //                if let jsonString = String(data: jsonData, encoding: .utf8) {
-//                    print(jsonString)
 //                    lblResponseShow.text = jsonString
 //                }
 //            } catch {
@@ -351,7 +347,6 @@
 //                lblResponseShow.isHidden = false
 //                lblResponseShow.text = "Status: \(status), Message: \(message)"
 //                
-//                print("Error Data:", chargeData) // Debugging
 //            } else {
 //                lblResponseShow.isHidden = false
 //                lblResponseShow.text = "An unknown error occurred."
@@ -446,7 +441,6 @@
 ////        )
 ////
 ////        guard let billingData = try? JSONEncoder().encode(fields) else {
-////            print("Failed to encode fields")
 ////            return
 ////        }
 ////
@@ -606,10 +600,8 @@
 ////
 ////            let jsonData = try JSONSerialization.data(withJSONObject: requestDict, options: [.prettyPrinted])
 ////            if let jsonString = String(data: jsonData, encoding: .utf8) {
-////                print("Request Configuration JSON:\n\(jsonString)")
 ////            }
 ////        } catch {
-////            print("Failed to serialize request to JSON: \(error)")
 ////        }
 ////
 ////        if request.initializationErrorMessage == nil {

package/ios/Extensions/UIFont.swift

@@ -21,7 +21,6 @@ extension UIFont {
                     var error: Unmanaged<CFError>?
                     let success = CTFontManagerRegisterGraphicsFont(font, &error)
                     if !success {
-                        print("Error registering font: maybe it was already registered.")
                     }
                 } else {
                     fatalError("Couldn't find font \(fontPath)")

package/ios/Extensions/UIViewController+Extension.swift

@@ -28,7 +28,6 @@ extension UIViewController {
     
     func debugPrintLog(_ log: String) {
 #if DEBUG
-        print("Debug - \(log)")
 #endif
     }