@regulaforensics/face-sdk 8.4.1402-beta → 8.4.1404-beta

package/examples/react_native/package.json

@@ -5,10 +5,10 @@
     "setup": "scripts/setup.sh",
     "ios": "scripts/ios.sh",
     "android": "scripts/android.sh",
-    "start": "expo start --port 8082"
+    "start": "expo start --port \"$npm_package_config_metroPort\""
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "8.4.1402-beta",
+    "@regulaforensics/face-sdk": "8.4.1404-beta",
     "@regulaforensics/face-core-basic": "8.4.854-beta",
     "react-native": "0.88.0-rc.0",
     "react-native-fs": "^2.20.0",
@@ -28,5 +28,8 @@
     "expo-custom-assets": {
       "expo": "$expo"
     }
+  },
+  "config": {
+    "metroPort": 8082
   }
 }

package/examples/react_native/scripts/android.sh

@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
-adb reverse tcp:8082 tcp:8082 >/dev/null || :
+adb reverse tcp:${npm_package_config_metroPort} tcp:${npm_package_config_metroPort} >/dev/null || :
 if [[ " $* " == *" --open "* ]] || [[ " $* " == *" -o "* ]]; then
     open -a 'Android Studio' android
-    # Check Metro for this product on port 8082.
-    if [[ "$(curl --silent --max-time 2 http://localhost:8082/status)" != "packager-status:running" ]]; then
+    # Check if Metro is running at app's port.
+    if [[ "$(curl --silent --max-time 2 http://localhost:${npm_package_config_metroPort}/status)" != "packager-status:running" ]]; then
         npm start
+    else
+        echo "Metro is already running on port ${npm_package_config_metroPort}."
     fi
 else
-    expo run:android --device --port 8082
+    expo run:android --device --port ${npm_package_config_metroPort}
 fi

package/examples/react_native/scripts/ios.sh

@@ -3,10 +3,12 @@ set -e
 
 if [[ " $* " == *" --open "* ]] || [[ " $* " == *" -o "* ]]; then
     open ios/Face.xcworkspace
-    # Check Metro for this product on port 8082.
-    if [[ "$(curl --silent --max-time 2 http://localhost:8082/status)" != "packager-status:running" ]]; then
+    # Check if Metro is running at app's port.
+    if [[ "$(curl --silent --max-time 2 http://localhost:${npm_package_config_metroPort}/status)" != "packager-status:running" ]]; then
         npm start
+    else
+        echo "Metro is already running on port ${npm_package_config_metroPort}."
     fi
 else
-    npx expo run:ios --device --port 8082
+    npx expo run:ios --device --port ${npm_package_config_metroPort}
 fi

package/examples/react_native/scripts/setup.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
+# Kill Metro instance at app's port.
+lsof -tiTCP:${npm_package_config_metroPort} -sTCP:LISTEN | xargs kill 2>/dev/null || true
+
 npm install
 rm -rf node_modules/expo/node_modules/expo-modules-core/android/.cxx # Temp fix for expo@58.0.0-preview.3
 npx expo prebuild --no-install
 (cd ios && (pod install || pod update))
 
-# add aaptOptions for offline match
+# Add aaptOptions for offline match
 if ! grep -q faceSdkResource android/app/build.gradle && grep -q face-core-match package.json; then
   sed -i '' "s/androidResources/aaptOptions {\n\t\tnoCompress 'Regula\/faceSdkResource.dat'\n\t}\n\tandroidResources/" android/app/build.gradle
 fi

package/ios/Config.swift

@@ -152,7 +152,7 @@ public extension LivenessConfiguration {
              "skipStep": self.stepSkippingMask.encode(),
              "metadata": self.metadata,
              "person": self.person.encode(),
-             "searchFilter": self.searchFilter.encode(),
+             "searchFilter": self.searchFilter?.encode(),
          ]
      }
  }
@@ -178,7 +178,6 @@ public extension LivenessConfiguration {
                  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
                  }
@@ -203,7 +202,6 @@ public extension LivenessConfiguration {
              "skipStep": self.stepSkippingMask.encode(),
              "metadata": self.metadata,
              "personId": self.personId,
-             "externalId": self.externalId,
              "threshold": self.threshold,
          ]
      }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "8.4.1402-beta",
+  "version": "8.4.1404-beta",
   "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.1402-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="8.4.1404-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>

package/react-native-face-sdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'react-native-face-sdk'
-  s.version      = '8.4.1402-beta'
+  s.version      = '8.4.1404-beta'
   s.summary      = 'Regula React Native plugin.'
   s.license      = 'commercial'
   s.authors      = { 'RegulaForensics' => 'support@regulaforensics.com' }

package/test/json.tsx

@@ -249,26 +249,6 @@ export var verificationConfig = {
   "personId": "test0",
   "threshold": 0.5,
 };
-export var verificationConfig2 = {
-  "copyright": true,
-  "cameraSwitchEnabled": false,
-  "closeButtonEnabled": true,
-  "torchButtonEnabled": false,
-  "vibrateOnSteps": true,
-  "cameraPositionAndroid": -1,
-  "cameraPositionIOS": 1,
-  "screenOrientation": [0, 1],
-  "locationTrackingEnabled": true,
-  "preventScreenRecording": false,
-  "attemptsCount": 2,
-  "recordingProcess": 0,
-  "livenessType": 1,
-  "tag": "test",
-  "skipStep": [0, 1],
-  "metadata": customJson,
-  "externalId": "test1",
-  "threshold": 0.5,
-};
 export var livenessBackendException = {
   "code": 200,
   "message": "No license",

package/test/package-lock.json

@@ -13,7 +13,7 @@
     },
     "..": {
       "name": "@regulaforensics/face-sdk",
-      "version": "8.4.1402-beta",
+      "version": "8.4.1404-beta",
       "dev": true,
       "license": "commercial",
       "dependencies": {

package/test/test.tsx

@@ -108,7 +108,6 @@ import {
     size,
     enrollmentConfig,
     verificationConfig,
-    verificationConfig2,
     enrollmentResponse,
     verificationMatchResponse,
     verificationResponse,
@@ -148,7 +147,6 @@ compare('faceCaptureResponse', faceCaptureResponse, FaceCaptureResponse.fromJson
 compare('livenessConfig', livenessConfig, LivenessConfig.fromJson);
 compare('enrollmentConfig', enrollmentConfig, EnrollmentConfig.fromJson);
 compare('verificationConfig', verificationConfig, VerificationConfig.fromJson);
-compare('verificationConfig2', verificationConfig2, VerificationConfig.fromJson);
 compare('livenessBackendException', livenessBackendException, LivenessBackendException.fromJson);
 compare('livenessException', livenessException, LivenessException.fromJson);
 compare('livenessResponse', livenessResponse, LivenessResponse.fromJson);

package/www/capacitor/liveness/verification_config.js

@@ -20,10 +20,10 @@ export class VerificationConfig {
     skipStep
     metadata
     personId
-    externalId
     threshold
 
-    constructor(options) {
+    constructor(personId, options) {
+        this.personId = personId
         this.copyright = options?.copyright ?? true
         this.cameraSwitchEnabled = options?.cameraSwitchEnabled ?? false
         this.closeButtonEnabled = options?.closeButtonEnabled ?? true
@@ -41,22 +41,9 @@ export class VerificationConfig {
         this.skipStep = options?.skipStep ?? []
         this.metadata = options?.metadata
         this.personId = options?.personId
-        this.externalId = options?.externalId
         this.threshold = options?.threshold
     }
 
-    static withPersonId(personId, options) {
-        const result = new VerificationConfig(options)
-        result.personId = personId
-        return result
-    }
-
-    static withExternalId(externalId, options) {
-        const result = new VerificationConfig(options)
-        result.externalId = externalId
-        return result
-    }
-
     static fromJson(jsonObject) {
         if (jsonObject == null) return null
         const result = new VerificationConfig()
@@ -78,7 +65,6 @@ export class VerificationConfig {
         result.skipStep = jsonObject["skipStep"]
         result.metadata = jsonObject["metadata"]
         result.personId = jsonObject["personId"]
-        result.externalId = jsonObject["externalId"]
         result.threshold = jsonObject["threshold"]
 
         return result
@@ -103,7 +89,6 @@ export class VerificationConfig {
             "skipStep": this.skipStep,
             "metadata": this.metadata,
             "personId": this.personId,
-            "externalId": this.externalId,
             "threshold": this.threshold,
         }
     }

package/www/cordova.js

@@ -3566,10 +3566,10 @@ class VerificationConfig {
     skipStep
     metadata
     personId
-    externalId
     threshold
 
-    constructor(options) {
+    constructor(personId, options) {
+        this.personId = personId
         this.copyright = options?.copyright ?? true
         this.cameraSwitchEnabled = options?.cameraSwitchEnabled ?? false
         this.closeButtonEnabled = options?.closeButtonEnabled ?? true
@@ -3587,22 +3587,9 @@ class VerificationConfig {
         this.skipStep = options?.skipStep ?? []
         this.metadata = options?.metadata
         this.personId = options?.personId
-        this.externalId = options?.externalId
         this.threshold = options?.threshold
     }
 
-    static withPersonId(personId, options) {
-        const result = new VerificationConfig(options)
-        result.personId = personId
-        return result
-    }
-
-    static withExternalId(externalId, options) {
-        const result = new VerificationConfig(options)
-        result.externalId = externalId
-        return result
-    }
-
     static fromJson(jsonObject) {
         if (jsonObject == null) return null
         const result = new VerificationConfig()
@@ -3624,7 +3611,6 @@ class VerificationConfig {
         result.skipStep = jsonObject["skipStep"]
         result.metadata = jsonObject["metadata"]
         result.personId = jsonObject["personId"]
-        result.externalId = jsonObject["externalId"]
         result.threshold = jsonObject["threshold"]
 
         return result
@@ -3649,7 +3635,6 @@ class VerificationConfig {
             "skipStep": this.skipStep,
             "metadata": this.metadata,
             "personId": this.personId,
-            "externalId": this.externalId,
             "threshold": this.threshold,
         }
     }

package/www/react-native/liveness/verification_config.js

@@ -20,10 +20,10 @@ export class VerificationConfig {
     skipStep
     metadata
     personId
-    externalId
     threshold
 
-    constructor(options) {
+    constructor(personId, options) {
+        this.personId = personId
         this.copyright = options?.copyright ?? true
         this.cameraSwitchEnabled = options?.cameraSwitchEnabled ?? false
         this.closeButtonEnabled = options?.closeButtonEnabled ?? true
@@ -41,22 +41,9 @@ export class VerificationConfig {
         this.skipStep = options?.skipStep ?? []
         this.metadata = options?.metadata
         this.personId = options?.personId
-        this.externalId = options?.externalId
         this.threshold = options?.threshold
     }
 
-    static withPersonId(personId, options) {
-        const result = new VerificationConfig(options)
-        result.personId = personId
-        return result
-    }
-
-    static withExternalId(externalId, options) {
-        const result = new VerificationConfig(options)
-        result.externalId = externalId
-        return result
-    }
-
     static fromJson(jsonObject) {
         if (jsonObject == null) return null
         const result = new VerificationConfig()
@@ -78,7 +65,6 @@ export class VerificationConfig {
         result.skipStep = jsonObject["skipStep"]
         result.metadata = jsonObject["metadata"]
         result.personId = jsonObject["personId"]
-        result.externalId = jsonObject["externalId"]
         result.threshold = jsonObject["threshold"]
 
         return result
@@ -103,7 +89,6 @@ export class VerificationConfig {
             "skipStep": this.skipStep,
             "metadata": this.metadata,
             "personId": this.personId,
-            "externalId": this.externalId,
             "threshold": this.threshold,
         }
     }

package/www/types/liveness/verification_config.d.ts

@@ -89,9 +89,7 @@ export class VerificationConfig {
 
     threshold?: number
 
-    private constructor();
-
-    static withPersonId(
+    constructor(
         personId: string,
         options?: {
             copyright?: boolean
@@ -112,28 +110,5 @@ export class VerificationConfig {
             metadata?: Record<string, any>
             threshold?: number
         }
-    ): VerificationConfig;
-
-    static withExternalId(
-        externalId: string,
-        options?: {
-            copyright?: boolean
-            cameraSwitchEnabled?: boolean
-            closeButtonEnabled?: boolean
-            torchButtonEnabled?: boolean
-            vibrateOnSteps?: boolean
-            cameraPositionAndroid?: number
-            cameraPositionIOS?: CameraPosition
-            screenOrientation?: Array<ScreenOrientation>
-            locationTrackingEnabled?: boolean
-            preventScreenRecording?: boolean
-            attemptsCount?: number
-            recordingProcess?: RecordingProcess
-            livenessType?: LivenessType
-            tag?: string
-            skipStep?: Array<LivenessSkipStep>
-            metadata?: Record<string, any>
-            threshold?: number
-        }
-    ): VerificationConfig;
+    )
 }