@qore-id/react-native-qoreid-sdk 1.0.9 → 1.1.0

package/README.md

@@ -12,6 +12,16 @@ npm install --save  @qore-id/react-native-qoreid-sdk
 yarn add @qore-id/react-native-qoreid-sdk
 ```
 
+
+```sh
+//in your project directory
+
+cd ios
+pod install
+```
+> Note: You are required to rebuild your application after installing the package.
+
+
 ### Android
 
 Add the following to your `app/build.gradle`
@@ -44,15 +54,8 @@ import com.qoreidsdk.QoreidSdkModule;
 
 ```
 
-<!-- ### iOS
-
-From your root directory
 
-```sh
-npm i react-native-webview
-``` -->
-
-## Permissions
+#### Permissions
 
 Certain services on QoreID require device permissions to work properly. Follow the instructions [here](https://docs.qoreid.com/docs/permissions) to add the required permissions to your `~/android/app/src/main/AndroidManifest.xml` file.
 
@@ -67,6 +70,66 @@ Verifind required permissions
 <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 ...
 ```
+### iOS
+
+#### Update your AppDelegate.m
+> QoreidSdK requires the UINavigationController to push a new ViewController to your app. To wrap your app's rootViewController in a UINavigationController, add the following code to your AppDelegate.m file.
+
+```mm
+//AppDelegate.m
+
+// 1. Import necessary headers
+#import "AppDelegate.h"
+#import <React/RCTBridge.h>
+#import <React/RCTRootView.h>
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  ...
+  
+  // 2. Create an instance of UIWindow
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  
+  // 3. Set up the UINavigationController with a UIViewController
+  UIViewController *viewController = [UIViewController new];
+  UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
+  [navigationController setNavigationBarHidden:YES animated:NO];
+  
+  // 4. Set the RN bridge to use the UIWindow as the root view controller
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
+                                                   moduleName:self.moduleName
+                                            initialProperties:self.initialProps];
+  viewController.view = rootView;
+  self.window.rootViewController = navigationController; // Use the UINavigationController as the root
+  
+  [self.window makeKeyAndVisible];
+  
+  return YES;
+}
+
+...
+@end
+
+```
+
+#### Permissions
+Added the following to your `~/ios/<app name>/Info.plist` file
+
+```xml
+...
+<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+<string>We need access to your location to provide you with location-based services, even when the app is in the background.</string>
+<key>NSLocationWhenInUseUsageDescription</key>
+<string>We need access to your location while you are using the app to provide you with location-based services.</string>
+<key>NSCameraUsageDescription</key>
+<string>We need access to your camera to take photos for profile pictures.</string>
+<key>NSPhotoLibraryUsageDescription</key>
+<string>We need access to your photo library to allow you to select and upload images.</string>
+...
+```
 
 ## Usage
 
@@ -114,7 +177,7 @@ function App() {
         lga: lga,
       },
       ocrAcceptedDocuments:
-        'DRIVERS_LICENSE_NGA,VOTERS_CARD_NGA,NIN_SLIP_NGA,PASSPORT_NGA',
+        ['DRIVERS_LICENSE_NGA','VOTERS_CARD_NGA','NIN_SLIP_NGA','PASSPORT_NGA'],
     };
 
     QoreIdSdk.launchQoreId(formData);
@@ -128,69 +191,7 @@ function App() {
 }
 ```
 
-You can also use the QoreIdButton component to trigger verifications (which will be deprecated in the next major release):
-
-```tsx
-//verify.tsx
-import React from 'react'
-import { QoreIdButton } from '@qore-id/react-native-qoreid-sdk';
-
-
-function App() {
-
-    const customButton  = ({ onPress }) =>  <Button onPress={onPress} title="QoreId Button" />
-
-    const onError = (data) => {
-        console.error(data);
-        Alert.alert('Error', data);
-    };
-
-    const onSumitted = (data) => {
-        console.debug(data);
-        Alert.alert('Sumitted', data);
-    };
-
-    const onClosed = (data) => {
-        console.debug(data);
-        Alert.alert('Closed', data);
-    };
-
-    return (
-        <View>
-            {/* Other components */}
-            <QoreIdButton
-                title="Verify"
-                flowId=""
-                clientId="" {/* Required */}
-                productCode="" {/* Required */}
-                customerReference="" {/* Required */}
-                applicantData={{
-                    firstName:"",
-                    middleName:"",
-                    lastName:"",
-                    gender:"",
-                    phoneNumber:"",
-                    email:"",
-                }}
-                identityData={{ idType: "", idNumber:"" }}
-                addressData={{
-                    address: "",
-                    city:"",
-                    lga:"",
-                }}
-                ocrAcceptedDocuments="DRIVERS_LICENSE_NGA,VOTERS_CARD_NGA,NIN_SLIP_NGA,PASSPORT_NGA"
-                onQoreIDSdkSubmitted={onSumitted}
-                onQoreIDSdkError={onError}
-                onQoreIDSdkClosed={onClosed}
-                render={customButton}
-            />
-        </View>
-    )
-}
-
-```
-
-### Utilities
+## Utilities
 
 QoreId SDK exposes utilities that you can easily use
 
@@ -214,10 +215,15 @@ function App() {
 
 ```
 
-## CHANGE LOGS
+## <span style="color: red;">CHANGE LOGS</span>
 
 #### 1.0.9
 
 - Added qoreid initialization function. You can now launche the sdk in your code implementation - offering you more control.
 - Addition of event listener `QoreIdSdk.events` to listen to events from the sdk.
 - QoreIdButton component will be deprecated in the next major release. Use `QoreIdSdk.launchQoreId` instead.
+
+
+#### 1.1.0 Breaking Changes
+- Removed `QoreIdButton` component. Use `QoreIdSdk.launchQoreId` instead.
+- QoreIdSdk is now available on iOS.

package/android/build.gradle

@@ -93,7 +93,6 @@ dependencies {
     // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
     //noinspection GradleDynamicVersion
     implementation 'com.qoreid:qoreid-sdk:1.1.32'
-    implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 

package/android/src/main/java/com/qoreidsdk/QoreidSdkModule.kt

@@ -7,7 +7,6 @@ import android.os.Build
 import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.google.gson.Gson
 import com.qoreid.sdk.core.QoreIDParams
 import com.qoreid.sdk.core.QoreIDSdk
 import com.qoreid.sdk.core.QoreIDSdk.QORE_ID_RESULT_CODE
@@ -17,12 +16,11 @@ import com.qoreid.sdk.core.models.ApplicantData
 import com.qoreid.sdk.core.models.ErrorResult
 import com.qoreid.sdk.core.models.QoreIDResult
 import com.qoreid.sdk.core.models.SuccessResult
-
-
+import java.util.HashMap
 
 
 class QoreidSdkModule(val reactContext: ReactApplicationContext) :
-    ReactContextBaseJavaModule(reactContext){
+    ReactContextBaseJavaModule(reactContext) {
     private var qoreIdResult: QoreIDResult? = null;
 
 
@@ -60,51 +58,48 @@ class QoreidSdkModule(val reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun launchQoreId(jsonData: String) {
-
+    fun launchQoreidSdk(readableData: ReadableMap) {
+        val data = readableData.toHashMap()
         if (currentActivity == null) {
             Log.e("Error", "No current activity");
             return
         }
 
-        val gson = Gson()
-        val qoreIdJSData = gson.fromJson(jsonData, QoreIdJSData::class.java)
-
-        val config = qoreIdJSData.config
-        val apD = qoreIdJSData.applicantData
+        val config = data?.get("config") as? HashMap<*, *>
+        val apD = data?.get("applicantData") as? HashMap<*, *>
         val applicantData = ApplicantData(
-            apD.firstName,
-            apD.lastName,
-            apD.phoneNumber,
-            apD.middleName,
-            apD.dob,
-            apD.dob,
-            apD.gender
+            apD?.get("firstName") as String,
+            apD?.get("lastName") as String,
+            apD?.get("phoneNumber") as String?,
+            apD?.get("middleName") as String?,
+            apD?.get("dob") as String?,
+            apD?.get("gender") as String?
         )
 
-        val adD = qoreIdJSData.addressData
+
+        val adD = data?.get("addressData") as? HashMap<*, *>
         val addressData = AddressData(
-            adD.address,
-            adD.city,
-            adD.lga,
-            adD.state,
+            adD?.get("address") as String?,
+            adD?.get("city") as String?,
+            adD?.get("lga") as String?,
+            adD?.get("state") as String?,
         )
+        val flowId = config?.get("flowId") as? Double
 
-        val qoreIDParams = if (config.flowId != 0L) {
+        val qoreIDParams = if (flowId?.toLong() != 0L) {
             QoreIDParams()
-                .clientId(config.clientId)
-                .customerReference(qoreIdJSData.config.customerRef)
+                .clientId(config?.get("clientId") as String)
+                .customerReference(config?.get("customerReference") as String)
                 .inputData(applicantData, addressData)
-                .ocrAcceptedDocuments(qoreIdJSData.acceptedDocuments)
-                .workflow(config.flowId!!)
-
+                .ocrAcceptedDocuments(data?.get("acceptedDocuments") as List<String>)
+                .workflow(flowId!!.toLong())
         } else {
             QoreIDParams()
-                .clientId(config.clientId)
-                .customerReference(qoreIdJSData.config.customerRef)
+                .clientId(config?.get("clientId") as String)
+                .customerReference(config?.get("customerReference") as String)
                 .inputData(applicantData, addressData)
-                .ocrAcceptedDocuments(qoreIdJSData.acceptedDocuments)
-                .collection(config.productCode)
+                .ocrAcceptedDocuments(data?.get("acceptedDocuments") as List<String>)
+                .collection(config?.get("productCode") as String)
         }
 
         QoreIDSdk.s(BuildConfig.s);
@@ -125,6 +120,7 @@ class QoreidSdkModule(val reactContext: ReactApplicationContext) :
                 sendEvent(context, "onResult", event)
 
             }
+
             is SuccessResult -> {
                 // Handle success.
                 val event = Arguments.createMap().apply {

package/ios/QoreidSdk-Bridging-Header.h

@@ -0,0 +1,7 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import <React/RCTBridgeModule.h>
+
+

package/ios/QoreidSdk.m

@@ -0,0 +1,21 @@
+#import <React/RCTBridgeModule.h>
+#import <UIKit/UIKit.h>
+
+
+
+@interface RCT_EXTERN_MODULE(QoreidSdk, NSObject)
+
+RCT_EXTERN_METHOD (launchQoreidSdk: (NSDictionary *) data)
+
+
+// Don't compile this code when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeQoreidSdkSpecJSI>(params);
+}
+#endif
+
+@end
+                   

package/ios/QoreidSdk.swift

@@ -0,0 +1,104 @@
+//
+//  QoreidSdk.swift
+//  QoreidSdk
+//
+//  Created by Emmanuel Ugwuoke on 29/09/2023.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+import Foundation
+import React
+import UIKit
+import QoreIDSDK
+
+
+@objc(QoreidSdk)
+class QoreidSdk: RCTEventEmitter {
+    
+    @objc func launchQoreidSdk(_ data: NSDictionary) -> Void {
+        let config = data["config"] as? NSDictionary
+        let _applicant = data["applicantData"] as? NSDictionary
+        let _identity = data["identityData"] as? NSDictionary
+        let _address = data["addressData"] as? NSDictionary
+        let ocrs = data["acceptedDocuments"] as? NSArray
+        
+        
+        let applicant = ApplicantData(
+            firstname:_applicant?["firstName"] as? String,
+            lastname:_applicant?["lastName"] as? String,
+            phone: _applicant?["phoneNumber"] as? String,
+            middlename: _applicant?["middleName"] as? String
+        )
+        
+        let addressData = AddressData(
+            address: _address?["address"] as? String,
+            city: _address?["city"] as? String,
+            lga: _address?["lga"] as? String,
+            state: _address?["state"] as? String,
+            county: _address?["country"] as? String,
+            subCounty: _address?["region"] as? String,
+            ccc: _address?["ccc"] as? String ?? ""
+        )
+        
+        let identityData = IdentityData(
+            idType: _identity?["idType"] as? String,
+            idNumber: _identity?["idNumber"] as? String
+        )
+        
+        var param:QoreIDParam?
+        
+        if (config!["flowId"] as! Int != 0) {
+            param = QoreIDParam()
+                .clientId(clientId: config?["clientId"] as? String)
+                .customerReference(config?["customerReference"] as? String)
+                .inputData(InputData(applicant: applicant,address: addressData, identity: identityData))
+                .ocrAcceptedDocuments(ocrs as? Array<String>)
+                .workFlow(config!["flowId"] as! Int)
+                .build()
+        } else {
+            param = QoreIDParam()
+                .clientId(clientId: config?["clientId"] as? String)
+                .customerReference(config?["customerReference"] as? String)
+                .inputData(InputData(applicant: applicant,address: addressData, identity: identityData))
+                .ocrAcceptedDocuments(ocrs as? Array<String>)
+                .collection((config?["productCode"] as? String)!)
+                .build()
+        }
+        
+        if let params = param {
+            DispatchQueue.main.async {
+                let vc = ViewController()
+                vc.param = param
+                vc.onQoreIdResult = { [weak self] result in
+                    self?.onQoreIdResultReceived(result: result)
+                }
+                self.controller().pushViewController(vc, animated: false)
+            }
+        }
+    }
+    
+    func onQoreIdResultReceived(result: QoreIDResult?) {
+        if let result = result {
+            if let errorResult = result as? ErrorResult {
+                self.sendEvent(withName: "onResult", body:["code": String(describing: errorResult.code), "data":errorResult.data as Any, "message": errorResult.message])
+            } else if let successResult = result as? SuccessResult {
+                self.sendEvent(withName: "onResult", body:["data":successResult.data as Any, "message": successResult.message as Any])
+            }
+        }
+        self.controller().popViewController(animated: false)
+        
+    }
+    
+    override func supportedEvents() -> [String] {
+        return ["onResult"]
+    }
+    
+    @objc override static func requiresMainQueueSetup() -> Bool {
+        return false
+    }
+    
+    private func controller() -> UINavigationController {
+        let rootViewController = UIApplication.shared.keyWindow?.rootViewController
+        return rootViewController as! UINavigationController
+    }
+}

package/ios/QoreidSdk.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5E555C0D2413F4C50049A1A2 /* QoreidSdk.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* QoreidSdk.m */; };
+		2A18B1372AC6CA26005CB836 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A18B1362AC6CA26005CB836 /* File.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,6 +24,8 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libQoreidSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libQoreidSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		2A18B1352AC6CA25005CB836 /* QoreidSdk-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "QoreidSdk-Bridging-Header.h"; sourceTree = "<group>"; };
+		2A18B1362AC6CA26005CB836 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* QoreidSdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QoreidSdk.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* QoreidSdk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QoreidSdk.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -50,9 +52,11 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				2A18B1362AC6CA26005CB836 /* File.swift */,
 				B3E7B5881CC2AC0600A0062D /* QoreidSdk.h */,
 				B3E7B5891CC2AC0600A0062D /* QoreidSdk.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
+				2A18B1352AC6CA25005CB836 /* QoreidSdk-Bridging-Header.h */,
 			);
 			sourceTree = "<group>";
 		};
@@ -87,6 +91,7 @@
 				TargetAttributes = {
 					58B511DA1A9E6C8500147676 = {
 						CreatedOnToolsVersion = 6.1.1;
+						LastSwiftMigration = 1500;
 					};
 				};
 			};
@@ -113,7 +118,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B3E7B58A1CC2AC0600A0062D /* QoreidSdk.m in Sources */,
+				2A18B1372AC6CA26005CB836 /* File.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -218,6 +223,7 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -225,15 +231,22 @@
 					"$(SRCROOT)/../../react-native/React/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"$(inherit)",
+				);
 				PRODUCT_NAME = QoreidSdk;
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "QoreidSdk-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -241,9 +254,14 @@
 					"$(SRCROOT)/../../react-native/React/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"$(inherit)",
+				);
 				PRODUCT_NAME = QoreidSdk;
 				SKIP_INSTALL = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "QoreidSdk-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

package/ios/QoreidSdk.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/ios/QoreidSdk.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?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/>
+</plist>

package/ios/QoreidSdk.xcodeproj/project.xcworkspace/xcuserdata/e.ugwuoke.xcuserdatad/WorkspaceSettings.xcsettings

@@ -0,0 +1,14 @@
+<?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>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>ShowSharedSchemesAutomaticallyEnabled</key>
+	<true/>
+</dict>
+</plist>

package/ios/QoreidSdk.xcodeproj/xcuserdata/e.ugwuoke.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>QoreidSdk.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/ViewController.swift

@@ -0,0 +1,22 @@
+//
+//  ViewController.swift
+//  qore-id-react-native-qoreid-sdk
+//
+//  Created by Guru King on 03/10/2023.
+//
+
+import UIKit
+import QoreIDSDK
+
+class ViewController: UIViewController {
+    var param:QoreIDParam?
+    var onQoreIdResult:((QoreIDResult) -> ())?
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        QoreIdSdk.shared.launch(param: param ?? QoreIDParam(), vc: self, "react_native_ios_sdk") { [weak self] result in
+            self?.onQoreIdResult!(result)
+        }
+    }
+}