dojah-kyc-sdk-react-expo 0.1.2 → 0.1.3

package/ios/DojahKycSdkReactExpoModule.swift

@@ -1,41 +1,91 @@
 import ExpoModulesCore
 import DojahWidget
 
+class DojahNavigationControllerDelegate: NSObject, UINavigationControllerDelegate {
+    var onDidShow: (UIViewController) -> Void = { _ in }
+    func navigationController(_ navigationController: UINavigationController,
+                              didShow viewController: UIViewController,
+                              animated: Bool) {
+        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
+    }
+}
+
 public class DojahKycSdkReactExpoModule: Module {
-  // Each module class must implement the definition function. The definition consists of components
-  // that describes the module's functionality and behavior.
-  // See https://docs.expo.dev/modules/module-api for more details about available components.
+    
+    var mPromise:Promise? = nil
+    
+    let navDelegate = DojahNavigationControllerDelegate()
+ 
+    let navCtrl = UIApplication.shared.keyWindow?.rootViewController as? UINavigationController
+    
+    var prevController:UIViewController? = nil
+
+    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 = if(vStatus.isEmpty){  "closed"} else {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
+            }
+        }
+        
+        if navCtrl != nil {
+            navCtrl!.delegate = navDelegate
+        }
+    }
+
   public func definition() -> ModuleDefinition {
-    // Sets the name of the module that JavaScript code will use to refer to the module. Takes a string as an argument.
-    // Can be inferred from module's class name, but it's recommended to set it explicitly for clarity.
-    // The module will be accessible from `requireNativeModule('DojahKycSdk')` in JavaScript.
+
     Name("DojahKycSdk")
 
-    // Defines event names that the module can send to JavaScript.
     Events("onChange")
 
-    // Defines a JavaScript function that always returns a Promise and whose native code
-    // is by default dispatched on the different thread than the JavaScript runtime runs on.
-      AsyncFunction("launch") { (widgetId: String, referenceId: String?, email: String?, extraData: ExtraDataRecord?,promise:Promise) in
-          
-          guard let rootViewController = UIApplication.shared.keyWindow?.rootViewController else {
-              print("no root ctrl")
-              return
-          }
-          
-          print("root ctrl: $\(String(describing: rootViewController))")
+    AsyncFunction("launch") { (widgetId: String, referenceId: String?, email: String?, extraData: ExtraDataRecord?,promise:Promise) in
+          mPromise = promise
 
-          let navController = rootViewController as? UINavigationController
+          let navController = navCtrl
 
           print("nav ctrl: $\(String(describing: navController))")
-
+        
+    
           if(navController == nil){
+              self.mPromise?.reject("002","failed to initialize, can't find navController")
               return
           }
-          
-          DispatchQueue.main.async {
-              DojahWidgetSDK.initialize(widgetID: widgetId,referenceID: referenceId,emailAddress: email, navController: navController!)
-          }
+        
+        DispatchQueue.main.async {
+            do{
+                DojahWidgetSDK.initialize(
+                    widgetID: widgetId,
+                    referenceID: referenceId,
+                    emailAddress: email,
+                    extraUserData: extraData?.toExtraUserData(),
+                    navController: navController!)
+            }catch{
+                self.mPromise?.reject("001","failed to initialize")
+            }
+        }
     }
 
     // Enables the module to be used as a native view. Definition components that are accepted as part of the
@@ -77,17 +127,17 @@ struct ExtraDataRecord : Record {
     @Field
     var metadata: [String:Any]? = nil
 
-//    func toExtraUserData()-> ExtraUserData {
-//        return ExtraUserData(
-//            userData = userData?.toUserData(),
-//            govData = govData?.toGovData(),
-//            govId = govId?.toGovId(),
-//            location = location?.toLocation(),
-//            businessData = businessData?.toBusinessData(),
-//            address = address,
-//            metadata = metadata
-//        )
-//    }
+    func toExtraUserData()-> ExtraUserData {
+        return ExtraUserData(
+            userData: userData?.toUserData(),
+            govData: govData?.toGovData(),
+            govId: govId?.toGovId(),
+            location: location?.toLocation(),
+            businessData: businessData?.toBusinessData(),
+            address: address,
+            metadata: metadata
+        )
+    }
 
 }
 
@@ -105,14 +155,14 @@ struct UserRecord : Record {
     @Field
     var email: String? = nil
 
-//    func toUserData(): UserData {
-//        return UserData(
-//            firstName = firstName,
-//            lastName = lastName,
-//            dob = dob,
-//            email = email
-//        )
-//    }
+    func toUserData()-> UserBioData {
+        return UserBioData(
+            firstName: firstName,
+            lastName: lastName,
+            dob: dob,
+            email: email
+        )
+    }
 }
 
 struct GovDataRecord : Record {
@@ -129,14 +179,14 @@ struct GovDataRecord : Record {
     @Field
     var vnin: String? = nil
 
-//    func toGovData(): GovData {
-//        return GovData(
-//            bvn = bvn,
-//            dl = dl,
-//            nin = nin,
-//            vnin = vnin
-//        )
-//    }
+    func toGovData()-> ExtraGovData {
+        return ExtraGovData(
+            bvn: bvn,
+            dl: dl,
+            nin: nin,
+            vnin: vnin
+        )
+    }
 }
 
 struct GovIdRecord : Record {
@@ -158,16 +208,16 @@ struct GovIdRecord : Record {
     @Field
     var others: String? = nil
 
-//    func toGovId(): GovId {
-//        return GovId(
-//            national = national,
-//            passport = passport,
-//            dl = dl,
-//            voter = voter,
-//            nin = nin,
-//            others = others
-//        )
-//    }
+    func toGovId()-> ExtraGovIdData {
+        return ExtraGovIdData(
+            national:  national,
+            passport: passport,
+            dl: dl,
+            voter: voter,
+            nin: nin,
+            others: others
+        )
+    }
 }
 
 struct LocationRecord : Record {
@@ -177,22 +227,22 @@ struct LocationRecord : Record {
     @Field
     var longitude: String? = nil
 
-//    func toLocation(): Location {
-//        return Location(
-//            latitude = latitude,
-//            longitude = longitude
-//        )
-//    }
+    func toLocation()-> ExtraLocationData {
+        return ExtraLocationData(
+            longitude: longitude,
+            latitude: latitude
+        )
+    }
 }
 
 struct BusinessDataRecord : Record {
     @Field
     var cac: String? = nil
 
-//    func toBusinessData(): BusinessData {
-//        return BusinessData(
-//            cac = cac
-//        )
-//    }
+    func toBusinessData()-> ExtraBusinessData {
+        return ExtraBusinessData(
+            cac: cac
+        )
+    }
 }
 

package/package.json

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