@regulaforensics/face-sdk 7.2.415-beta → 7.2.421-beta

package/README.md

@@ -1,10 +1,11 @@
 # Regula Face SDK plugin
 Face SDK is a framework that is used for face matching, recognition and liveness detection.
-This plugin makes possible to use it with react-native, cordova and capacitor applications.
+This plugin makes possible to use it with react-native, cordova and ionic applications.
 
 ## Demo applications
-In the [examples](examples/) folder you can find 3 demo applications:
+In the [examples](examples/) folder you can find 4 demo applications:
 * [React-native](examples/react_native)
+* [Cordova](examples/cordova)
 * [Ionic(ionic app with cordova, angular)](examples/ionic)
 * [Capacitor(ionic app with capacitor, react)](examples/capacitor)
 

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '7.2.415-beta'
+  s.version      = '7.2.421-beta'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDFaceSDK.h', 'ios/CVDFaceSDK.m' ]
-  s.dependency 'FaceSDKNightly', '7.1.3008'
+  s.dependency 'FaceSDK', '7.1.2940'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -32,7 +32,7 @@ android {
 rootProject.allprojects {
     repositories {
         maven {
-            url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
+            url "https://maven.regulaforensics.com/RegulaDocumentReader"
         }
     }
 }
@@ -41,7 +41,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.face:api:7.1.3926'){
+    implementation('com.regula.face:api:7.1.3897'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -6,13 +6,13 @@ android {
 
 repositories {
     maven {
-        url "https://maven.regulaforensics.com/RegulaDocumentReader/Nightly"
+        url "https://maven.regulaforensics.com/RegulaDocumentReader"
     }
 }
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.face:api:7.1.3926'){
+    implementation('com.regula.face:api:7.1.3897'){
         transitive = true
     }
 }

package/android/src/main/java/com/regula/plugin/facesdk/JSONConstructor.kt

@@ -833,7 +833,6 @@ fun searchPersonRequestFromJSON(it: JSONObject) = object : SearchPersonRequest()
     groupIdsForSearch = it.getJSONArrayOrNull("groupIdsForSearch").toArray()
     threshold = it.getDoubleOrNull("threshold")?.toFloat()
     limit = it.getIntOrNull("limit")
-    tag = it.getStringOrNull("tag")
     imageUpload = imageUploadFromJSON(it.getJSONObjectOrNull("imageUpload"))
     isDetectAll = it.optBoolean("detectAll", false)
     outputImageParams = outputImageParamsFromJSON(it.getJSONObjectOrNull("outputImageParams"))
@@ -844,7 +843,6 @@ fun generateSearchPersonRequest(it: SearchPersonRequest) = mapOf(
     "groupIdsForSearch" to it.groupIdsForSearch.toJson(),
     "threshold" to it.threshold,
     "limit" to it.limit,
-    "tag" to it.tag,
     "imageUpload" to generateImageUpload(it.imageUpload),
     "detectAll" to it.isDetectAll,
     "outputImageParams" to generateOutputImageParams(it.outputImageParams)

package/android/src/main/java/com/regula/plugin/facesdk/Main.kt

@@ -30,12 +30,6 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "getVersion" -> getVersion(callback)
     "getServiceUrl" -> getServiceUrl(callback)
     "setServiceUrl" -> setServiceUrl(argsNullable(0))
-    "getTenant" -> getTenant(callback)
-    "setTenant" -> setTenant(argsNullable(0))
-    "getEnv" -> getEnv(callback)
-    "setEnv" -> setEnv(argsNullable(0))
-    "getLocale" -> getLocale(callback)
-    "setLocale" -> setLocale(argsNullable(0))
     "setLocalizationDictionary" -> setLocalizationDictionary(args(0))
     "setRequestHeaders" -> setRequestHeaders(args(0))
     "setCustomization" -> setCustomization(args(0))
@@ -87,18 +81,6 @@ fun getServiceUrl(callback: Callback) = callback(Instance().serviceUrl)
 
 fun setServiceUrl(url: String?) = url.let { Instance().serviceUrl = it }
 
-fun getTenant(callback: Callback) = callback(Instance().tenant)
-
-fun setTenant(tag: String?) = tag.let { Instance().tenant = it }
-
-fun getEnv(callback: Callback) = callback(Instance().env)
-
-fun setEnv(tag: String?) = tag.let { Instance().env = it }
-
-fun getLocale(callback: Callback) = callback(Instance().locale)
-
-fun setLocale(locale: String?) = locale.let { Instance().locale = it }
-
 fun setLocalizationDictionary(dictionary: JSONObject) {
     localizationCallbacks = LocalizationCallbacks { if (dictionary.has(it)) dictionary.getString(it) else null }
     Instance().setLocalizationCallback(localizationCallbacks!!)

package/examples/capacitor/android/app/src/main/AndroidManifest.xml

@@ -18,8 +18,8 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
         </activity>
     </application>
-
     <uses-permission android:name="android.permission.INTERNET" />
-</manifest>
+</manifest>

package/examples/capacitor/index.html

@@ -1,5 +1,10 @@
 <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+<script type="module" src="/src/main.tsx"></script>
+
 <div id="content" style="height: 100%"></div>
 
-<script type="module" src="./index.tsx"></script>
-<script type="module" src="/src/main.tsx"></script>
+<script>
+    fetch("main.html")
+        .then(response => response.text())
+        .then(html => document.getElementById("content").innerHTML = html)
+</script>

package/examples/capacitor/package-lock.json

@@ -16,8 +16,6 @@
         "@capacitor/ios": "7.0.1",
         "@capacitor/status-bar": "7.0.0",
         "@ionic/react": "8.4.3",
-        "@regulaforensics/face-core-basic": "7.1.178",
-        "@regulaforensics/face-sdk": "7.1.317",
         "@types/react-router-dom": "5.3.3",
         "@vitejs/plugin-react": "4.3.4",
         "cordova-plugin-camera": "8.0.0",
@@ -1204,18 +1202,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@regulaforensics/face-core-basic": {
-      "version": "7.1.178",
-      "resolved": "https://registry.npmjs.org/@regulaforensics/face-core-basic/-/face-core-basic-7.1.178.tgz",
-      "integrity": "sha512-KfVME7fPy3vOMKM5g/79Yiz6enWvhxL/nw6B9HKkMpE1uKYgXUa3DWgs4m5EMiqH7jmJ3bmxekkDUFwer6j3pw==",
-      "license": "commercial"
-    },
-    "node_modules/@regulaforensics/face-sdk": {
-      "version": "7.1.317",
-      "resolved": "https://registry.npmjs.org/@regulaforensics/face-sdk/-/face-sdk-7.1.317.tgz",
-      "integrity": "sha512-RtZ4vOlVfcisVcD86rEYbnxPyUjVW2cKwG45oUBGE43UJYAuoYdwdUdfOWoQqwNAsk5Aehp/8EsMwc6e775h3Q==",
-      "license": "commercial"
-    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.40.2",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.2.tgz",
@@ -1778,9 +1764,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"

package/examples/capacitor/package.json

@@ -6,19 +6,19 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.2.415-beta",
-    "@regulaforensics/face-core-basic": "7.1.240-nightly",
+    "@regulaforensics/face-sdk": "7.2.421-beta",
+    "@regulaforensics/face-core-basic": "7.1.202",
     "@awesome-cordova-plugins/file": "6.6.0",
     "@awesome-cordova-plugins/camera": "6.6.0",
     "cordova-plugin-file": "8.1.3",
     "cordova-plugin-camera": "8.0.0",
+    "@capacitor/dialog": "7.0.1",
     "@capacitor/cli": "7.0.1",
     "@capacitor/core": "7.0.1",
     "@capacitor/app": "7.0.0",
     "@capacitor/ios": "7.0.1",
     "@capacitor/android": "7.0.1",
     "@capacitor/status-bar": "7.0.0",
-    "@capacitor/dialog": "7.0.1",
     "@ionic/react": "8.4.3",
     "@vitejs/plugin-react": "4.3.4",
     "vite-plugin-static-copy": "2.3.1",

package/examples/capacitor/scripts/setup.sh

@@ -2,7 +2,5 @@
 set -e
 
 npm install
-ionic cap sync ios || {
-    cd ios/App
-    pod update
-}
+cd ios/App
+pod install || pod update

package/examples/capacitor/src/main.css

@@ -1,19 +1,15 @@
 html,
 body {
-    margin: 0;
-    width: 100%;
+    width: 99%;
     height: 99vh;
     display: flex;
-    overflow: hidden;
     flex-direction: column;
 }
 
-/* Prevent text selection */
-* {
-    user-select: none !important;
-    -webkit-user-select: none !important;
-    -webkit-user-drag: none !important;
-    -webkit-touch-callout: none !important;
+.page {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
 }
 
 .column {
@@ -56,14 +52,10 @@ body {
     margin-top: 13px;
 }
 
-.scroll {
-    flex-grow: 1;
-    overflow-y: auto;
-}
-
 .no-scroll {
     flex-grow: 1;
     overflow-y: hidden;
+    overflow-x: hidden;
 }
 
 .button {
@@ -75,7 +67,6 @@ body {
     color: white;
     border: none;
     padding: 10px 20px;
-    justify-content: center;
     font-size: 16px;
     border-radius: 100px;
     cursor: pointer;
@@ -89,49 +80,4 @@ body {
 .button:active {
     position: relative;
     top: 1px;
-}
-
-.text-button {
-    background: none;
-    border: none;
-    color: #2196f3;
-    font-size: 20px;
-    font-weight: bold;
-    padding: 5px;
-}
-
-.text-button:active {
-    position: relative;
-    top: 1px;
-}
-
-.radio {
-    align-items: baseline;
-    padding: 15px;
-}
-
-input[type="checkbox"] {
-    width: 20px;
-    height: 20px;
-    border: 2px solid black;
-    background-color: white;
-    display: inline-block;
-    position: relative;
-    cursor: pointer;
-}
-
-.progress-bar {
-    width: 75%;
-    padding: 3px;
-    margin-top: 40px;
-    background-color: #eee;
-    border-radius: 8px;
-    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-}
-
-#progress {
-    width: 0%;
-    height: 20px;
-    background-color: #4285F4;
-    border-radius: 5px;
 }

package/examples/capacitor/src/main.html

@@ -1,4 +1,4 @@
-<div class="column" style="height: 100%">
+<div class="page">
     <div class="column header">
         <span id="status">Loading...</span>
         <div class="column divider"></div>

package/examples/capacitor/src/main.tsx

@@ -1,21 +1,17 @@
+import '@ionic/react/css/core.css'
+import './main.css'
+import { setupIonicReact } from '@ionic/react'
+import { StatusBar, Style } from '@capacitor/status-bar'
+import { File } from '@awesome-cordova-plugins/file'
+import { Dialog } from '@capacitor/dialog'
+import { Camera, DestinationType, MediaType, PictureSourceType } from '@awesome-cordova-plugins/camera'
 import { FaceSDK, MatchFacesRequest, MatchFacesImage, InitConfig, LivenessSkipStep, ImageType, LivenessStatus, LivenessConfig } from '@regulaforensics/face-sdk'
-import { loadAssetIfExists, chooseOption, pickImage } from '../index'
-
-var faceSdk = FaceSDK.instance
-var image1: MatchFacesImage | null
-var image2: MatchFacesImage | null
 
 async function init() {
   if (!await initializeReader()) return
   setStatus("Ready")
 }
 
-async function startFaceCapture(position: number) {
-  var image = (await faceSdk.startFaceCapture()).image
-  if (image == null) return
-  setImage("data:image/png;base64," + image.image, image.imageType, position)
-}
-
 async function startLiveness() {
   var response = await faceSdk.startLiveness({
     config: new LivenessConfig({
@@ -46,29 +42,13 @@ async function matchFaces() {
   setStatus("Ready")
 }
 
-async function getImage(position: number) {
-  var source = await chooseOption()
-  if (source == null) return
-  if (source) startFaceCapture(position)
-  else {
-    var image = await pickImage()
-    if (image == null) return
-    setImage(image, ImageType.PRINTED, position)
-  }
-}
-
-function setImage(base64: string, type: number, position: number) {
+function clearResults() {
+  setStatus("Ready")
   setSimilarityStatus("null")
-  var mfImage = new MatchFacesImage(base64, type)
-  if (position == 1) {
-    image1 = mfImage
-    setUiImage1(base64)
-    setLivenessStatus("null")
-  }
-  if (position == 2) {
-    image2 = mfImage
-    setUiImage2(base64)
-  }
+  setLivenessStatus("null")
+  resetImages()
+  image1 = null
+  image2 = null
 }
 
 // If 'regula.license' exists, init using license(enables offline match)
@@ -81,36 +61,92 @@ async function initializeReader() {
   if (license != null) config = new InitConfig(license)
   var [success, error] = await faceSdk.initialize({ config: config })
 
-  if (error != null) {
+  if (!success && error != null) {
     setStatus(error.message)
     console.log(error.code + ": " + error.message)
   }
   return success
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+function setImage(base64: string, type: number, position: number) {
+  setSimilarityStatus("null")
+  var mfImage = new MatchFacesImage(base64, type)
+  if (position == 1) {
+    image1 = mfImage
+    setUiImage1(base64)
+    setLivenessStatus("null")
+  }
+  if (position == 2) {
+    image2 = mfImage
+    setUiImage2(base64)
+  }
+}
 
-export function main() {
-  document.getElementById("first-image")!.onclick = () => getImage(1)
-  document.getElementById("second-image")!.onclick = () => getImage(2)
-  document.getElementById("match-faces")!.onclick = () => matchFaces()
-  document.getElementById("start-liveness")!.onclick = () => startLiveness()
-  document.getElementById("clear-results")!.onclick = () => clearResults()
+async function useCamera(position: number) {
+  var response = await faceSdk.startFaceCapture()
+  if (response.image == null) return
+  var image = response.image
+  setImage("data:image/png;base64," + image.image, image.imageType, position)
+}
 
-  init()
+async function useGallery(position: number) {
+  var image = await Camera.getPicture({
+    destinationType: DestinationType.DATA_URL,
+    mediaType: MediaType.PICTURE,
+    sourceType: PictureSourceType.PHOTOLIBRARY
+  })
+  setImage(image, ImageType.PRINTED, position)
+}
+
+async function pickImage(position: number) {
+  var response = await Dialog.confirm({
+    message: "Select option",
+    okButtonTitle: "Use camera",
+    cancelButtonTitle: "Use gallery"
+  })
+  if (response.value) useCamera(position)
+  else useGallery(position)
 }
 
-var setStatus = (data: string) => document.getElementById("status")!.innerHTML = data
-var setLivenessStatus = (data: string) => document.getElementById("liveness-status")!.innerHTML = data
-var setSimilarityStatus = (data: string) => document.getElementById("similarity-status")!.innerHTML = data
+async function loadAssetIfExists(path: string): Promise<string | null> {
+  try {
+    var dir = await File.resolveDirectoryUrl(File.applicationDirectory + "public/assets")
+    var fileEntry = await File.getFile(dir, path, null)
+    var result = await new Promise<string | null>((resolve, _) => {
+      fileEntry.file(file => {
+        var reader = new FileReader()
+        reader.onloadend = (_) => resolve(reader.result as string)
+        reader.readAsDataURL(file)
+      }, _ => resolve(null))
+    })
+    return result
+  } catch (_) {
+    return null
+  }
+}
+
+var faceSdk = FaceSDK.instance
+var image1: MatchFacesImage | null
+var image2: MatchFacesImage | null
+
+var setStatus = (data: string) => document.getElementById("status").innerHTML = data
+var setLivenessStatus = (data: string) => document.getElementById("liveness-status").innerHTML = data
+var setSimilarityStatus = (data: string) => document.getElementById("similarity-status").innerHTML = data
 var setUiImage1 = (data: string) => (document.getElementById("first-image") as HTMLImageElement).src = data
 var setUiImage2 = (data: string) => (document.getElementById("second-image") as HTMLImageElement).src = data
-var clearResults = () => {
-  setStatus("Ready")
-  setSimilarityStatus("null")
-  setLivenessStatus("null")
+var resetImages = () => {
   setUiImage1("images/portrait.png")
   setUiImage2("images/portrait.png")
-  image1 = null
-  image2 = null
 }
+
+setupIonicReact()
+StatusBar.setStyle({ style: Style.Light })
+document.addEventListener('deviceready', () => {
+  document.getElementById("first-image").onclick = () => pickImage(1)
+  document.getElementById("second-image").onclick = () => pickImage(2)
+  document.getElementById("match-faces").onclick = () => matchFaces()
+  document.getElementById("start-liveness").onclick = () => startLiveness()
+  document.getElementById("clear-results").onclick = () => clearResults()
+
+  init()
+})

package/examples/cordova/.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug Android on emulator",
+            "type": "cordova",
+            "request": "launch",
+            "platform": "android",
+            "target": "emulator",
+            "port": 9222,
+            "sourceMaps": true,
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "name": "Debug Android on device",
+            "type": "cordova",
+            "request": "launch",
+            "platform": "android",
+            "target": "device",
+            "port": 9222,
+            "sourceMaps": true,
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

package/examples/cordova/README.md

@@ -0,0 +1,25 @@
+# Regula Face SDK Cordova demo application
+
+## How to build demo application
+1. Download or the clone current repository using the command `git clone https://github.com/regulaforensics/npm-face-sdk.git`.
+
+2. Execute `npm run setup` within this directory.
+
+3. Run the app: 
+  * IOS: `npm run ios`.
+  * Android: `npm run android`.
+
+**Note**: this is just one way of running the app. You can also pass `-o` or `--open` argument to the command, and this will open Xcode/Android Studio, then run the app directly from the IDE. Overall, this is a more consistent way, so if you're having troubles running the app from terminal, try running it from the IDE.
+
+
+## How to use offline match
+1. Place a license that supports offline match at `www/regula.license`.
+
+2. Change core with the following commands:
+```bash
+cordova plugin remove @regulaforensics/face-core-basic
+cordova plugin add @regulaforensics/face-core-match
+npm run setup
+```
+
+3. Turn off the internet and run the app.

package/examples/cordova/config.xml

@@ -0,0 +1,26 @@
+<widget android-packageName="com.regula.documentreader.api.androidtest" ios-CFBundleIdentifier="com.regula.documentreader.qa" version="1.0.0"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <name>FaceSDK</name>
+    <platform name="android">
+        <preference name="orientation" value="portrait" />
+        <preference name="GradlePluginKotlinEnabled" value="true" />
+        <preference name="android-minSdkVersion" value="24" />
+        <preference name="android-targetSdkVersion" value="35" />
+        <config-file parent="/*" target="AndroidManifest.xml">
+            <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+        </config-file>
+        <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
+            <application android:usesCleartextTraffic="true" />
+        </edit-config>
+    </platform>
+    <platform name="ios">
+        <preference name="orientation" value="portrait" />
+        <preference name="DisallowOverscroll" value="true" />
+        <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
+            <string>To use camera</string>
+        </config-file>
+        <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
+            <string>To pick images</string>
+        </config-file>
+    </platform>
+</widget>