@regulaforensics/face-sdk 8.3.1100-rc → 8.3.1107-rc

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '8.3.1100-rc'
+  s.version      = '8.3.1107-rc'
   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/**/*.swift', 'ios/**/RN*.m' ]
   s.exclude_files = [ 'ios/CDVFaceSDK.swift' ]
-  s.dependency 'FaceSDKStage', '8.3.4406'
+  s.dependency 'FaceSDKStage', '8.3.4494'
   s.dependency 'React'
 end

package/android/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
     //noinspection GradleDependency
-    implementation('com.regula.face:api:8.3.4975'){
+    implementation('com.regula.face:api:8.3.5017'){
         transitive = true
     }
 }

package/android/cordova.gradle

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     //noinspection GradleDependency
-    implementation('com.regula.face:api:8.3.4975'){
+    implementation('com.regula.face:api:8.3.5017'){
         transitive = true
     }
 }

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

@@ -3,9 +3,11 @@
 package com.regula.plugin.facesdk
 
 import com.regula.facesdk.configuration.Customization
+import com.regula.facesdk.configuration.EnrollmentConfiguration
 import com.regula.facesdk.configuration.FaceCaptureConfiguration
 import com.regula.facesdk.configuration.LivenessConfiguration
 import com.regula.facesdk.configuration.MatchFacesConfiguration
+import com.regula.facesdk.configuration.VerificationConfiguration
 import com.regula.facesdk.detection.request.ImageQualityCharacteristic
 import com.regula.facesdk.detection.request.ImageQualityGroup
 import com.regula.facesdk.detection.request.ImageQualityRange
@@ -85,6 +87,95 @@ fun getLivenessConfig(input: LivenessConfiguration) = mapOf(
     "metadata" to input.metadata,
 ).toJson()
 
+fun setEnrollmentConfig(builder: EnrollmentConfiguration.Builder, config: JSONObject) = config.forEach { k, v ->
+    when (k) {
+        "copyright" -> builder.setCopyright(v as Boolean)
+        "cameraSwitchEnabled" -> builder.setCameraSwitchEnabled(v as Boolean)
+        "closeButtonEnabled" -> builder.setCloseButtonEnabled(v as Boolean)
+        "torchButtonEnabled" -> builder.setTorchButtonEnabled(v as Boolean)
+        "vibrateOnSteps" -> builder.setVibrateOnStep(v as Boolean)
+        "cameraPositionAndroid" -> builder.setCameraId(v.toInt())
+        "screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
+        "locationTrackingEnabled" -> builder.setLocationTrackingEnabled(v as Boolean)
+        "preventScreenRecording" -> builder.setPreventScreenRecording(v as Boolean)
+        "attemptsCount" -> builder.setAttemptsCount(v.toInt())
+        "recordingProcess" -> builder.setRecordingProcess(RecordingProcess.values()[v.toInt()])
+        "livenessType" -> builder.setType(LivenessType.values()[v.toInt()])
+        "tag" -> builder.setTag(v as String)
+        "externalId" -> builder.setExternalId(v as String)
+        "groupId" -> builder.setGroupId(v as String)
+        "duplicatesThreshold" -> if (config.getBooleanOrNull("checkDuplicatesEnabled") == true) builder.enableCheckDuplicates(v.toFloat())
+        "skipStep" -> builder.setSkipStep(*livenessSkipStepArrayFromJSON(v as JSONArray))
+        "metadata" -> builder.setMetadata(v as JSONObject)
+    }
+}
+
+fun getEnrollmentConfig(input: EnrollmentConfiguration) = mapOf(
+    "copyright" to input.hasCopyright(),
+    "cameraSwitchEnabled" to input.isCameraSwitchEnabled,
+    "closeButtonEnabled" to input.isCloseButtonEnabled,
+    "torchButtonEnabled" to input.isTorchButtonEnabled,
+    "vibrateOnSteps" to input.isVibrateOnSteps,
+    "cameraPositionAndroid" to input.cameraId,
+    "screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
+    "locationTrackingEnabled" to input.isLocationTrackingEnabled,
+    "preventScreenRecording" to input.doPreventScreenRecording(),
+    "attemptsCount" to input.attemptsCount,
+    "recordingProcess" to input.recordingProcess.ordinal,
+    "livenessType" to input.type.ordinal,
+    "tag" to input.tag,
+    "externalId" to input.externalId,
+//    "groupId" to input.groupId,
+    "checkDuplicatesEnabled" to input.isCheckDuplicatesEnabled,
+    "duplicatesThreshold" to input.duplicatesThreshold,
+    "skipStep" to generateLivenessSkipStepArray(input.skipStep),
+    "metadata" to input.metadata,
+).toJson()
+
+fun setVerificationConfig(builder: VerificationConfiguration.Builder, config: JSONObject) = config.forEach { k, v ->
+    when (k) {
+        "copyright" -> builder.setCopyright(v as Boolean)
+        "cameraSwitchEnabled" -> builder.setCameraSwitchEnabled(v as Boolean)
+        "closeButtonEnabled" -> builder.setCloseButtonEnabled(v as Boolean)
+        "torchButtonEnabled" -> builder.setTorchButtonEnabled(v as Boolean)
+        "vibrateOnSteps" -> builder.setVibrateOnStep(v as Boolean)
+        "cameraPositionAndroid" -> builder.setCameraId(v.toInt())
+        "screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
+        "locationTrackingEnabled" -> builder.setLocationTrackingEnabled(v as Boolean)
+        "preventScreenRecording" -> builder.setPreventScreenRecording(v as Boolean)
+        "attemptsCount" -> builder.setAttemptsCount(v.toInt())
+        "recordingProcess" -> builder.setRecordingProcess(RecordingProcess.values()[v.toInt()])
+        "livenessType" -> builder.setType(LivenessType.values()[v.toInt()])
+        "tag" -> builder.setTag(v as String)
+        "personId" -> builder.setPrivateProperty("u", v as String)
+        "groupId" -> builder.setGroupId(v as String)
+        "threshold" -> builder.setThreshold(v.toFloat())
+        "skipStep" -> builder.setSkipStep(*livenessSkipStepArrayFromJSON(v as JSONArray))
+        "metadata" -> builder.setMetadata(v as JSONObject)
+    }
+}
+
+fun getVerificationConfig(input: VerificationConfiguration) = mapOf(
+    "copyright" to input.hasCopyright(),
+    "cameraSwitchEnabled" to input.isCameraSwitchEnabled,
+    "closeButtonEnabled" to input.isCloseButtonEnabled,
+    "torchButtonEnabled" to input.isTorchButtonEnabled,
+    "vibrateOnSteps" to input.isVibrateOnSteps,
+    "cameraPositionAndroid" to input.cameraId,
+    "screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
+    "locationTrackingEnabled" to input.isLocationTrackingEnabled,
+    "preventScreenRecording" to input.doPreventScreenRecording(),
+    "attemptsCount" to input.attemptsCount,
+    "recordingProcess" to input.recordingProcess.ordinal,
+    "livenessType" to input.type.ordinal,
+    "tag" to input.tag,
+    "personId" to input.personId,
+    "groupId" to input.groupId,
+    "threshold" to input.threshold,
+    "skipStep" to generateLivenessSkipStepArray(input.skipStep),
+    "metadata" to input.metadata,
+).toJson()
+
 fun setMatchFacesConfig(builder: MatchFacesConfiguration.Builder, config: JSONObject) = config.forEach { k, v ->
     when (k) {
         "processingMode" -> builder.setProcessingMode(ProcessingMode.values()[v.toInt()])

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

@@ -9,10 +9,12 @@ import android.graphics.Rect
 import android.graphics.Typeface
 import android.util.Pair
 import android.util.Size
+import com.regula.facesdk.configuration.EnrollmentConfiguration
 import com.regula.facesdk.configuration.FaceCaptureConfiguration
 import com.regula.facesdk.configuration.InitializationConfiguration
 import com.regula.facesdk.configuration.LivenessConfiguration
 import com.regula.facesdk.configuration.MatchFacesConfiguration
+import com.regula.facesdk.configuration.VerificationConfiguration
 import com.regula.facesdk.detection.request.DetectFacesConfiguration
 import com.regula.facesdk.detection.request.DetectFacesRequest
 import com.regula.facesdk.detection.request.ImageQualityCharacteristic
@@ -50,9 +52,13 @@ import com.regula.facesdk.exception.UnderlineException
 import com.regula.facesdk.model.Image
 import com.regula.facesdk.model.LivenessNotification
 import com.regula.facesdk.model.MatchFacesImage
+import com.regula.facesdk.model.results.EnrollmentResponse
+import com.regula.facesdk.model.results.ErrorResponse
 import com.regula.facesdk.model.results.FaceCaptureResponse
 import com.regula.facesdk.model.results.FaceSDKVersion
 import com.regula.facesdk.model.results.LivenessResponse
+import com.regula.facesdk.model.results.VerificationResponse
+import com.regula.facesdk.model.results.VerifyMatchResponse
 import com.regula.facesdk.model.results.matchfaces.MatchFacesComparedFace
 import com.regula.facesdk.model.results.matchfaces.MatchFacesComparedFacesPair
 import com.regula.facesdk.model.results.matchfaces.MatchFacesDetection
@@ -65,6 +71,7 @@ import com.regula.facesdk.model.results.person.PersonImage
 import com.regula.facesdk.model.results.person.SearchPerson
 import com.regula.facesdk.model.results.person.SearchPerson.Detection
 import com.regula.facesdk.model.results.person.SearchPersonImage
+import com.regula.facesdk.request.EnrollmentRequest
 import com.regula.facesdk.request.MatchFacesRequest
 import com.regula.facesdk.request.person.EditGroupPersonsRequest
 import com.regula.facesdk.request.person.ImageUpload
@@ -74,6 +81,8 @@ import com.regula.plugin.facesdk.Convert.toBitmap
 import com.regula.plugin.facesdk.Convert.toByteArray
 import org.json.JSONArray
 import org.json.JSONObject
+import java.lang.Double
+import java.lang.Float
 
 // Config ------------------------------
 
@@ -101,6 +110,22 @@ fun livenessConfigFromJSON(input: JSONObject) = input.let {
 
 fun generateLivenessConfig(input: LivenessConfiguration) = getLivenessConfig(input)
 
+fun enrollmentConfigFromJSON(input: JSONObject) = input.let {
+    val result = EnrollmentConfiguration.Builder("")
+    setEnrollmentConfig(result, it)
+    result.build()
+}!!
+
+fun generateEnrollmentConfig(input: EnrollmentConfiguration) = getEnrollmentConfig(input)
+
+fun verificationConfigFromJSON(input: JSONObject) = input.let {
+    val result = VerificationConfiguration.Builder("")
+    setVerificationConfig(result, it)
+    result.build()
+}!!
+
+fun generateVerificationConfig(input: VerificationConfiguration) = getVerificationConfig(input)
+
 fun matchFacesConfigFromJSON(input: JSONObject) = input.let {
     val result = MatchFacesConfiguration.Builder()
     setMatchFacesConfig(result, it)
@@ -340,6 +365,24 @@ fun generateFaceCaptureResponse(it: FaceCaptureResponse) = mapOf(
 
 // Liveness ------------------------------
 
+fun enrollmentRequestFromJSON(input: JSONObject): EnrollmentRequest = input.let {
+    val externalId = it.getString("externalId")
+    val builder = if (it.has("trustedImage")) EnrollmentRequest.Builder(externalId, it.getString("trustedImage").toBitmap()!!)
+    else EnrollmentRequest.Builder(externalId, it.getString("trustedImageUrl"))
+
+    if (it.has("groupId")) builder.setGroupId(it.getString("groupId"))
+    builder.build()
+}
+
+fun generateEnrollmentRequest(input: EnrollmentRequest) = input.let {
+    mapOf(
+        "externalId" to it.externalId,
+        "groupId" to it.groupId,
+        "trustedImage" to it.trustedImage.toBase64(),
+        "trustedImageUrl" to it.trustedImageUrl,
+    ).toJson()
+}
+
 fun livenessResponseFromJSON(input: JSONObject?) = input?.let {
     val result = LivenessResponse()
     it.getStringOrNull("image").toBitmap()?.let { bitmap ->
@@ -374,6 +417,66 @@ fun generateLivenessNotification(it: LivenessNotification) = mapOf(
     "response" to generateLivenessResponse(it.response)
 ).toJson()
 
+fun errorResponseFromJSON(input: JSONObject?) = input?.let {
+    ErrorResponse(
+        it.getInt("code"),
+        it.getString("message")
+    )
+}
+
+fun generateErrorResponse(input: ErrorResponse?) = input?.let {
+    mapOf(
+        "code" to it.code,
+        "message" to it.message
+    ).toJson()
+}
+
+fun enrollmentResponseFromJSON(input: JSONObject?) = input?.let {
+    EnrollmentResponse(
+        it.getStringOrNull("personId"),
+        it.getStringOrNull("externalId"),
+        errorResponseFromJSON(it.getJSONObjectOrNull("error"))
+    )
+}
+
+fun generateEnrollmentResponse(input: EnrollmentResponse?) = input?.let {
+    mapOf(
+        "personId" to it.personId,
+        "externalId" to it.externalId,
+        "error" to generateErrorResponse(it.errorResponse),
+    ).toJson()
+}
+
+fun verifyMatchResponseFromJSON(input: JSONObject?) = input?.let {
+    VerifyMatchResponse(
+        it.getBoolean("passed"),
+        it.get("similarity").toFloat()
+    )
+}
+
+fun generateVerifyMatchResponse(input: VerifyMatchResponse?) = input?.let {
+    mapOf(
+        "passed" to it.isPassed,
+        "similarity" to it.similarity
+    ).toJson()
+}
+
+fun verificationResponseFromJSON(input: JSONObject?) = input?.let {
+    VerificationResponse(
+        it.getBoolean("passed"),
+        verifyMatchResponseFromJSON(it.getJSONObjectOrNull("match")),
+        errorResponseFromJSON(it.getJSONObjectOrNull("error"))
+    )
+}
+
+fun generateVerificationResponse(input: VerificationResponse?) = input?.let {
+    mapOf(
+        "passed" to it.isPassed,
+        "match" to generateVerifyMatchResponse(it.match),
+        "error" to generateErrorResponse(it.error),
+    ).toJson()
+}
+
 // MatchFaces ------------------------------
 
 fun matchFacesImageFromJSON(input: JSONObject?) = input?.let {
@@ -485,7 +588,7 @@ fun generateRect(input: Rect?) = input?.let {
 }
 
 fun matchFacesDetectionFaceFromJSON(input: JSONObject?) = input?.let {
-    val result = MatchFacesDetectionFace::class.constructor(Int::class, java.lang.Double::class, ArrayList::class, Rect::class, Rect::class).instantiate(
+    val result = MatchFacesDetectionFace::class.constructor(Int::class, Double::class, ArrayList::class, Rect::class, Rect::class).instantiate(
         it.getIntOrNull("faceIndex"),
         it.getDoubleOrNull("rotationAngle"),
         it.getJSONArrayOrNull("landmarks").toList(::pointFromJSON).toArrayList(),
@@ -541,7 +644,7 @@ fun generateComparedFace(it: MatchFacesComparedFace) = mapOf(
 ).toJson()
 
 fun comparedFacesPairFromJSON(input: JSONObject): MatchFacesComparedFacesPair = input.let {
-    MatchFacesComparedFacesPair::class.constructor(MatchFacesComparedFace::class, MatchFacesComparedFace::class, MatchFacesException::class, java.lang.Float::class, java.lang.Float::class).instantiate(
+    MatchFacesComparedFacesPair::class.constructor(MatchFacesComparedFace::class, MatchFacesComparedFace::class, MatchFacesException::class, Float::class, Float::class).instantiate(
         comparedFaceFromJSON(it.getJSONObject("first")),
         comparedFaceFromJSON(it.getJSONObject("second")),
         matchFacesExceptionFromJSON(it.getJSONObjectOrNull("error")),
@@ -912,4 +1015,4 @@ fun generateSearchPerson(input: SearchPerson?) = input?.let {
         "metadata" to it.metadata,
         "createdAt" to it.createdAt.toStr()
     ).toJson()
-}
+}

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

@@ -1,7 +1,6 @@
 package com.regula.plugin.facesdk
 
 import android.annotation.SuppressLint
-import com.regula.plugin.facesdk.Convert.toBase64
 import com.regula.common.LocalizationCallbacks
 import com.regula.facesdk.FaceSDK.Instance
 import com.regula.facesdk.callback.DetectFacesCompletion
@@ -17,12 +16,16 @@ import com.regula.facesdk.enums.InitErrorCode
 import com.regula.facesdk.exception.InitException
 import com.regula.facesdk.listener.NetworkInterceptorListener
 import com.regula.facesdk.model.LivenessNotification
+import com.regula.facesdk.model.results.EnrollmentResponse
+import com.regula.facesdk.model.results.LivenessResponse
+import com.regula.facesdk.model.results.VerificationResponse
 import com.regula.facesdk.model.results.matchfaces.MatchFacesSimilarityThresholdSplit
 import com.regula.facesdk.model.results.person.DbBaseItem
 import com.regula.facesdk.model.results.person.PageableItemList
 import com.regula.facesdk.model.results.person.Person
 import com.regula.facesdk.model.results.person.PersonGroup
 import com.regula.facesdk.model.results.person.SearchPerson
+import com.regula.plugin.facesdk.Convert.toBase64
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -45,6 +48,9 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "startFaceCapture" -> startFaceCapture(callback, argsNullable(0))
     "stopFaceCapture" -> stopFaceCapture()
     "startLiveness" -> startLiveness(callback, argsNullable(0))
+    "startEnrollment" -> startEnrollment(callback, args(0))
+    "startVerification" -> startVerification(callback, args(0))
+    "enrollWithTrustedPhoto" -> enrollWithTrustedPhoto(callback, args(0))
     "stopLiveness" -> stopLiveness()
     "matchFaces" -> matchFaces(callback, args(0), argsNullable(1))
     "splitComparedFaces" -> splitComparedFaces(callback, args(0), args(1))
@@ -154,6 +160,24 @@ fun startLiveness(callback: Callback, config: JSONObject?) = config?.let {
     livenessNotificationCompletion()
 )
 
+fun startEnrollment(callback: Callback, config: JSONObject) = Instance().startEnrollment(
+    context,
+    enrollmentConfigFromJSON(config),
+    enrollmentCompletion(callback),
+    livenessNotificationCompletion(),
+)
+
+fun startVerification(callback: Callback, config: JSONObject) = Instance().startVerification(
+    context,
+    verificationConfigFromJSON(config),
+    verificationCompletion(callback),
+    livenessNotificationCompletion(),
+)
+
+fun enrollWithTrustedPhoto(callback: Callback, config: JSONObject) = Instance().enrollWithTrustedPhoto(
+    enrollmentRequestFromJSON(config),
+) { callback(generateEnrollmentResponse(it)) }
+
 fun stopLiveness() = Instance().stopLivenessProcessing(context)
 
 fun matchFaces(callback: Callback, request: JSONObject, config: JSONObject?) = config?.let {
@@ -371,6 +395,20 @@ fun detectFacesCompletion(callback: Callback) = DetectFacesCompletion {
     callback(generateDetectFacesResponse(it))
 }
 
+fun verificationCompletion(callback: Callback) = { livenessResponse: LivenessResponse, verificationResponse: VerificationResponse? ->
+    callback(mapOf(
+        "livenessResponse" to generateLivenessResponse(livenessResponse),
+        "verificationResponse" to generateVerificationResponse(verificationResponse),
+    ).toJson())
+}
+
+fun enrollmentCompletion(callback: Callback) = { livenessResponse: LivenessResponse, enrollmentResponse: EnrollmentResponse? ->
+    callback(mapOf(
+        "livenessResponse" to generateLivenessResponse(livenessResponse),
+        "enrollmentResponse" to generateEnrollmentResponse(enrollmentResponse),
+    ).toJson())
+}
+
 fun <T> databaseItemCompletion(callback: Callback, toJson: ((T?) -> JSONObject?)?) = object : PersonDBCallback<T> {
     override fun onSuccess(data: T?) = callback(generatePersonDBResponse(toJson?.let { it(data) } ?: true, null))
     override fun onFailure(error: String) = callback(generatePersonDBResponse(null, error))

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

@@ -15,7 +15,6 @@ import com.regula.common.ble.BLEWrapper
 import com.regula.facesdk.configuration.Customization
 import com.regula.facesdk.enums.CustomizationColor
 import com.regula.facesdk.enums.CustomizationFont
-import com.regula.facesdk.enums.CustomizationImage
 import com.regula.facesdk.enums.ImageType
 import com.regula.facesdk.enums.InitErrorCode
 import com.regula.facesdk.enums.OutputImageCropAspectRatio