react-amwal-pay 0.1.13 → 0.1.14

package/ios/ReactAmwalPay.m

@@ -3,12 +3,10 @@
 
 @interface RCT_EXTERN_MODULE(ReactAmwalPay, RCTEventEmitter)
 
-RCT_EXTERN_METHOD(initiate:(NSDictionary *)config
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(initiate:(NSDictionary *)config)
 
-RCT_EXTERN_METHOD(onResponse:(RCTResponseSenderBlock)callback)
+RCT_EXTERN_METHOD(addListener:(NSString *)eventName)
 
-RCT_EXTERN_METHOD(onCustomerId:(RCTResponseSenderBlock)callback)
+RCT_EXTERN_METHOD(removeListeners:(double)count)
 
 @end

package/ios/ReactAmwalPay.swift

@@ -1,11 +1,118 @@
 import Foundation
 import amwalsdk
 import React
+import UIKit
+
+// 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
+            }
+        }
+        
+        // Check if we're already presenting something
+        if self.presentedViewController != nil {
+            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)
+    }
+    
+    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
+        }
+        
+        while let presented = topController?.presentedViewController {
+            topController = presented
+        }
+        
+        return topController
+    }
+}
 
 @objc(ReactAmwalPay)
-class ReactAmwalPay: RCTEventEmitter {
+open class ReactAmwalPay: RCTEventEmitter {
     private var hasListeners = false
     
+    // 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
+    }
+
+    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
+    }
+
+    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!")
+        }
+    }
+
+    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!")
+        }
+    }
+
     private func mapEnvironment(environment: String) -> Config.Environment {
         switch environment {
         case "PROD": return .PROD
@@ -39,8 +146,6 @@ class ReactAmwalPay: RCTEventEmitter {
         }
     }
     
-    private var onResponseCallback: RCTResponseSenderBlock?
-    private var onCustomerIdCallback: RCTResponseSenderBlock?
     private func prepareConfig(config: [String: Any]) -> Config {
         // Handle additionValues
         var additionValues: [String: String] = Config.generateDefaultAdditionValues()
@@ -50,7 +155,7 @@ class ReactAmwalPay: RCTEventEmitter {
                 additionValues[key] = value
             }
         }
-        
+
         return Config(
             environment: mapEnvironment(environment: config["environment"] as? String ?? "PROD"),
             sessionToken: config["sessionToken"] as? String ?? "",
@@ -68,56 +173,91 @@ class ReactAmwalPay: RCTEventEmitter {
     }
     
     @objc
-    func initiate(_ config: [String: Any],
-                 resolver resolve: @escaping RCTPromiseResolveBlock,
-                 rejecter reject: @escaping RCTPromiseRejectBlock) {
+    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 {
-                   reject("NO_ROOT_VC", "No root view controller found", nil)
+                   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
-                                         self?.onResponseCallback?([[
-                                             "status": response != nil ? "success" : "error",
-                                             "message": response != nil ? "Transaction completed" : "Transaction failed",
-                                             "data": response ?? ""
-                                         ]])
-                                     },
+                       print("🟠 SDK onResponse callback fired!")
+                       print("🟠 Response type: \(type(of: response))")
+                       print("🟠 Response value: \(response ?? "nil")")
+
+                       // The SDK returns a JSON string, we need to parse it
+                       if let responseString = response as? String,
+                          let data = responseString.data(using: .utf8),
+                          let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
+                           print("🟠 Successfully parsed JSON string to dictionary")
+                           self?.emitOnResponse(json)
+                       } else if let responseDict = response as? [String: Any] {
+                           print("🟠 Response is already a dictionary")
+                           self?.emitOnResponse(responseDict)
+                       } else {
+                           print("🟠 Could not parse response, sending as-is")
+                           let errorData: [String: Any] = [
+                               "status": "error",
+                               "message": "Invalid response format",
+                               "rawResponse": String(describing: response)
+                           ]
+                           self?.emitOnResponse(errorData)
+                       }
+                   },
                    onCustomerId: { [weak self] customerId in
-                     self?.onCustomerIdCallback?([customerId])
-                                       }
+                       print("🟠 SDK onCustomerId callback fired with: \(customerId ?? "nil")")
+                       self?.emitOnCustomerId(customerId)
+                   }
                )
-               
+
+               print("🟠 SDK ViewController created successfully")
+               print("🟠 About to present SDK ViewController...")
+
                // Present modally (critical missing piece)
                rootVC.present(sdkVC, animated: true)
-               
-               resolve(true)
            } catch {
                print("Presentation failed: \(error.localizedDescription)")
-               reject("PRESENTATION_ERROR", error.localizedDescription, error)
+               let errorData: [String: Any] = [
+                   "data": [
+                       "status": "ERROR",
+                       "message": error.localizedDescription
+                   ]
+               ]
+               self.emitOnResponse(errorData)
            }
        }
     }
     
-  @objc
-  func onResponse(_ callback: @escaping RCTResponseSenderBlock) {
-      onResponseCallback = callback
-  }
-  
-  @objc
-  func onCustomerId(_ callback: @escaping RCTResponseSenderBlock) {
-      onCustomerIdCallback = callback
-  }
-  
-    
-    override static func requiresMainQueueSetup() -> Bool {
+    @objc
+    open override func addListener(_ eventName: String) {
+        super.addListener(eventName)
+        print("🔴 addListener called for: \(eventName)")
+        if !hasListeners {
+            hasListeners = true
+            print("🔴 Set 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
     }
 }

package/lib/module/AmwalPaySDK.js

@@ -61,14 +61,28 @@ class AmwalPaySDK {
   setupEventListeners(config) {
     // Remove any existing listeners
     this.removeEventListeners();
+    console.log('🟢 Setting up event listeners...');
+    console.log('🟢 onResponse callback exists?', typeof config.onResponse === 'function');
+    console.log('🟢 onCustomerId callback exists?', typeof config.onCustomerId === 'function');
     this.onResponseSubscription = onResponse(response => {
+      console.log('🟢 SDK onResponse listener triggered with:', response);
       console.log('Received AmwalPayResponse:', response);
-      config.onResponse(response);
+      if (config.onResponse) {
+        config.onResponse(response);
+      } else {
+        console.error('❌ config.onResponse is not a function!');
+      }
     });
     this.onCustomerIdSubscription = onCustomerId(customerId => {
+      console.log('🟢 SDK onCustomerId listener triggered with:', customerId);
       console.log('Received customerId:', customerId);
-      config.onCustomerId(customerId);
+      if (config.onCustomerId) {
+        config.onCustomerId(customerId);
+      } else {
+        console.error('❌ config.onCustomerId is not a function!');
+      }
     });
+    console.log('🟢 Event listeners set up complete');
   }
 
   /**

package/lib/module/AmwalPaySDK.js.map

@@ -1 +1 @@
-{"version":3,"names":["initiate","onCustomerId","onResponse","NetworkClient","AmwalPaySDK","onResponseSubscription","onCustomerIdSubscription","constructor","getInstance","instance","startPayment","config","setupEventListeners","networkClient","console","log","environment","sessionToken","fetchSessionToken","merchantId","customerId","secureHash","completeConfig","JSON","stringify","error","dispose","removeEventListeners","response","remove"],"sourceRoot":"../../src","sources":["AmwalPaySDK.ts"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,UAAU,QAA6B,YAAS;AACjF,OAAOC,aAAa,MAAM,4BAAyB;AAInD,MAAMC,WAAW,CAAC;EAGRC,sBAAsB,GAA6B,IAAI;EAEvDC,wBAAwB,GAA6B,IAAI;EAEzDC,WAAWA,CAAA,EAAG;IACpB;EAAA;EAIF,OAAOC,WAAWA,CAAA,EAAgB;IAChC,IAAI,CAACJ,WAAW,CAACK,QAAQ,EAAE;MACzBL,WAAW,CAACK,QAAQ,GAAG,IAAIL,WAAW,CAAC,CAAC;IAC1C;IACA,OAAOA,WAAW,CAACK,QAAQ;EAC7B;;EAEA;AACF;AACA;AACA;EACE,MAAMC,YAAYA,CAACC,MAA4C,EAAiB;IAC9E,IAAI;MACF;MACA,IAAI,CAACC,mBAAmB,CAACD,MAAM,CAAC;;MAEhC;MACA,MAAME,aAAa,GAAGV,aAAa,CAACK,WAAW,CAAC,CAAC;;MAEjD;MACAM,OAAO,CAACC,GAAG,CAAC,yCAAyC,EAAEJ,MAAM,CAACK,WAAW,CAAC;MAC1E,MAAMC,YAAY,GAAG,MAAMJ,aAAa,CAACK,iBAAiB,CACxDP,MAAM,CAACK,WAAW,EAClBL,MAAM,CAACQ,UAAU,EACjBR,MAAM,CAACS,UAAU,EACjBT,MAAM,CAACU,UACT,CAAC;MAEDP,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAEE,YAAY,GAAG,SAAS,GAAG,QAAQ,CAAC;MAEzE,IAAI,CAACA,YAAY,EAAE;QACjB;QACA;MACF;;MAEA;MACA,MAAMK,cAA8B,GAAG;QACrC,GAAGX,MAAM;QACTM;MACF,CAAC;;MAED;MACAH,OAAO,CAACC,GAAG,CAAC,wCAAwC,EAAEQ,IAAI,CAACC,SAAS,CAACF,cAAc,CAAC,CAAC;MACrFtB,QAAQ,CAACsB,cAAc,CAAC;IAC1B,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdX,OAAO,CAACW,KAAK,CAAC,yBAAyB,EAAEA,KAAK,CAAC;IACjD;EACF;EAEAC,OAAOA,CAAA,EAAS;IACd;IACA,IAAI,CAACC,oBAAoB,CAAC,CAAC;EAC7B;;EAEA;AACF;AACA;AACA;EACUf,mBAAmBA,CAACD,MAA4C,EAAQ;IAC9E;IACA,IAAI,CAACgB,oBAAoB,CAAC,CAAC;IAE3B,IAAI,CAACtB,sBAAsB,GAAGH,UAAU,CAAE0B,QAAQ,IAAK;MACrDd,OAAO,CAACC,GAAG,CAAC,4BAA4B,EAAEa,QAAQ,CAAC;MACnDjB,MAAM,CAACT,UAAU,CAAC0B,QAAQ,CAAC;IAC7B,CAAC,CAAC;IAEF,IAAI,CAACtB,wBAAwB,GAAGL,YAAY,CAAEmB,UAAU,IAAK;MAC3DN,OAAO,CAACC,GAAG,CAAC,sBAAsB,EAAEK,UAAU,CAAC;MAC/CT,MAAM,CAACV,YAAY,CAACmB,UAAU,CAAC;IACjC,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACUO,oBAAoBA,CAAA,EAAS;IACnC,IAAI,CAACtB,sBAAsB,EAAEwB,MAAM,CAAC,CAAC;IACrC,IAAI,CAACvB,wBAAwB,EAAEuB,MAAM,CAAC,CAAC;IACvC,IAAI,CAACxB,sBAAsB,GAAG,IAAI;IAClC,IAAI,CAACC,wBAAwB,GAAG,IAAI;EACtC;AACF;AAEA,eAAeF,WAAW","ignoreList":[]}
+{"version":3,"names":["initiate","onCustomerId","onResponse","NetworkClient","AmwalPaySDK","onResponseSubscription","onCustomerIdSubscription","constructor","getInstance","instance","startPayment","config","setupEventListeners","networkClient","console","log","environment","sessionToken","fetchSessionToken","merchantId","customerId","secureHash","completeConfig","JSON","stringify","error","dispose","removeEventListeners","response","remove"],"sourceRoot":"../../src","sources":["AmwalPaySDK.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/AmwalPaySDK.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AmwalPaySDK.d.ts","sourceRoot":"","sources":["../../../src/AmwalPaySDK.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAKlF,cAAM,WAAW;IACf,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IAErC,OAAO,CAAC,sBAAsB,CAAkC;IAEhE,OAAO,CAAC,wBAAwB,CAAkC;IAElE,OAAO;IAKP,MAAM,CAAC,WAAW,IAAI,WAAW;IAOjC;;;OAGG;IACG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC/E,OAAO,IAAI,IAAI;IAKf;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAe3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAM7B;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"AmwalPaySDK.d.ts","sourceRoot":"","sources":["../../../src/AmwalPaySDK.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAKlF,cAAM,WAAW;IACf,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IAErC,OAAO,CAAC,sBAAsB,CAAkC;IAEhE,OAAO,CAAC,wBAAwB,CAAkC;IAElE,OAAO;IAKP,MAAM,CAAC,WAAW,IAAI,WAAW;IAOjC;;;OAGG;IACG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC/E,OAAO,IAAI,IAAI;IAKf;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA+B3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAM7B;AAED,eAAe,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-amwal-pay",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "amwal pay",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/AmwalPaySDK.ts

@@ -77,15 +77,31 @@ class AmwalPaySDK {
     // Remove any existing listeners
     this.removeEventListeners();
 
+    console.log('🟢 Setting up event listeners...');
+    console.log('🟢 onResponse callback exists?', typeof config.onResponse === 'function');
+    console.log('🟢 onCustomerId callback exists?', typeof config.onCustomerId === 'function');
+
     this.onResponseSubscription = onResponse((response) => {
+      console.log('🟢 SDK onResponse listener triggered with:', response);
       console.log('Received AmwalPayResponse:', response);
-      config.onResponse(response);
+      if (config.onResponse) {
+        config.onResponse(response);
+      } else {
+        console.error('❌ config.onResponse is not a function!');
+      }
     });
 
     this.onCustomerIdSubscription = onCustomerId((customerId) => {
+      console.log('🟢 SDK onCustomerId listener triggered with:', customerId);
       console.log('Received customerId:', customerId);
-      config.onCustomerId(customerId);
+      if (config.onCustomerId) {
+        config.onCustomerId(customerId);
+      } else {
+        console.error('❌ config.onCustomerId is not a function!');
+      }
     });
+
+    console.log('🟢 Event listeners set up complete');
   }
 
   /**