@regulaforensics/face-sdk 8.4.1336-rc → 8.4.1343-nightly

package/ios/Config.swift

@@ -107,111 +107,107 @@ public extension LivenessConfiguration {
     }
 }
 
-public extension EnrollmentConfiguration {
-    static func decode2(_ it: [String: Any]) -> Self {
-        return Self.init({ builder in
-            for (k, v) in it {
-                switch k {
-                case("copyright"): builder.isCopyright = v as! Bool
-                case("cameraSwitchEnabled"): builder.isCameraSwitchButtonEnabled = v as! Bool
-                case("closeButtonEnabled"): builder.isCloseButtonEnabled = v as! Bool
-                case("torchButtonEnabled"): builder.isTorchButtonEnabled = v as! Bool
-                case("vibrateOnSteps"): builder.vibrateOnSteps = v as! Bool
-                case("cameraPositionIOS"): builder.cameraPosition = CameraPosition(rawValue: v as! Int)!
-                case("attemptsCount"): builder.attemptsCount = v as! Int
-                case("locationTrackingEnabled"): builder.isLocationTrackingEnabled = v as! Bool
-                case("preventScreenRecording"): builder.isPreventScreenRecordingEnable = v as! Bool
-                case("recordingProcess"): builder.recordingProcess = RecordingProcess(rawValue: v as! Int)!
-                case("livenessType"): builder.livenessType = LivenessType(rawValue: v as! Int)!
-                case("screenOrientation"): builder.screenOrientation = RFSScreenOrientation.decode(v)
-                case("tag"): builder.tag = v as? String
-                case("externalId"): builder.externalId = v as! String
-                case("groupId"): builder.groupId = v as? String
-                case("checkDuplicatesEnabled"): builder.checkDuplicatesEnabled = v as? NSNumber
-                case("duplicatesThreshold"): builder.duplicatesThreshold = v as? NSNumber
-                case("skipStep"): builder.stepSkippingMask = RFSLivenessStepSkip.decode(v)
-                case("metadata"): builder.metadata = v as! [String: Any]
-                default: break
-                }
-            }
-        })
-    }
-    func encode2() -> [String: Any?] {
-        return [
-            "copyright": self.isCopyright,
-            "cameraSwitchEnabled": self.isCameraSwitchButtonEnabled,
-            "closeButtonEnabled": self.isCloseButtonEnabled,
-            "torchButtonEnabled": self.isTorchButtonEnabled,
-            "vibrateOnSteps": self.vibrateOnSteps,
-            "cameraPositionIOS": self.cameraPosition.rawValue,
-            "attemptsCount": self.attemptsCount,
-            "locationTrackingEnabled": self.isLocationTrackingEnabled,
-            "preventScreenRecording": self.isPreventScreenRecordingEnable,
-            "recordingProcess": self.recordingProcess.rawValue,
-            "livenessType": self.livenessType.rawValue,
-            "screenOrientation": self.screenOrientation.encode(),
-            "tag": self.tag,
-            "externalId": self.externalId,
-            "groupId": self.groupId,
-            "checkDuplicatesEnabled": self.checkDuplicatesEnabled,
-            "duplicatesThreshold": self.duplicatesThreshold,
-            "skipStep": self.stepSkippingMask.encode(),
-            "metadata": self.metadata,
-        ]
-    }
-}
+ public extension EnrollmentConfiguration {
+     static func decode2(_ it: [String: Any]) -> Self {
+         return Self.init({ builder in
+             for (k, v) in it {
+                 switch k {
+                 case("copyright"): builder.isCopyright = v as! Bool
+                 case("cameraSwitchEnabled"): builder.isCameraSwitchButtonEnabled = v as! Bool
+                 case("closeButtonEnabled"): builder.isCloseButtonEnabled = v as! Bool
+                 case("torchButtonEnabled"): builder.isTorchButtonEnabled = v as! Bool
+                 case("vibrateOnSteps"): builder.vibrateOnSteps = v as! Bool
+                 case("cameraPositionIOS"): builder.cameraPosition = CameraPosition(rawValue: v as! Int)!
+                 case("attemptsCount"): builder.attemptsCount = v as! Int
+                 case("locationTrackingEnabled"): builder.isLocationTrackingEnabled = v as! Bool
+                 case("preventScreenRecording"): builder.isPreventScreenRecordingEnable = v as! Bool
+                 case("recordingProcess"): builder.recordingProcess = RecordingProcess(rawValue: v as! Int)!
+                 case("livenessType"): builder.livenessType = LivenessType(rawValue: v as! Int)!
+                 case("screenOrientation"): builder.screenOrientation = RFSScreenOrientation.decode(v)
+                 case("tag"): builder.tag = v as? String
+                 case("skipStep"): builder.stepSkippingMask = RFSLivenessStepSkip.decode(v)
+                 case("metadata"): builder.metadata = v as! [String: Any]
+                 case("person"): builder.person = PersonDatabase.Person.decode(v as! [String: Any])!
+                 case("searchFilter"): builder.searchFilter = SearchPersonFilter.decode(v as! [String: Any])
+                 default: break
+                 }
+             }
+         })
+     }
+     func encode2() -> [String: Any?] {
+         return [
+             "copyright": self.isCopyright,
+             "cameraSwitchEnabled": self.isCameraSwitchButtonEnabled,
+             "closeButtonEnabled": self.isCloseButtonEnabled,
+             "torchButtonEnabled": self.isTorchButtonEnabled,
+             "vibrateOnSteps": self.vibrateOnSteps,
+             "cameraPositionIOS": self.cameraPosition.rawValue,
+             "attemptsCount": self.attemptsCount,
+             "locationTrackingEnabled": self.isLocationTrackingEnabled,
+             "preventScreenRecording": self.isPreventScreenRecordingEnable,
+             "recordingProcess": self.recordingProcess.rawValue,
+             "livenessType": self.livenessType.rawValue,
+             "screenOrientation": self.screenOrientation.encode(),
+             "tag": self.tag,
+             "skipStep": self.stepSkippingMask.encode(),
+             "metadata": self.metadata,
+             "person": self.person.encode(),
+             "searchFilter": self.searchFilter.encode(),
+         ]
+     }
+ }
 
-public extension VerificationConfiguration {
-    static func decode2(_ it: [String: Any]) -> Self {
-        return Self.init({ builder in
-            for (k, v) in it {
-                switch k {
-                case("copyright"): builder.isCopyright = v as! Bool
-                case("cameraSwitchEnabled"): builder.isCameraSwitchButtonEnabled = v as! Bool
-                case("closeButtonEnabled"): builder.isCloseButtonEnabled = v as! Bool
-                case("torchButtonEnabled"): builder.isTorchButtonEnabled = v as! Bool
-                case("vibrateOnSteps"): builder.vibrateOnSteps = v as! Bool
-                case("cameraPositionIOS"): builder.cameraPosition = CameraPosition(rawValue: v as! Int)!
-                case("attemptsCount"): builder.attemptsCount = v as! Int
-                case("locationTrackingEnabled"): builder.isLocationTrackingEnabled = v as! Bool
-                case("preventScreenRecording"): builder.isPreventScreenRecordingEnable = v as! Bool
-                case("recordingProcess"): builder.recordingProcess = RecordingProcess(rawValue: v as! Int)!
-                case("livenessType"): builder.livenessType = LivenessType(rawValue: v as! Int)!
-                case("screenOrientation"): builder.screenOrientation = RFSScreenOrientation.decode(v)
-                case("tag"): builder.tag = v as? String
-                case("personId"): builder.personId = v as! String
-                case("groupId"): builder.groupId = v as? String
-                case("threshold"): builder.threshold = v as? NSNumber
-                case("skipStep"): builder.stepSkippingMask = RFSLivenessStepSkip.decode(v)
-                case("metadata"): builder.metadata = v as! [String: Any]
-                default: break
-                }
-            }
-        })
-    }
-    func encode2() -> [String: Any?] {
-        return [
-            "copyright": self.isCopyright,
-            "cameraSwitchEnabled": self.isCameraSwitchButtonEnabled,
-            "closeButtonEnabled": self.isCloseButtonEnabled,
-            "torchButtonEnabled": self.isTorchButtonEnabled,
-            "vibrateOnSteps": self.vibrateOnSteps,
-            "cameraPositionIOS": self.cameraPosition.rawValue,
-            "attemptsCount": self.attemptsCount,
-            "locationTrackingEnabled": self.isLocationTrackingEnabled,
-            "preventScreenRecording": self.isPreventScreenRecordingEnable,
-            "recordingProcess": self.recordingProcess.rawValue,
-            "livenessType": self.livenessType.rawValue,
-            "screenOrientation": self.screenOrientation.encode(),
-            "tag": self.tag,
-            "personId": self.personId,
-            "groupId": self.groupId,
-            "threshold": self.threshold,
-            "skipStep": self.stepSkippingMask.encode(),
-            "metadata": self.metadata,
-        ]
-    }
-}
+ public extension VerificationConfiguration {
+     static func decode2(_ it: [String: Any]) -> Self {
+         return Self.init({ builder in
+             for (k, v) in it {
+                 switch k {
+                 case("copyright"): builder.isCopyright = v as! Bool
+                 case("cameraSwitchEnabled"): builder.isCameraSwitchButtonEnabled = v as! Bool
+                 case("closeButtonEnabled"): builder.isCloseButtonEnabled = v as! Bool
+                 case("torchButtonEnabled"): builder.isTorchButtonEnabled = v as! Bool
+                 case("vibrateOnSteps"): builder.vibrateOnSteps = v as! Bool
+                 case("cameraPositionIOS"): builder.cameraPosition = CameraPosition(rawValue: v as! Int)!
+                 case("attemptsCount"): builder.attemptsCount = v as! Int
+                 case("locationTrackingEnabled"): builder.isLocationTrackingEnabled = v as! Bool
+                 case("preventScreenRecording"): builder.isPreventScreenRecordingEnable = v as! Bool
+                 case("recordingProcess"): builder.recordingProcess = RecordingProcess(rawValue: v as! Int)!
+                 case("livenessType"): builder.livenessType = LivenessType(rawValue: v as! Int)!
+                 case("screenOrientation"): builder.screenOrientation = RFSScreenOrientation.decode(v)
+                 case("tag"): builder.tag = v as? String
+                 case("skipStep"): builder.stepSkippingMask = RFSLivenessStepSkip.decode(v)
+                 case("metadata"): builder.metadata = v as! [String: Any]
+                 case("personId"): builder.personId = v as! String
+                 case("externalId"): builder.externalId = v as? String
+                 case("threshold"): builder.threshold = v as? NSNumber
+                 default: break
+                 }
+             }
+         })
+     }
+     func encode2() -> [String: Any?] {
+         return [
+             "copyright": self.isCopyright,
+             "cameraSwitchEnabled": self.isCameraSwitchButtonEnabled,
+             "closeButtonEnabled": self.isCloseButtonEnabled,
+             "torchButtonEnabled": self.isTorchButtonEnabled,
+             "vibrateOnSteps": self.vibrateOnSteps,
+             "cameraPositionIOS": self.cameraPosition.rawValue,
+             "attemptsCount": self.attemptsCount,
+             "locationTrackingEnabled": self.isLocationTrackingEnabled,
+             "preventScreenRecording": self.isPreventScreenRecordingEnable,
+             "recordingProcess": self.recordingProcess.rawValue,
+             "livenessType": self.livenessType.rawValue,
+             "screenOrientation": self.screenOrientation.encode(),
+             "tag": self.tag,
+             "skipStep": self.stepSkippingMask.encode(),
+             "metadata": self.metadata,
+             "personId": self.personId,
+             "externalId": self.externalId,
+             "threshold": self.threshold,
+         ]
+     }
+ }
 
 public extension MatchFacesConfiguration {
     static func decode(_ it: Any?) -> Self? {

package/ios/Decoder.swift

@@ -144,73 +144,57 @@ func generateLivenessNotification(_ status: LivenessProcessStatus, _ result: Liv
     ]
 }
 
-public extension ErrorResponse {
-    static func decode(_ it: Any?) -> ErrorResponse? {
-        guard let it = it as? [String: Any] else { return nil }
-        let result = ErrorResponse.emptyInit() as ErrorResponse
-        result.setValue(it["code"] as Any?, forKey: "code")
-        result.setValue(it["message"] as Any?, forKey: "message")
-        return result
-    }
-    func encode() -> [String: Any?] {
-        return [
-            "code": self.code,
-            "message": self.message,
-        ]
-    }
-}
-
 public extension EnrollmentResponse {
     static func decode(_ it: Any?) -> EnrollmentResponse? {
         guard let it = it as? [String: Any] else { return nil }
         let result = EnrollmentResponse.emptyInit() as EnrollmentResponse
-        result.setValue(ErrorResponse.decode(it["error"]), forKey: "error")
-        result.setValue(it["personId"] as Any?, forKey: "personId")
-        result.setValue(it["externalId"] as Any?, forKey: "externalId")
-        return result
-    }
-    func encode() -> [String: Any?] {
-        return [
-            "error": self.error?.encode(),
-            "personId": self.personId,
-            "externalId": self.externalId,
-        ]
-    }
-}
-
-public extension VerifyMatchResponse {
-    static func decode(_ it: Any?) -> VerifyMatchResponse? {
-        guard let it = it as? [String: Any] else { return nil }
-        let result = VerifyMatchResponse.emptyInit() as VerifyMatchResponse
-        result.setValue(it["passed"] as Any?, forKey: "passed")
-        result.setValue(it["similarity"] as Any?, forKey: "similarity")
+        result.setValue(it["enrolled"] as Any?, forKey: "enrolled")
+        result.setValue(PersonDatabase.Person.decode(it["person"] as Any?), forKey: "person")
+        result.setValue((it["searchPersons"] as? [[String: Any]])?.compactMap { PersonDatabase.SearchPerson.decode2($0) }, forKey: "searchPersons")
         return result
     }
     func encode() -> [String: Any?] {
         return [
-            "passed": self.passed,
-            "similarity": self.similarity,
-        ]
-    }
-}
-
-public extension VerificationResponse {
-    static func decode(_ it: Any?) -> VerificationResponse? {
-        guard let it = it as? [String: Any] else { return nil }
-        let result = VerificationResponse.emptyInit() as VerificationResponse
-        result.setValue(VerifyMatchResponse.decode(it["match"]), forKey: "match")
-        result.setValue(ErrorResponse.decode(it["error"]), forKey: "error")
-        result.setValue(it["passed"] as Any?, forKey: "passed")
-        return result
-    }
-    func encode() -> [String: Any?] {
-        return [
-            "match": self.match?.encode(),
-            "error": self.error?.encode(),
-            "passed": self.passed,
-        ]
-    }
-}
+            "enrolled": self.enrolled,
+             "person": self.person?.encode(),
+             "searchPersons": self.searchPersons?.map { $0.encode2() },
+         ]
+     }
+ }
+
+ public extension VerificationMatchResponse {
+     static func decode(_ it: Any?) -> VerificationMatchResponse? {
+         guard let it = it as? [String: Any] else { return nil }
+         let result = VerificationMatchResponse.emptyInit() as VerificationMatchResponse
+         result.setValue(it["verified"] as Any?, forKey: "verified")
+         result.setValue(it["similarity"] as Any?, forKey: "similarity")
+         return result
+     }
+     func encode() -> [String: Any?] {
+         return [
+             "verified": self.verified,
+             "similarity": self.similarity == nil ? 0.0 : self.similarity,
+         ]
+     }
+ }
+
+ public extension VerificationResponse {
+     static func decode(_ it: Any?) -> VerificationResponse? {
+         guard let it = it as? [String: Any] else { return nil }
+         let result = VerificationResponse.emptyInit() as VerificationResponse
+         result.setValue(it["verified"] as Any?, forKey: "verified")
+         result.setValue(PersonDatabase.Person.decode(it["person"]), forKey: "person")
+         result.setValue(VerificationMatchResponse.decode(it["match"]), forKey: "match")
+         return result
+     }
+     func encode() -> [String: Any?] {
+         return [
+            "verified": self.verified,
+             "person": self.person?.encode(),
+             "match": self.match?.encode(),
+         ]
+     }
+ }
 
 // MARK: - MatchFacesRequest
 
@@ -770,8 +754,8 @@ public extension Date {
         df.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
         return df
     }
-    static func decode(_ it: Any?) -> Date {
-        let it = it as! String
+    static func decode(_ it: Any?) -> Date? {
+        guard let it = it as? String else { return nil }
         return formatter().date(from: it)!
     }
     func encode() -> String { return Date.formatter().string(from: self) }
@@ -788,8 +772,8 @@ public extension URL {
 }
 
 public extension PersonDatabase.Person {
-    static func decode(_ it: Any?) -> PersonDatabase.Person {
-        let it = it as! [String: Any]
+    static func decode(_ it: Any?) -> PersonDatabase.Person? {
+        guard let it = it as? [String: Any] else { return nil }
         let result = PersonDatabase.Person.emptyInit() as PersonDatabase.Person
         result.setValue(Date.decode(it["updatedAt"]), forKey: "updatedAt")
         result.setValue(Date.decode(it["createdAt"]), forKey: "createdAt")
@@ -797,9 +781,13 @@ public extension PersonDatabase.Person {
         result.setValue(it["groups"] as Any?, forKey: "groups")
         result.setValue(it["id"] as Any?, forKey: "itemId")
         result.setValue((it["metadata"] as Any?) ?? NSNull(), forKey: "mutableMetadata")
+        result.setValue(it["externalId"] as Any?, forKey: "externalId")
+        result.setValue(Date.decode(it["expireAt"]), forKey: "expireAt")
+        result.setValue(it["ttl"] as Any?, forKey: "ttl")
         return result
     }
-    func encode() -> [String: Any?] {
+    func encode() -> [String: Any?]? {
+        if (self.itemId == nil) { return nil }
         return [
             "updatedAt": self.updatedAt.encode(),
             "createdAt": self.createdAt.encode(),
@@ -807,6 +795,9 @@ public extension PersonDatabase.Person {
             "groups": self.groups,
             "id": self.itemId,
             "metadata": self.metadata,
+            "externalId": self.externalId,
+            "expireAt": self.expireAt?.encode(),
+            "ttl": self.ttl,
         ]
     }
     func update(_ it: [String: Any?]) -> Self {
@@ -985,6 +976,9 @@ public extension PersonDatabase.SearchPerson {
         result.setValue((it["metadata"] as Any?) ?? NSNull(), forKey: "mutableMetadata")
         result.setValue((it["images"] as? [Any])?.map { PersonDatabase.SearchPersonImage.decode2($0) }, forKey: "images")
         result.setValue(PersonDatabase.SearchPersonDetection.decode(it["detection"]), forKey: "detection")
+        result.setValue(it["externalId"] as Any?, forKey: "externalId")
+        result.setValue(Date.decode(it["expireAt"]), forKey: "expireAt")
+        result.setValue(it["ttl"] as Any?, forKey: "ttl")
         return result
     }
     func encode2() -> [String: Any?] {
@@ -997,6 +991,33 @@ public extension PersonDatabase.SearchPerson {
             "groups": self.groups,
             "id": self.itemId,
             "metadata": self.metadata,
+            "externalId": self.externalId,
+            "expireAt": self.expireAt?.encode(),
+            "ttl": self.ttl,
+        ]
+    }
+}
+
+public extension SearchPersonFilter {
+    static func decode(_ it: Any?) -> Self {
+        let it = it as! [String: Any]
+        let result = Self()
+        result.groups = it["groups"] as! [String]
+        result.threshold = CGFloat(it["threshold"] as! Float)
+        result.limit = it["limit"] as! Int
+        result.setValue(it["fieldName"] as Any?, forKey: "fieldName")
+        result.setValue(it["fieldValues"] as Any?, forKey: "fieldValues")
+        result.setValue(it["exclude"] as Any?, forKey: "exclude")
+        return result
+    }
+    func encode() -> [String: Any?] {
+        return [
+            "groups": self.groups,
+            "threshold": self.threshold,
+            "limit": self.limit,
+            "fieldName": self.fieldName,
+            "fieldValues": self.fieldValues,
+            "exclude": self.exclude,
         ]
     }
 }

package/ios/Utils.swift

@@ -1,3 +1,6 @@
+import Foundation
+import UIKit
+
 public typealias Callback = (Any?) -> Void
 
 var args: [Any?] = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "8.4.1336-rc",
+  "version": "8.4.1343-nightly",
   "description": "This is an npm module for Regula Face SDK. It allows you to easily compaire faces using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/face-sdk" version="8.4.1336-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="8.4.1343-nightly" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -18,7 +18,7 @@
       <preference name="SwiftVersion" value="5" />
     </config-file>
     <source-file src="ios/CDVFaceSDK.swift" />
-    <source-file src="ios/Main.swift" />
+    <source-file src="ios/Implementation.swift" />
     <source-file src="ios/Decoder.swift" />
     <source-file src="ios/Config.swift" />
     <source-file src="ios/Utils.swift" />
@@ -27,7 +27,7 @@
         <source url="https://github.com/regulaforensics/podspecs.git" />
       </config>
       <pods>
-        <pod name="FaceSDKStage" spec="9.8.4815" />
+        <pod name="FaceSDKNightly" spec="9.9.4841" />
       </pods>
     </podspec>
   </platform>
@@ -39,10 +39,10 @@
       </feature>
     </config-file>
     <framework src="android/cordova.gradle" custom="true" type="gradleReference" />
-    <source-file src="android/CDVFaceSDK.kt" target-dir="java/com.regula.plugin.facesdk" />
-    <source-file src="android/src/main/java/com/regula/plugin/facesdk/Main.kt" target-dir="java/com.regula.plugin.facesdk" />
-    <source-file src="android/src/main/java/com/regula/plugin/facesdk/JSONConstructor.kt" target-dir="java/com.regula.plugin.facesdk" />
-    <source-file src="android/src/main/java/com/regula/plugin/facesdk/Config.kt" target-dir="java/com.regula.plugin.facesdk" />
-    <source-file src="android/src/main/java/com/regula/plugin/facesdk/Utils.kt" target-dir="java/com.regula.plugin.facesdk" />
+    <source-file src="android/CDVFaceSDK.kt" target-dir="kotlin/com.regula.plugin.facesdk" />
+    <source-file src="android/src/main/kotlin/com/regula/plugin/facesdk/Implementation.kt" target-dir="kotlin/com.regula.plugin.facesdk" />
+    <source-file src="android/src/main/kotlin/com/regula/plugin/facesdk/JSONConstructor.kt" target-dir="kotlin/com.regula.plugin.facesdk" />
+    <source-file src="android/src/main/kotlin/com/regula/plugin/facesdk/Config.kt" target-dir="kotlin/com.regula.plugin.facesdk" />
+    <source-file src="android/src/main/kotlin/com/regula/plugin/facesdk/Utils.kt" target-dir="kotlin/com.regula.plugin.facesdk" />
   </platform>
 </plugin>