assentify-sdk-react-native 1.0.0-Beta.40 → 1.0.0-Beta.41

package/Package.swift

@@ -66,7 +66,7 @@ let package = Package(
         .package(name: "React-GeneratedCode", path: "../../../../generated/ios"),
         .package(
             url: "https://github.com/AssentifyLTD/Assentify.SDK.iOS.SPM.git",
-            exact: "1.0.0-Beta.37"
+            exact: "1.0.0-Beta.38"
         ),
     ],
     targets: [

package/README.md

@@ -65,6 +65,10 @@ Xcode project automatically (using React Native's built-in `spm_dependency`/auto
 
 ## Versions
 
+***1.0.0-Beta.41***
+1. *ID Liveness Improvements *
+2. *Passport Liveness Improvements *
+
 ***1.0.0-Beta.40***
 1. *Flow Improvements*
 

package/android/build.gradle

@@ -96,7 +96,7 @@ dependencies {
   compileOnly("com.facebook.react:react-android")
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation 'com.github.AssentifyLTD:Assentify.SDK.Android:1.0.0-Beta.70'
+  implementation 'com.github.AssentifyLTD:Assentify.SDK.Android:1.0.0-Beta.71'
 
   implementation 'com.google.code.gson:gson:2.13.2'
   implementation 'androidx.navigation:navigation-fragment-ktx:2.9.7'

package/android/src/main/java/com/assentifysdk/ScanIDActivity.kt

@@ -32,6 +32,7 @@ import ImageToBase64Converter
 import android.content.Intent
 import android.content.res.ColorStateList
 import com.assentify.sdk.Core.Constants.BrightnessEvents
+import com.assentify.sdk.Core.Constants.IdLivenessInstruction
 import com.assentify.sdk.RemoteClient.Models.SubmitRequestModel
 import com.assentify.sdk.ScanIDCard.ScanIDCardManual
 import com.assentify.sdk.ScanIDCard.ScanIDCardResult
@@ -40,7 +41,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.squareup.picasso.Picasso
 import com.assentify.sdk.RemoteClient.Models.TemplatesByCountry
 import androidx.constraintlayout.widget.ConstraintLayout
-
+import android.graphics.Bitmap
 class ScanIDActivity: AppCompatActivity(),
   IDCardCallback {
 
@@ -299,9 +300,12 @@ class ScanIDActivity: AppCompatActivity(),
     triggerEvent("onClipPreparationComplete", dataModel)
   }
 
-  override fun onLivenessUpdate(dataModel: BaseResponseDataModel) {
+  override fun onLivenessUpdate(dataModel: BaseResponseDataModel, image: Bitmap?) {
     triggerEvent("onLivenessUpdate", dataModel)
     runOnUiThread {
+      if(!isManual){
+        scanID.retryLiveness();
+      }
       start = false;
       showPopUpMessage(
         R.drawable.id_warning,
@@ -390,7 +394,63 @@ class ScanIDActivity: AppCompatActivity(),
     }
   }
 
+  // the liveness owns the message while it runs (not after "keep holding" / "barcode read": the result is coming)
+  private var livenessActive = false
+
+  override fun onLivenessInstruction(instruction: IdLivenessInstruction?, progress: Int) {
+    if (instruction == null) return
+    runOnUiThread {
+      livenessActive = instruction != IdLivenessInstruction.KEEP_HOLDING
+        && instruction != IdLivenessInstruction.BARCODE_READ
+
+      var text = when (instruction) {
+        // ---------- position ----------
+        IdLivenessInstruction.PLACE_CARD -> "Place the card\nin the frame"
+        // ---------- flat hold ----------
+        IdLivenessInstruction.KEEP_STEADY -> "Keep it steady"
+        IdLivenessInstruction.KEEP_FLAT -> "Hold the card flat"
+        IdLivenessInstruction.ADJUST_POSITION -> "Tilt slightly\nto avoid glare"
+        // ---------- light ----------
+        IdLivenessInstruction.DO_NOT_MOVE -> "Keep it steady\nLight is on"
+        // ---------- tilt ----------
+        IdLivenessInstruction.LIFT_RIGHT -> "Lift the right edge\ntoward you"
+        IdLivenessInstruction.LIFT_TOP -> "Lift the top edge\ntoward you"
+        IdLivenessInstruction.LIFT_BOTTOM -> "Lift the bottom edge\ntoward you"
+        IdLivenessInstruction.A_BIT_MORE -> "A bit more\nand hold"
+        IdLivenessInstruction.HOLD_THERE -> "Hold it there"
+        IdLivenessInstruction.OTHER_EDGE -> "Lift the other edge"
+        IdLivenessInstruction.PICK_UP -> "Hold the card\nin your hand"
+        // ---------- done ----------
+        IdLivenessInstruction.KEEP_HOLDING -> "Keep holding\nAlmost done"
+        // ---------- ID back: the barcode ----------
+        IdLivenessInstruction.READING_BARCODE -> "Reading the barcode\nKeep it steady"
+        IdLivenessInstruction.BARCODE_READ -> "Barcode read"
+        // ---------- pauses (the SDK continues by itself after a few seconds) ----------
+        IdLivenessInstruction.HOLD_IN_HAND -> "Hold it in your hand\nnot on the table"
+        IdLivenessInstruction.PHONE_TURNED -> "Keep the phone still\nTilt the card"
+        IdLivenessInstruction.TOO_BRIGHT -> "Too much light\nMove to the shade"
+      }
+
+      // the tilt progress (0..100), on its own line, only while the card is being tilted
+      when (instruction) {
+        IdLivenessInstruction.LIFT_RIGHT,
+        IdLivenessInstruction.LIFT_TOP,
+        IdLivenessInstruction.LIFT_BOTTOM,
+        IdLivenessInstruction.A_BIT_MORE,
+        IdLivenessInstruction.HOLD_THERE,
+        IdLivenessInstruction.OTHER_EDGE,
+        IdLivenessInstruction.PICK_UP -> text += "\n$progress%"
+        else -> {}
+      }
+
+      infoLayout.visibility = View.VISIBLE
+      infoText.text = text
+      infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.zoom_in))
+
+    }
+  }
   override fun onEnvironmentalConditionsChange(brightnessEvents:BrightnessEvents, motion: MotionType,zoom: ZoomType,isCentered: Boolean){
+    if (livenessActive) return
     runOnUiThread {
       if(start == false){
         infoLayout.visibility = View.VISIBLE

package/android/src/main/java/com/assentifysdk/ScanPassportActivity.kt

@@ -38,6 +38,8 @@ import java.text.SimpleDateFormat
 import com.assentify.sdk.Core.Constants.BrightnessEvents
 import com.assentify.sdk.ScanPassport.ScanPassportManual
 import com.assentify.sdk.ScanPassport.ScanPassportResult
+import com.assentify.sdk.Core.Constants.PassportLivenessInstruction
+import android.graphics.Bitmap
 
 class ScanPassportActivity : AppCompatActivity(),
   ScanPassportCallback {
@@ -268,9 +270,12 @@ class ScanPassportActivity : AppCompatActivity(),
     }
   }
 
-  override fun onLivenessUpdate(dataModel: BaseResponseDataModel) {
+  override fun onLivenessUpdate(dataModel: BaseResponseDataModel, image: Bitmap?) {
     triggerEvent("onLivenessUpdate", dataModel)
     runOnUiThread {
+      if(!isManual){
+        scanPassport.retryLiveness();
+      }
       start = false;
       showPopUpMessage(R.drawable.warning,"Please use your original physical ID card, not a photo or copy.","Let's try again",false)
     }
@@ -345,9 +350,56 @@ class ScanPassportActivity : AppCompatActivity(),
 
 
 
+  }
+
+  // the liveness owns the message while it runs (not after "keep holding": the result is coming)
+  private var livenessActive = false
+
+  override fun onLivenessInstruction(instruction: PassportLivenessInstruction?, progress: Int) {
+    if (instruction == null) return
+    runOnUiThread {
+      livenessActive = instruction != PassportLivenessInstruction.KEEP_HOLDING
+
+      var text = when (instruction) {
+        // ---------- position / flat hold / light ----------
+        PassportLivenessInstruction.PLACE_DOCUMENT -> "Place the photo page\nin the frame"
+        PassportLivenessInstruction.KEEP_STEADY,
+        PassportLivenessInstruction.KEEP_FLAT,
+        PassportLivenessInstruction.ADJUST_POSITION,
+        PassportLivenessInstruction.DO_NOT_MOVE -> "Keep it steady"
+        // ---------- tilt ----------
+        PassportLivenessInstruction.LIFT_BOTTOM -> "Lift the bottom edge\ntoward you"
+        PassportLivenessInstruction.MOVE_A_LITTLE_MORE -> "A bit more\nand hold"
+        PassportLivenessInstruction.HOLD_THERE -> "Hold it there"
+        PassportLivenessInstruction.OTHER_SIDE -> "Lift the bottom edge,\nnot the top"
+        PassportLivenessInstruction.HOLD_IT_UP -> "Hold the passport\nin your hand"
+        PassportLivenessInstruction.PLACE_FLAT_AGAIN -> "Place it flat again"
+        // ---------- done ----------
+        PassportLivenessInstruction.KEEP_HOLDING -> "Keep holding\nAlmost done"
+        // ---------- pauses (the SDK continues by itself after a few seconds) ----------
+        PassportLivenessInstruction.HOLD_IN_HAND -> "Hold it in your hand\nnot on the table"
+        PassportLivenessInstruction.PHONE_TURNED -> "Keep the phone still\nTilt the passport"
+        PassportLivenessInstruction.TOO_BRIGHT -> "Too much light\nMove to the shade"
+      }
+
+      // the tilt progress (0..100), on its own line, only while the passport is being tilted
+      when (instruction) {
+        PassportLivenessInstruction.LIFT_BOTTOM,
+        PassportLivenessInstruction.MOVE_A_LITTLE_MORE,
+        PassportLivenessInstruction.HOLD_THERE,
+        PassportLivenessInstruction.OTHER_SIDE,
+        PassportLivenessInstruction.HOLD_IT_UP -> text += "\n$progress%"
+        else -> {}
+      }
+
+      infoLayout.visibility = View.VISIBLE
+      infoText.text = text
+      infoIcon.setImageDrawable(getResources().getDrawable(R.drawable.zoom_in))
+    }
   }
 
   override fun onEnvironmentalConditionsChange(brightnessEvents:BrightnessEvents, motion: MotionType,zoom: ZoomType,  isCentered: Boolean,){
+    if (livenessActive) return
     runOnUiThread {
       if(start == false){
         infoLayout.visibility = View.VISIBLE

package/ios/View/IDCardController.swift

@@ -170,11 +170,14 @@ public class IDCardController: UIViewController ,ScanIDCardDelegate , ChildViewC
             }
         }
 
-        public func onLivenessUpdate(dataModel: RemoteProcessingModel) {
+        public func onLivenessUpdate(dataModel: RemoteProcessingModel, image: UIImage?) {
             triggerEvent(eventName:"onLivenessUpdate",dataModel:dataModel)
             DispatchQueue.main.async {
+              self.scanID?.retryLiveness();
                 self.start = false;
+              if( self.popUpMessage != nil){
                 self.popUpMessage!.removeFromSuperview();
+              }
                 self.popUpMessage =  showPopUpMessage(view: self.view, title: "Please use your original physical ID card, not a photo or copy.", subTitle: "Please real ID (Not copy)",initialTextColorHex:self.processingColor,initialBackgroundColorHex:self.holdHandColor, iconName: "id_warning", isGif: false,target: self, action: #selector(self.dismissPopUpMessage))
             }
         }
@@ -324,6 +327,59 @@ public class IDCardController: UIViewController ,ScanIDCardDelegate , ChildViewC
     public func onUploadFailed(dataModel: RemoteProcessingModel) {
         triggerEvent(eventName:"onUploadFailed",dataModel:dataModel)
     }
+  
+
+  private var livenessActive = false
+
+  
+  
+  public func onLivenessInstruction(instruction: IdLivenessInstruction, progress: Int) {
+      DispatchQueue.main.async {
+          // the liveness owns the message while it runs (not after "keep holding" / "barcode read": the result is coming)
+          self.livenessActive = instruction != .keepHolding && instruction != .barcodeRead
+
+          var text: String
+          switch instruction {
+          // ---------- position ----------
+          case .placeCard:       text = "Place the card\nin the frame"
+          // ---------- flat hold ----------
+          case .keepSteady:      text = "Keep it steady"
+          case .keepFlat:        text = "Hold the card flat"
+          case .adjustPosition:  text = "Tilt slightly\nto avoid glare"
+          // ---------- light ----------
+          case .doNotMove:       text = "Keep it steady\nLight is on"
+          // ---------- tilt ----------
+          case .liftRight:       text = "Lift the right edge\ntoward you"
+          case .liftTop:         text = "Lift the top edge\ntoward you"
+          case .liftBottom:      text = "Lift the bottom edge\ntoward you"
+          case .aBitMore:        text = "A bit more\nand hold"
+          case .holdThere:       text = "Hold it there"
+          case .otherEdge:       text = "Lift the other edge"
+          case .pickUp:          text = "Hold the card\nin your hand"
+          // ---------- done ----------
+          case .keepHolding:     text = "Keep holding\nAlmost done"
+          // ---------- ID back: the barcode ----------
+          case .readingBarcode:  text = "Reading the barcode\nKeep it steady"
+          case .barcodeRead:     text = "Barcode read"
+          // ---------- pauses (the SDK continues by itself after a few seconds) ----------
+          case .holdInHand:      text = "Hold it in your hand\nnot on the table"
+          case .phoneTurned:     text = "Keep the phone still\nTilt the card"
+          case .tooBright:       text = "Too much light\nMove to the shade"
+          @unknown default:      text = ""
+          }
+
+          // the tilt progress (0..100), on its own line, only while the card is being tilted
+          switch instruction {
+          case .liftRight, .liftTop, .liftBottom, .aBitMore, .holdThere, .otherEdge, .pickUp:
+              text += "\n\(progress)%"
+          default:
+              break
+          }
+
+          self.infoLabel?.text = text
+          self.infoImage?.image = UIImage(named: "info_icon", in: Bundle.module, compatibleWith: nil)
+      }
+  }
 
   public func onEnvironmentalConditionsChange( brightnessEvents: BrightnessEvents,
                                            motion: MotionType,

package/ios/View/PassportController.swift

@@ -171,11 +171,14 @@ public class PassportController: UIViewController ,ScanPassportDelegate , ChildV
            }
        }
 
-       public func onLivenessUpdate(dataModel: RemoteProcessingModel) {
+       public func onLivenessUpdate(dataModel: RemoteProcessingModel, image: UIImage?) {
            triggerEvent(eventName:"onLivenessUpdate",dataModel:dataModel)
            DispatchQueue.main.async {
+             self.scanPassport?.retryLiveness();
                self.start = false;
+             if( self.popUpMessage != nil){
                self.popUpMessage!.removeFromSuperview();
+             }
                self.popUpMessage =  showPopUpMessage(view: self.view, title: "Please use your original physical ID card, not a photo or copy.", subTitle: "Please real ID (Not copy)",initialTextColorHex:self.processingColor,initialBackgroundColorHex:self.holdHandColor, iconName: "warning", isGif: false,target: self, action: #selector(self.dismissPopUpMessage))
            }
        }
@@ -271,6 +274,51 @@ public class PassportController: UIViewController ,ScanPassportDelegate , ChildV
     public func onUploadFailed(dataModel: RemoteProcessingModel) {
         triggerEvent(eventName:"onUploadFailed",dataModel:dataModel)
     }
+  
+  
+  /// The liveness owns the message while it runs (not after "keep holding": the result is coming).
+  private var livenessActive = false
+
+  /// The liveness owns the message while it runs (not after "keep holding": the result is coming).
+
+  public func onLivenessInstruction(instruction: PassportLivenessInstruction, progress: Int) {
+      DispatchQueue.main.async {
+          self.livenessActive = instruction != .keepHolding
+
+          var text: String
+          switch instruction {
+          // ---------- position / flat hold / light ----------
+          case .placeDocument:   text = "Place the photo page\nin the frame"
+          case .keepSteady, .keepFlat, .adjustPosition, .doNotMove:
+                                 text = "Keep it steady"
+          // ---------- tilt ----------
+          case .liftBottom:      text = "Lift the bottom edge\ntoward you"
+          case .moveALittleMore: text = "A bit more\nand hold"
+          case .holdThere:       text = "Hold it there"
+          case .otherSide:       text = "Lift the bottom edge,\nnot the top"
+          case .holdItUp:        text = "Hold the passport\nin your hand"
+          case .placeFlatAgain:  text = "Place it flat again"
+          // ---------- done ----------
+          case .keepHolding:     text = "Keep holding\nAlmost done"
+          // ---------- pauses (the SDK continues by itself after a few seconds) ----------
+          case .holdInHand:      text = "Hold it in your hand\nnot on the table"
+          case .phoneTurned:     text = "Keep the phone still\nTilt the passport"
+          case .tooBright:       text = "Too much light\nMove to the shade"
+          @unknown default:      text = ""
+          }
+
+          // the tilt progress (0..100), on its own line, only while the passport is being tilted
+          switch instruction {
+          case .liftBottom, .moveALittleMore, .holdThere, .otherSide, .holdItUp:
+              text += "\n\(progress)%"
+          default:
+              break
+          }
+
+          self.infoLabel?.text = text
+          self.infoImage?.image = UIImage(named: "info_icon", in: Bundle.module, compatibleWith: nil)
+      }
+  }
 
   public func onEnvironmentalConditionsChange(  brightnessEvents: BrightnessEvents,
                                             motion: MotionType,

package/lib/typescript/example/babel.config.d.ts

@@ -81,8 +81,36 @@ declare const pak: {
     workspaces: string[];
     packageManager: string;
     jest: {
-        preset: string;
+        testEnvironment: string;
+        roots: string[];
+        testMatch: string[];
+        transform: {
+            "^.+\\.[jt]sx?$": (string | {
+                configFile: boolean;
+                babelrc: boolean;
+                presets: (string | (string | {
+                    targets: {
+                        node: string;
+                    };
+                })[] | (string | {
+                    runtime: string;
+                })[])[];
+            })[];
+        };
+        moduleNameMapper: {
+            "^react-native$": string;
+        };
         modulePathIgnorePatterns: string[];
+        collectCoverageFrom: string[];
+        coverageReporters: string[];
+        coverageThreshold: {
+            global: {
+                lines: number;
+                statements: number;
+                functions: number;
+                branches: number;
+            };
+        };
     };
     "release-it": {
         git: {

package/lib/typescript/example/babel.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babel.config.d.ts","sourceRoot":"","sources":["../../../example/babel.config.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAwC"}
+{"version":3,"file":"babel.config.d.ts","sourceRoot":"","sources":["../../../example/babel.config.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAwC"}

package/lib/typescript/example/react-native.config.d.ts

@@ -81,8 +81,36 @@ declare const pak: {
     workspaces: string[];
     packageManager: string;
     jest: {
-        preset: string;
+        testEnvironment: string;
+        roots: string[];
+        testMatch: string[];
+        transform: {
+            "^.+\\.[jt]sx?$": (string | {
+                configFile: boolean;
+                babelrc: boolean;
+                presets: (string | (string | {
+                    targets: {
+                        node: string;
+                    };
+                })[] | (string | {
+                    runtime: string;
+                })[])[];
+            })[];
+        };
+        moduleNameMapper: {
+            "^react-native$": string;
+        };
         modulePathIgnorePatterns: string[];
+        collectCoverageFrom: string[];
+        coverageReporters: string[];
+        coverageThreshold: {
+            global: {
+                lines: number;
+                statements: number;
+                functions: number;
+                branches: number;
+            };
+        };
     };
     "release-it": {
         git: {

package/lib/typescript/example/react-native.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react-native.config.d.ts","sourceRoot":"","sources":["../../../example/react-native.config.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKI,CAAC,GAAG,CAAC,IAAI,CAAC;;MAET"}
+{"version":3,"file":"react-native.config.d.ts","sourceRoot":"","sources":["../../../example/react-native.config.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKI,CAAC,GAAG,CAAC,IAAI,CAAC;;MAET"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assentify-sdk-react-native",
-  "version": "1.0.0-Beta.40",
+  "version": "1.0.0-Beta.41",
   "description": "This package provides integration with Assentify's services, allowing developers to incorporate Assentify functionalities seamlessly into their applications.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -104,11 +104,63 @@
   ],
   "packageManager": "yarn@3.6.1",
   "jest": {
-    "preset": "react-native",
+    "testEnvironment": "node",
+    "roots": [
+      "<rootDir>/src"
+    ],
+    "testMatch": [
+      "**/__tests__/**/*.test.ts?(x)"
+    ],
+    "transform": {
+      "^.+\\.[jt]sx?$": [
+        "babel-jest",
+        {
+          "configFile": false,
+          "babelrc": false,
+          "presets": [
+            [
+              "@babel/preset-env",
+              {
+                "targets": {
+                  "node": "current"
+                }
+              }
+            ],
+            [
+              "@babel/preset-react",
+              {
+                "runtime": "automatic"
+              }
+            ],
+            "@babel/preset-typescript"
+          ]
+        }
+      ]
+    },
+    "moduleNameMapper": {
+      "^react-native$": "<rootDir>/src/__tests__/support/react-native.ts"
+    },
     "modulePathIgnorePatterns": [
       "<rootDir>/example/node_modules",
       "<rootDir>/lib/"
-    ]
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.{ts,tsx}",
+      "!src/__tests__/**"
+    ],
+    "coverageReporters": [
+      "text-summary",
+      "cobertura",
+      "lcov"
+    ],
+    "coverageThreshold": {
+      "global": {
+        "lines": 98,
+        "statements": 98,
+        "functions": 95,
+        "branches": 90
+      }
+    }
   },
   "release-it": {
     "git": {