react-amwal-pay 0.1.17 → 0.1.18

package/ReactAmwalPay.podspec

@@ -14,10 +14,11 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/amwal-pay/AnwalPaySDKReactNative.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
+  s.exclude_files = "ios/build/**"
   s.private_header_files = "ios/**/*.h"
 
   # Default to Release subspec
   amwal_subspec = ENV['AMWAL_SUBSPEC'] || 'Release'
-  s.dependency "amwalsdk/#{amwal_subspec}"
+  s.dependency "amwalsdk/#{amwal_subspec}", '>= 1.1.93'
   install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -79,7 +79,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation("com.amwal-pay:amwal_sdk:+"){
+  implementation("com.amwal-pay:amwal_sdk:1.1.90"){
     exclude group: 'com.android.support', module: 'support-v4'
     exclude group: 'com.android.support', module: 'design'
   }

package/android/gradle.properties

@@ -1,4 +1,4 @@
-ReactAmwalPay_kotlinVersion=2.0.21
+ReactAmwalPay_kotlinVersion=2.2.20
 ReactAmwalPay_minSdkVersion=24
 ReactAmwalPay_targetSdkVersion=34
 ReactAmwalPay_compileSdkVersion=35

package/ios/ReactAmwalPay.swift

@@ -3,397 +3,144 @@ import amwalsdk
 import React
 import UIKit
 
-// MARK: - Container view controller that keeps SDK alive during 3DS presentation
-/// This container wraps the SDK view controller as a child
-/// When 3DS opens its WebView, it can present on top without dismissing the SDK
-class ShareableContainerViewController: UIViewController {
-    private let sdkViewController: UIViewController
-    
-    init(sdkViewController: UIViewController) {
-        self.sdkViewController = sdkViewController
-        super.init(nibName: nil, bundle: nil)
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        // Add SDK view controller as child - this keeps it alive during 3DS presentation
-        addChild(sdkViewController)
-        view.addSubview(sdkViewController.view)
-        sdkViewController.view.frame = view.bounds
-        sdkViewController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        sdkViewController.didMove(toParent: self)
-        
-        view.backgroundColor = .clear
-        sdkViewController.view.backgroundColor = .clear
-        
-        // Enable presentation context to handle 3DS WebView presentation
-        // This is critical: allows 3DS WebView to present on top without dismissing the SDK
-        definesPresentationContext = true
-        providesPresentationContextTransitionStyle = true
-        
-        // Ensure the SDK view controller also allows nested presentations
-        // This prevents it from being dismissed when 3DS presents its WebView
-        sdkViewController.definesPresentationContext = true
-        sdkViewController.providesPresentationContextTransitionStyle = true
-    }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        // Ensure container is ready for nested presentations
-    }
-    
-    private func topmostPresentedViewController() -> UIViewController {
-        var topController: UIViewController = self
-        while let presented = topController.presentedViewController {
-            topController = presented
-        }
-        return topController
-    }
-    
-    override func present(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) {
-        // If already presenting, present from the topmost controller
-        // This allows 3DS WebView to present on top without dismissing the SDK
-        if let presented = presentedViewController {
-            let topmost = topmostPresentedViewController()
-            topmost.present(viewControllerToPresent, animated: flag, completion: completion)
-        } else {
-            super.present(viewControllerToPresent, animated: flag, completion: completion)
-        }
-    }
+struct AmwalLog {
+    private static let prefix = "[AMWAL_PAY_SDK]"
+    static func debug(_ msg: String, tag: String = "") { print("\(prefix) 🔵 [\(tag)] \(msg)") }
+    static func info(_ msg: String, tag: String = "") { print("\(prefix) 🟢 [\(tag)] \(msg)") }
+    static func warn(_ msg: String, tag: String = "") { print("\(prefix) 🟡 [\(tag)] \(msg)") }
+    static func error(_ msg: String, tag: String = "") { print("\(prefix) 🔴 [\(tag)] \(msg)") }
 }
 
-// MARK: - Fix UIViewController presentation for share sheets
-public extension UIViewController {
-    static let swizzlePresentOnce: Void = {
-        let originalSelector = #selector(UIViewController.present(_:animated:completion:))
-        let swizzledSelector = #selector(UIViewController.swizzled_present(_:animated:completion:))
-        
-        guard let originalMethod = class_getInstanceMethod(UIViewController.self, originalSelector),
-              let swizzledMethod = class_getInstanceMethod(UIViewController.self, swizzledSelector) else {
-            return
-        }
-        
-        method_exchangeImplementations(originalMethod, swizzledMethod)
-    }()
-    
-    @objc dynamic func swizzled_present(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) {
-        // Check if this view controller's view is in the window hierarchy
-        if self.view.window == nil {
-            print("⚠️ Attempting to present on VC not in hierarchy, finding correct presenter...")
-            // Find the correct view controller to present from
-            if let topVC = UIViewController.getTopMostViewController() {
-                topVC.swizzled_present(viewControllerToPresent, animated: flag, completion: completion)
-                return
-            }
-        }
-        
-        // Special handling for ShareableContainerViewController and its children
-        // If presenting from a child of ShareableContainerViewController, forward to container
-        if let container = findShareableContainer() {
-            if container != self {
-                // We're a child of the container, forward to container
-                container.swizzled_present(viewControllerToPresent, animated: flag, completion: completion)
-                return
-            }
-            // We ARE the container - allow nested presentations
-            // Don't auto-dismiss, just present on top
-        } else if self.presentedViewController != nil && !self.definesPresentationContext {
-            // Not a container, and already presenting - auto-dismiss
-            print("⚠️ Already presenting, dismissing first...")
-            self.dismiss(animated: false) { [weak self] in
-                self?.swizzled_present(viewControllerToPresent, animated: flag, completion: completion)
-            }
-            return
-        }
-        
-        // Call original implementation
-        self.swizzled_present(viewControllerToPresent, animated: flag, completion: completion)
-    }
-    
-    // Helper to find ShareableContainerViewController in parent hierarchy
-    private func findShareableContainer() -> ShareableContainerViewController? {
-        var current: UIViewController? = self
-        while let parent = current?.parent {
-            if let container = parent as? ShareableContainerViewController {
-                return container
-            }
-            current = parent
-        }
-        if let container = self as? ShareableContainerViewController {
-            return container
-        }
-        return nil
-    }
-    
+extension UIViewController {
     static func getTopMostViewController() -> UIViewController? {
-        var topController: UIViewController?
-        
-        if #available(iOS 13.0, *) {
-            let keyWindow = UIApplication.shared.connectedScenes
-                .compactMap { $0 as? UIWindowScene }
-                .flatMap { $0.windows }
-                .first { $0.isKeyWindow }
-            topController = keyWindow?.rootViewController
-        } else {
-            topController = UIApplication.shared.keyWindow?.rootViewController
+        let keyWindow = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .flatMap { $0.windows }
+            .first { $0.isKeyWindow }
+        var top = keyWindow?.rootViewController
+        while let presented = top?.presentedViewController {
+            top = presented
         }
-        
-        while let presented = topController?.presentedViewController {
-            topController = presented
-        }
-        
-        return topController
+        return top
     }
 }
 
 @objc(ReactAmwalPay)
 open class ReactAmwalPay: RCTEventEmitter {
     private var hasListeners = false
-    private var sdkWindow: UIWindow?  // Separate window for SDK to avoid modal dismissal issues
-    
-    // Initialize swizzling when the class is first loaded
-    private static let initializeSwizzling: Void = {
-        _ = UIViewController.swizzlePresentOnce
-    }()
-    
-    // Initialize swizzling when the module is loaded
-    public override init() {
-        super.init()
-        _ = ReactAmwalPay.initializeSwizzling
-    }
+    private weak var presentingVC: UIViewController?
 
     open override func supportedEvents() -> [String]! {
         return ["onResponse", "onCustomerId"]
     }
 
-    open override func startObserving() {
-        print("🔴 startObserving called - setting hasListeners = true")
-        hasListeners = true
-    }
-
-    open override func stopObserving() {
-        print("🔴 stopObserving called - setting hasListeners = false")
-        hasListeners = false
-    }
+    open override func startObserving() { hasListeners = true }
+    open override func stopObserving() { hasListeners = false }
 
     private func emitOnResponse(_ params: [String: Any]) {
-        print("🔴 emitOnResponse called with params: \(params)")
-        print("🔴 hasListeners: \(hasListeners)")
-        if hasListeners {
-            print("🔴 Sending onResponse event to JS")
-            sendEvent(withName: "onResponse", body: params)
-        } else {
-            print("🔴 NOT sending - no listeners!")
+        guard hasListeners else {
+            AmwalLog.warn("onResponse not sent — no listeners", tag: "EVENTS")
+            return
         }
+        sendEvent(withName: "onResponse", body: params)
     }
 
     private func emitOnCustomerId(_ customerId: String?) {
-        print("🔴 emitOnCustomerId called with: \(customerId ?? "nil")")
-        print("🔴 hasListeners: \(hasListeners)")
-        if hasListeners {
-            print("🔴 Sending onCustomerId event to JS")
-            sendEvent(withName: "onCustomerId", body: customerId)
-        } else {
-            print("🔴 NOT sending - no listeners!")
-        }
+        guard hasListeners else { return }
+        sendEvent(withName: "onCustomerId", body: customerId)
     }
 
-    private func mapEnvironment(environment: String) -> Config.Environment {
-        switch environment {
-        case "PROD": return .PROD
-        case "UAT": return .UAT
-        case "SIT": return .SIT
-        default: return .PROD
-        }
+    private func mapEnvironment(_ s: String) -> Config.Environment {
+        switch s { case "PROD": return .PROD; case "UAT": return .UAT; default: return .SIT }
     }
-    
-    private func mapCurrency(currency: String) -> Config.Currency {
-        switch currency {
-        case "OMR": return .OMR
-        default: return .OMR
-        }
+    private func mapCurrency(_ s: String) -> Config.Currency { return .OMR }
+    private func mapTransactionType(_ s: String) -> Config.TransactionType {
+        switch s { case "NFC": return .nfc; case "APPLE_PAY": return .applePay; default: return .cardWallet }
     }
-    
-    private func mapTransactionType(transactionType: String) -> Config.TransactionType {
-        switch transactionType {
-        case "CARD_WALLET": return .cardWallet
-        case "NFC": return .nfc
-        case "APPLE_PAY": return .applePay
-        default: return .cardWallet
-        }
-    }
-    
-    private func mapLocale(locale: String) -> Config.Locale {
-        switch locale {
-        case "en": return .en
-        case "ar": return .ar
-        default: return .en
-        }
+    private func mapLocale(_ s: String) -> Config.Locale {
+        switch s { case "ar": return .ar; default: return .en }
     }
-    
-    private func prepareConfig(config: [String: Any]) -> Config {
-        // Handle additionValues
-        var additionValues: [String: String] = Config.generateDefaultAdditionValues()
-        if let configAdditionValues = config["additionValues"] as? [String: String] {
-            // Merge with default values, allowing override
-            for (key, value) in configAdditionValues {
-                additionValues[key] = value
-            }
-        }
 
+    private func buildConfig(_ raw: [String: Any]) -> Config {
+        var additionValues = Config.generateDefaultAdditionValues()
+        if let extra = raw["additionValues"] as? [String: String] {
+            extra.forEach { additionValues[$0] = $1 }
+        }
+        let secureHash = raw["secureHash"] as? String
         return Config(
-            environment: mapEnvironment(environment: config["environment"] as? String ?? "PROD"),
-            sessionToken: config["sessionToken"] as? String ?? "",
-            currency: mapCurrency(currency: config["currency"] as? String ?? "OMR"),
-            amount: config["amount"] as? String ?? "",
-            merchantId: config["merchantId"] as? String ?? "",
-            terminalId: config["terminalId"] as? String ?? "",
-            customerId: config["customerId"] as? String,
-            locale: mapLocale(locale: config["locale"] as? String ?? "en"),
-            transactionType: mapTransactionType(transactionType: config["transactionType"] as? String ?? "CARD_WALLET"),
-            transactionId: config["transactionId"] as? String ?? Config.generateTransactionId(),
+            environment: mapEnvironment(raw["environment"] as? String ?? "SIT"),
+            sessionToken: raw["sessionToken"] as? String ?? "",
+            currency: mapCurrency(raw["currency"] as? String ?? "OMR"),
+            amount: raw["amount"] as? String ?? "",
+            merchantId: raw["merchantId"] as? String ?? "",
+            terminalId: raw["terminalId"] as? String ?? "",
+            customerId: raw["customerId"] as? String,
+            locale: mapLocale(raw["locale"] as? String ?? "en"),
+            transactionType: mapTransactionType(raw["transactionType"] as? String ?? "CARD_WALLET"),
+            transactionId: raw["transactionId"] as? String ?? Config.generateTransactionId(),
             additionValues: additionValues,
-            merchantReference: config["merchantReference"] as? String,
-            secureHash: config["secureHash"] as? String
+            merchantReference: raw["merchantReference"] as? String,
+            secureHash: secureHash
         )
     }
-    
+
     @objc
     open func initiate(_ config: [String: Any]) {
-      DispatchQueue.main.async {
-           do {
-               let sdkConfig = self.prepareConfig(config: config)
-               let sdk = AmwalSDK()
-
-               guard let rootVC = UIApplication.shared.keyWindow?.rootViewController else {
-                   let errorData: [String: Any] = [
-                       "data": [
-                           "status": "ERROR",
-                           "message": "No root view controller found"
-                       ]
-                   ]
-                   self.emitOnResponse(errorData)
-                   return
-               }
-
-               let sdkVC = try sdk.createViewController(
-                   config: sdkConfig,
-                   onResponse: { [weak self] response in
-                       print("🟠 SDK onResponse callback fired!")
-                       print("🟠 Response value: \(response ?? "nil")")
-
-                       // Always dismiss SDK window when this callback fires
-                       DispatchQueue.main.async {
-                           self?.dismissSDKWindow()
-                       }
-
-                       // nil response means SDK was dismissed without completing a payment
-                       // (e.g., error during initialization). Don't emit to React Native.
-                       guard let response = response else {
-                           print("🟠 nil response - SDK dismissed without payment, not emitting to JS")
-                           return
-                       }
-
-                       // The SDK returns a JSON string, we need to parse it
-                       if let data = response.data(using: .utf8),
-                          let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
-                           print("🟠 Successfully parsed JSON string to dictionary")
-                           self?.emitOnResponse(json)
-                       } else {
-                           print("🟠 Could not parse response as JSON, sending error")
-                           let errorData: [String: Any] = [
-                               "status": "error",
-                               "message": "Invalid response format",
-                               "rawResponse": response
-                           ]
-                           self?.emitOnResponse(errorData)
-                       }
-                   },
-                   onCustomerId: { [weak self] customerId in
-                       print("🟠 SDK onCustomerId callback fired with: \(customerId ?? "nil")")
-                       self?.emitOnCustomerId(customerId)
-                   }
-               )
-
-               // Ensure transparency
-               sdkVC.view.backgroundColor = .clear
-               sdkVC.view.isOpaque = false
-               
-               // Wrap SDK view controller in container
-               let containerVC = ShareableContainerViewController(sdkViewController: sdkVC)
-               containerVC.view.backgroundColor = .clear
-
-               print("🟠 SDK ViewController wrapped in container")
-               print("🟠 Creating separate window for SDK...")
-
-               // Create a separate window for the SDK
-               // This prevents modal presentation issues - SDK lives in its own window
-               // 3DS can present on top without affecting the SDK
-               if #available(iOS 13.0, *) {
-                   if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
-                       self.sdkWindow = UIWindow(windowScene: windowScene)
-                   }
-               } else {
-                   self.sdkWindow = UIWindow(frame: UIScreen.main.bounds)
-               }
-               
-               guard let sdkWindow = self.sdkWindow else {
-                   print("🟠 Failed to create SDK window, falling back to modal presentation")
-                   rootVC.present(containerVC, animated: true)
-                   return
-               }
-               
-               sdkWindow.rootViewController = containerVC
-               sdkWindow.windowLevel = .normal + 1  // Above main window
-               sdkWindow.backgroundColor = .clear
-               sdkWindow.isOpaque = false
-               sdkWindow.makeKeyAndVisible()
-               
-               print("🟠 SDK window created and made visible")
-           } catch {
-               print("Presentation failed: \(error.localizedDescription)")
-               let errorData: [String: Any] = [
-                   "data": [
-                       "status": "ERROR",
-                       "message": error.localizedDescription
-                   ]
-               ]
-               self.emitOnResponse(errorData)
-           }
-       }
+        DispatchQueue.main.async {
+            do {
+                let sdkConfig = self.buildConfig(config)
+                AmwalLog.info("Building SDK config — env: \(sdkConfig.environment), amount: \(sdkConfig.amount)", tag: "SDK")
+
+                guard let rootVC = UIViewController.getTopMostViewController() else {
+                    AmwalLog.error("No root VC found", tag: "SDK")
+                    self.emitOnResponse(["status": "ERROR", "message": "No root view controller"])
+                    return
+                }
+                AmwalLog.info("Presenting from: \(type(of: rootVC))", tag: "SDK")
+
+                let sdk = AmwalSDK()
+                let sdkVC = try sdk.createViewController(
+                    config: sdkConfig,
+                    onResponse: { [weak self] response in
+                        AmwalLog.info("onResponse received", tag: "SDK")
+                        DispatchQueue.main.async {
+                            self?.presentingVC?.dismiss(animated: true)
+                            self?.presentingVC = nil
+                        }
+                        guard let response = response,
+                              let data = response.data(using: .utf8),
+                              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+                        else { return }
+                        self?.emitOnResponse(json)
+                    },
+                    onCustomerId: { [weak self] customerId in
+                        self?.emitOnCustomerId(customerId)
+                    }
+                )
+
+                sdkVC.modalPresentationStyle = .overFullScreen
+                self.presentingVC = sdkVC
+                rootVC.present(sdkVC, animated: true) {
+                    AmwalLog.info("SDK presented", tag: "SDK")
+                }
+            } catch {
+                AmwalLog.error("initiate failed: \(error)", tag: "SDK")
+                self.emitOnResponse(["status": "ERROR", "message": error.localizedDescription])
+            }
+        }
     }
-    
+
     @objc
     open override func addListener(_ eventName: String) {
         super.addListener(eventName)
-        print("🔴 addListener called for: \(eventName)")
-        if !hasListeners {
-            hasListeners = true
-            print("🔴 Set hasListeners = true")
-        }
+        hasListeners = true
     }
 
     @objc
     open override func removeListeners(_ count: Double) {
         super.removeListeners(count)
-        print("🔴 removeListeners called with count: \(count)")
     }
 
     @objc
-    public override static func requiresMainQueueSetup() -> Bool {
-        return true
-    }
-    
-    // Dismiss SDK window when payment completes
-    private func dismissSDKWindow() {
-        print("🟠 Dismissing SDK window...")
-        sdkWindow?.isHidden = true
-        sdkWindow?.rootViewController = nil
-        sdkWindow = nil
-    }
+    public override static func requiresMainQueueSetup() -> Bool { return true }
 }