dojah-kyc-sdk-react-expo 0.1.5 → 0.1.7

package/android/build.gradle

@@ -51,5 +51,6 @@ repositories {
 
 dependencies {
   // implementation 'com.github.dojah-inc:sdk-kotlin:v0.0.1-dev'
-  implementation 'com.github.dojah-inc:sdk-kotlin:v0.0.4-dev'
+  // implementation 'com.github.dojah-inc:sdk-kotlin:v0.0.4-dev'
+  implementation 'com.github.dojah-inc:sdk-kotlin:v0.2.0'
 }

package/android/src/main/java/com/dojah/dojah_Kyc_rn_expo/DojahKycSdkReactExpoModule.kt

@@ -53,7 +53,7 @@ class DojahKycSdkReactExpoModule : Module() {
                             widgetId,
                             referenceId,
                             email,
-                            extraData = extraData?.toExtraUserData()?: ExtraUserData(),
+                            extraData = extraData?.toExtraUserData() ?: ExtraUserData()
                         )
                     Log.d("DojahKycSdk", "data passed -> ${extraData?.toExtraUserData()}")
                 } catch (e: Exception) {

package/build/DojahKycSdkReactExpoModule.d.ts

@@ -1,5 +1,5 @@
-import { NativeModule } from 'expo';
-import { DojahKycSdkReactExpoModuleEvents } from './DojahKycSdkReactExpo.types';
+import { NativeModule } from "expo";
+import { DojahKycSdkReactExpoModuleEvents } from "./DojahKycSdkReactExpo.types";
 declare class DojahKycSdk extends NativeModule<DojahKycSdkReactExpoModuleEvents> {
     launch(widgetId: string, referenceId?: string | null, email?: string | null, extraData?: Record<string, any> | null): Promise<string>;
 }

package/build/DojahKycSdkReactExpoModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DojahKycSdkReactExpoModule.d.ts","sourceRoot":"","sources":["../src/DojahKycSdkReactExpoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,MAAM,CAAC;AAEzD,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAEhF,OAAO,OAAO,WAAY,SAAQ,YAAY,CAAC,gCAAgC,CAAC;IAC9E,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAClD,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GACrC,OAAO,CAAC,MAAM,CAAC;CACnB;;AAGD,wBAA+D"}
+{"version":3,"file":"DojahKycSdkReactExpoModule.d.ts","sourceRoot":"","sources":["../src/DojahKycSdkReactExpoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,MAAM,CAAC;AAEzD,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAEhF,OAAO,OAAO,WAAY,SAAQ,YAAY,CAAC,gCAAgC,CAAC;IAC9E,MAAM,CACJ,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GACrC,OAAO,CAAC,MAAM,CAAC;CACnB;;AAGD,wBAA+D"}

package/build/DojahKycSdkReactExpoModule.js

@@ -1,4 +1,4 @@
-import { requireNativeModule } from 'expo';
+import { requireNativeModule } from "expo";
 // This call loads the native module object from the JSI.
-export default requireNativeModule('DojahKycSdk');
+export default requireNativeModule("DojahKycSdk");
 //# sourceMappingURL=DojahKycSdkReactExpoModule.js.map

package/build/DojahKycSdkReactExpoModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"DojahKycSdkReactExpoModule.js","sourceRoot":"","sources":["../src/DojahKycSdkReactExpoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAWzD,yDAAyD;AACzD,eAAe,mBAAmB,CAAc,aAAa,CAAC,CAAC","sourcesContent":["import { NativeModule, requireNativeModule } from 'expo';\n\nimport { DojahKycSdkReactExpoModuleEvents } from './DojahKycSdkReactExpo.types';\n\ndeclare class DojahKycSdk extends NativeModule<DojahKycSdkReactExpoModuleEvents> {\n  launch(widgetId: string, referenceId?: string | null,\n    email?: string | null,\n    extraData?: Record<string, any> | null\n  ): Promise<string>;\n}\n\n// This call loads the native module object from the JSI.\nexport default requireNativeModule<DojahKycSdk>('DojahKycSdk');\n"]}
+{"version":3,"file":"DojahKycSdkReactExpoModule.js","sourceRoot":"","sources":["../src/DojahKycSdkReactExpoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAazD,yDAAyD;AACzD,eAAe,mBAAmB,CAAc,aAAa,CAAC,CAAC","sourcesContent":["import { NativeModule, requireNativeModule } from \"expo\";\n\nimport { DojahKycSdkReactExpoModuleEvents } from \"./DojahKycSdkReactExpo.types\";\n\ndeclare class DojahKycSdk extends NativeModule<DojahKycSdkReactExpoModuleEvents> {\n  launch(\n    widgetId: string,\n    referenceId?: string | null,\n    email?: string | null,\n    extraData?: Record<string, any> | null\n  ): Promise<string>;\n}\n\n// This call loads the native module object from the JSI.\nexport default requireNativeModule<DojahKycSdk>(\"DojahKycSdk\");\n"]}

package/ios/DojahKycSdkReactExpoModule.swift

@@ -1,49 +1,141 @@
 import ExpoModulesCore
 import DojahWidget
+import UIKit
+
+// Custom NavigationController that prevents duplicate presentations
+class SafeDojahNavigationController: UINavigationController {
+    private var isPresenting = false
+    
+    override func present(_ viewControllerToPresent: UIViewController, animated: Bool, completion: (() -> Void)? = nil) {
+        // Check if we're already presenting something
+        if isPresenting {
+            print("⚠️ Already presenting, preventing duplicate: \(String(describing: type(of: viewControllerToPresent)))")
+            completion?()
+            return
+        }
+        
+        // Check if this view controller is already in the navigation stack
+        if viewControllers.contains(where: { 
+            type(of: $0) == type(of: viewControllerToPresent)
+        }) {
+            print("⚠️ ViewController already in navigation stack: \(String(describing: type(of: viewControllerToPresent)))")
+            completion?()
+            return
+        }
+        
+        // Check if we're already presenting something
+        if presentedViewController != nil {
+            print("⚠️ NavigationController already has a presentedViewController")
+            completion?()
+            return
+        }
+        
+        // Mark as presenting
+        isPresenting = true
+        
+        // Call super to actually present
+        super.present(viewControllerToPresent, animated: animated) { [weak self] in
+            self?.isPresenting = false
+            completion?()
+        }
+    }
+    
+    override func dismiss(animated: Bool, completion: (() -> Void)? = nil) {
+        isPresenting = false
+        super.dismiss(animated: animated, completion: completion)
+    }
+}
 
 class DojahNavigationControllerDelegate: NSObject, UINavigationControllerDelegate {
     var onDidShow: (UIViewController) -> Void = { _ in }
+    
     func navigationController(_ navigationController: UINavigationController,
                               didShow viewController: UIViewController,
                               animated: Bool) {
-        print("Did show: \(viewController)")
+        print("📱 Did show: \(viewController)")
         onDidShow(viewController)
     }
-
-    func navigationController(_ navigationController: UINavigationController,
-                              willShow viewController: UIViewController,
-                              animated: Bool) {
-        print("Will show: \(viewController)")
-    }
     
     func setOnDidShow(_ onDidShow: @escaping (UIViewController) -> Void) {
         self.onDidShow = onDidShow
     }
 }
 
+class DojahPresentationControllerDelegate: NSObject, UIAdaptivePresentationControllerDelegate {
+    var onDidDismiss: () -> Void = { }
+    
+    func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+        print("🛑 Modal was dismissed manually")
+        onDidDismiss()
+    }
+    
+    func setOnDidDismiss(_ onDidDismiss: @escaping () -> Void) {
+        self.onDidDismiss = onDidDismiss
+    }
+}
+
 public class DojahKycSdkReactExpoModule: Module {
     
-    var mPromise: Promise?
+    var mPromise: Promise? = nil
     let navDelegate = DojahNavigationControllerDelegate()
-    var navCtrl: UINavigationController?
-    var prevController: UIViewController?
-
+    let presentationDelegate = DojahPresentationControllerDelegate()
+    
+    // Track Dojah state
+    private var isDojahActive = false
+    private var dojahNavController: SafeDojahNavigationController?
+    private var prevController: UIViewController? // Track previous controller for DJDisclaimer handling
+    private var hasSeenSDKInit = false // Track if we've seen SDKInitViewController before
+    
     required public init(appContext: AppContext) {
         super.init(appContext: appContext)
-        navDelegate.setOnDidShow { vc in
-            print("onDidShow: \(vc)")
-            //return result from DojahWidget once verification
-            //is done,failed or cancel
-            if !String(describing: vc).contains("DojahWidget") {
-                let vStatus = DojahWidgetSDK.getVerificationResultStatus()
-                let status = vStatus.isEmpty ? "closed" : vStatus
-                self.mPromise?.resolve(status)
-                self.prevController = nil
-            } else if String(describing: vc).contains("DojahWidget.DJDisclaimer")
-                     && self.prevController != nil {
-                self.navCtrl?.popToRootViewController(animated: false)
-            } else if !String(describing: vc).contains("DojahWidget.SDKInitViewController") {
-                self.prevController = vc
+        
+        // Set up presentation delegate callback
+        presentationDelegate.setOnDidDismiss { [weak self] in
+            guard let self = self else { return }
+            print("🛑 Modal was dismissed manually")
+            self.resolveSdkResult()
+            self.dojahNavController = nil
+        }
+    }
+    
+    private func resolveSdkResult() {
+        let vStatus = DojahWidgetSDK.getVerificationResultStatus()
+        let status = vStatus.isEmpty ? "closed" : vStatus
+        
+        print("📊 Resolving SDK result: \(status)")
+        
+        // Resolve promise first
+        self.mPromise?.resolve(status)
+        self.mPromise = nil
+        
+        // Clear state
+        self.prevController = nil
+        
+        // Dismiss the navigation controller
+        self.dismissDojahController()
+        
+        // Reset flag
+        self.isDojahActive = false
+    }
+    
+    private func getTopViewController() -> UIViewController? {
+        guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+              let rootViewController = windowScene.windows.first?.rootViewController else {
+            return nil
+        }
+        
+        var topViewController = rootViewController
+        while let presentedViewController = topViewController.presentedViewController {
+            topViewController = presentedViewController
+        }
+        
+        return topViewController
+    }
+    
+    private func dismissDojahController() {
+        DispatchQueue.main.async { [weak self] in
+            self?.dojahNavController?.dismiss(animated: true) {
+                self?.dojahNavController = nil
             }
         }
     }
@@ -55,62 +147,118 @@ public class DojahKycSdkReactExpoModule: Module {
         AsyncFunction("launch") { (widgetId: String, referenceId: String?, email: String?, extraData: ExtraDataRecord?, promise: Promise) in
             self.mPromise = promise
             
-            // Get the navigation controller when needed, not during initialization
-            if self.navCtrl == nil {
-                DispatchQueue.main.async {
-                    if let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow }) {
-                        if let rootNav = window.rootViewController as? UINavigationController {
-                            self.navCtrl = rootNav
-                        } else if let rootVC = window.rootViewController {
-                            // If rootViewController isn't a nav controller, create one
-                            let navController = UINavigationController(rootViewController: rootVC)
-                            window.rootViewController = navController
-                            self.navCtrl = navController
-                        }
-                    }
+            guard let rootVC = self.getTopViewController() else {
+                promise.reject("002", "Failed to get top view controller")
+                return
+            }
+            
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                
+                // Reset state for new launch
+                self.prevController = nil
+                self.isDojahActive = false
+                self.hasSeenSDKInit = false
+                
+                // Create safe navigation controller for Dojah (prevents duplicate presentations)
+                let dojahNavController = SafeDojahNavigationController()
+                dojahNavController.modalPresentationStyle = .fullScreen
+                self.dojahNavController = dojahNavController
+                
+                // Set delegate BEFORE presenting (important!)
+                dojahNavController.delegate = self.navDelegate
+                
+                // Detect modal dismissal (for cancel)
+                dojahNavController.presentationController?.delegate = self.presentationDelegate
+                
+                // Track Dojah flow - simplified like original but with Flutter closing logic
+                self.navDelegate.setOnDidShow { [weak self] vc in
+                    guard let self = self else { return }
+                    
+                    // Use String(describing: vc) like the original code
+                    let vcName = String(describing: vc)
+                    print("🔄 onDidShow: \(vcName)")
                     
-                    guard let navController = self.navCtrl else {
-                        self.mPromise?.reject("002", "failed to initialize, can't find navController")
+                    // Match original + Flutter logic:
+                    // 1. If not DojahWidget, resolve (but only if we were in Dojah)
+                    if !vcName.contains("DojahWidget") {
+                        if self.isDojahActive {
+                            print("🚪 Not DojahWidget - resolving")
+                            self.resolveSdkResult()
+                        }
                         return
                     }
                     
-                    navController.delegate = self.navDelegate
+                    // Mark as active when we see Dojah screens
+                    self.isDojahActive = true
                     
-                    do {
-                        DojahWidgetSDK.initialize(
-                            widgetID: widgetId,
-                            referenceID: referenceId,
-                            emailAddress: email,
-                            extraUserData: extraData?.toExtraUserData(),
-                            navController: navController
-                        )
-                    } catch {
-                        self.mPromise?.reject("001", "failed to initialize")
-                    }
-                }
-            } else {
-                // If navCtrl already exists
-                DispatchQueue.main.async {
-                    guard let navController = self.navCtrl else {
-                        self.mPromise?.reject("002", "failed to initialize, can't find navController")
+                    // 2. If DJDisclaimer with prevController, pop to root (like original)
+                    if vcName.contains("DojahWidget.DJDisclaimer") && self.prevController != nil {
+                        print("📱 DJDisclaimer with prevController - popping to root")
+                        self.dojahNavController?.popToRootViewController(animated: false)
                         return
                     }
                     
-                    do {
+                    // 3. If not SDKInitViewController, track as prevController (like original)
+                    if !vcName.contains("DojahWidget.SDKInitViewController") {
+                        self.prevController = vc
+                        print("✅ Tracking prevController: \(vcName)")
+                    } else {
+                        // 4. SDKInitViewController - resolve (matches Flutter's "else" case)
+                        // Resolve if we've seen it before OR if we've progressed
+                        if self.hasSeenSDKInit || self.prevController != nil {
+                            print("📱 SDKInitViewController - resolving")
+                            self.resolveSdkResult()
+                        } else {
+                            // First time seeing SDKInitViewController - allow to continue
+                            print("📱 SDKInitViewController on initial launch - allowing to continue")
+                            self.hasSeenSDKInit = true
+                        }
+                    }
+                }
+                
+                // Present modally and wait for completion to ensure view hierarchy is ready
+                rootVC.present(dojahNavController, animated: true) {
+                    // Add a small delay to ensure view hierarchy is fully laid out
+                    // This helps with camera session initialization timing
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                        // Initialize SDK after presentation completes and view is laid out
+                        // This ensures the view hierarchy is fully set up before camera access
                         DojahWidgetSDK.initialize(
                             widgetID: widgetId,
                             referenceID: referenceId,
                             emailAddress: email,
                             extraUserData: extraData?.toExtraUserData(),
-                            navController: navController
+                            source: "ios_react_native_expo",
+                            navController: dojahNavController
                         )
-                    } catch {
-                        self.mPromise?.reject("001", "failed to initialize")
+                        print("🎯 Dojah SDK initialized")
                     }
                 }
             }
         }
 
+        AsyncFunction("close") { [weak self] (promise: Promise) in
+            print("🛑 Manual close requested")
+            
+            guard let self = self else {
+                promise.resolve("no_instance")
+                return
+            }
+            
+            let vStatus = DojahWidgetSDK.getVerificationResultStatus()
+            let status = vStatus.isEmpty ? "cancelled" : vStatus
+            
+            self.mPromise?.resolve(status)
+            self.mPromise = nil
+            self.prevController = nil
+            
+            self.dismissDojahController()
+            self.isDojahActive = false
+            
+            promise.resolve("closed")
+        }
+
         View(DojahKycSdkReactExpoView.self) {
             Prop("url") { (view: DojahKycSdkReactExpoView, url: URL) in
                 if view.webView.url != url {
@@ -122,6 +270,9 @@ public class DojahKycSdkReactExpoModule: Module {
     }
 }
 
+
+// ============= KEEP ALL THESE STRUCTS =============
+
 struct ExtraDataRecord : Record {
     @Field
     var userData: UserRecord? = nil
@@ -155,10 +306,8 @@ struct ExtraDataRecord : Record {
             metadata: metadata
         )
     }
-
 }
 
-
 struct UserRecord : Record {
     @Field
     var firstName: String? = nil
@@ -261,5 +410,4 @@ struct BusinessDataRecord : Record {
             cac: cac
         )
     }
-}
-
+}

package/ios/dojahkycsdkreactexpo.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/dojahkycsdkreactexpo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dojah-kyc-sdk-react-expo",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Dojah Kyc",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/DojahKycSdkReactExpoModule.ts

@@ -1,13 +1,15 @@
-import { NativeModule, requireNativeModule } from 'expo';
+import { NativeModule, requireNativeModule } from "expo";
 
-import { DojahKycSdkReactExpoModuleEvents } from './DojahKycSdkReactExpo.types';
+import { DojahKycSdkReactExpoModuleEvents } from "./DojahKycSdkReactExpo.types";
 
 declare class DojahKycSdk extends NativeModule<DojahKycSdkReactExpoModuleEvents> {
-  launch(widgetId: string, referenceId?: string | null,
+  launch(
+    widgetId: string,
+    referenceId?: string | null,
     email?: string | null,
     extraData?: Record<string, any> | null
   ): Promise<string>;
 }
 
 // This call loads the native module object from the JSI.
-export default requireNativeModule<DojahKycSdk>('DojahKycSdk');
+export default requireNativeModule<DojahKycSdk>("DojahKycSdk");