@smile_identity/react-native 10.1.11 → 10.2.0

package/android/build.gradle

@@ -116,17 +116,17 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core"
   implementation "com.smileidentity:android-sdk:$smile_id_sdk_version"
+  implementation "com.google.mlkit:object-detection:17.0.2"
   implementation "com.jakewharton.timber:timber"
   implementation 'androidx.appcompat:appcompat:1.7.0'
-  implementation("androidx.navigation:navigation-compose:2.7.7")
+  implementation("androidx.navigation:navigation-compose:2.8.1")
+  implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.6")
 
   testImplementation 'junit:junit:4.13.2'
 
   androidTestImplementation 'androidx.test.ext:junit:1.2.1'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
-  androidTestImplementation platform('androidx.compose:compose-bom:2024.06.00')
-  androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
-  androidTestImplementation platform('androidx.compose:compose-bom:2024.06.00')
+  androidTestImplementation platform('androidx.compose:compose-bom:2024.09.02')
   androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
 
   debugImplementation 'androidx.compose.ui:ui-tooling'

package/android/gradle.properties

@@ -3,4 +3,4 @@ SmileId_minSdkVersion=21
 SmileId_targetSdkVersion=34
 SmileId_compileSdkVersion=34
 SmileId_ndkversion=21.4.7075529
-SmileId_androidVersion=10.2.5
+SmileId_androidVersion=10.3.1

package/android/src/main/java/com/smileidentity/react/SmileIdPackage.kt

@@ -8,15 +8,20 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.smileidentity.react.viewmanagers.SmileIDBiometricKYCViewManager
 import com.smileidentity.react.viewmanagers.SmileIDConsentViewManager
+import com.smileidentity.react.viewmanagers.SmileIDDocumentCaptureViewManager
 import com.smileidentity.react.viewmanagers.SmileIDDocumentVerificationViewManager
 import com.smileidentity.react.viewmanagers.SmileIDEnhancedDocumentVerificationViewManager
 import com.smileidentity.react.viewmanagers.SmileIDSmartSelfieAuthenticationViewManager
+import com.smileidentity.react.viewmanagers.SmileIDSmartSelfieCaptureViewManager
 import com.smileidentity.react.viewmanagers.SmileIDSmartSelfieEnrollmentViewManager
+import com.smileidentity.react.views.SmileIDDocumentCaptureView
 
 class SmileIdPackage : TurboReactPackage() {
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
     listOf(
+      SmileIDSmartSelfieCaptureViewManager(reactContext),
+      SmileIDDocumentCaptureViewManager(reactContext),
       SmileIDSmartSelfieEnrollmentViewManager(reactContext),
       SmileIDSmartSelfieAuthenticationViewManager(reactContext),
       SmileIDDocumentVerificationViewManager(reactContext),

package/android/src/main/java/com/smileidentity/react/results/DocumentCaptureResult.kt

@@ -0,0 +1,12 @@
+package com.smileidentity.react.results
+
+import java.io.File
+
+data class DocumentCaptureResult(
+  val selfieFile: File? = null,
+  val documentFrontFile: File? = null,
+  val livenessFiles: List<File>? = null,
+  val documentBackFile: File? = null,
+  val didSubmitDocumentVerificationJob: Boolean? = null,
+  val didSubmitEnhancedDocVJob: Boolean? = null
+)

package/android/src/main/java/com/smileidentity/react/results/SmartSelfieCaptureResult.kt

@@ -0,0 +1,11 @@
+package com.smileidentity.react.results
+
+import com.smileidentity.models.v2.SmartSelfieResponse
+import java.io.File
+
+data class SmartSelfieCaptureResult(
+  val selfieFile: File? = null,
+  val livenessFiles: List<File>? = null,
+  val apiResponse: SmartSelfieResponse? = null,
+  val didSubmitBiometricKycJob: Boolean? = null
+)

package/android/src/main/java/com/smileidentity/react/utils/DocumentCaptureResultAdapter.kt

@@ -0,0 +1,98 @@
+package com.smileidentity.react.utils
+
+import com.smileidentity.react.results.DocumentCaptureResult
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
+import java.io.File
+import java.lang.reflect.Type
+
+class DocumentCaptureResultAdapter : JsonAdapter<DocumentCaptureResult>() {
+
+  @FromJson
+  override fun fromJson(reader: JsonReader): DocumentCaptureResult {
+    reader.beginObject()
+    var selfieFile: File? = null
+    var frontFile: File? = null
+    var backFile: File? = null
+    var livenessFiles: MutableList<File>? = null
+    var didSubmitDocumentVerificationJob: Boolean? = null
+    var didSubmitEnhancedDocVJob: Boolean? = null
+
+    while (reader.hasNext()) {
+      when (reader.nextName()) {
+        "selfieFile" -> selfieFile = reader.nextString()?.let { File(it) }
+        "documentFrontFile" -> frontFile = reader.nextString()?.let { File(it) }
+        "documentBackFile" -> backFile = reader.nextString()?.let { File(it) }
+        "livenessFiles" -> {
+          livenessFiles = mutableListOf()
+          reader.beginArray()
+          while (reader.hasNext()) {
+            reader.nextString()?.let { livenessFiles.add(File(it)) }
+          }
+          reader.endArray()
+        }
+
+        "didSubmitDocumentVerificationJob" -> didSubmitDocumentVerificationJob =
+          reader.nextBoolean()
+
+        "didSubmitEnhancedDocVJob" -> didSubmitEnhancedDocVJob = reader.nextBoolean()
+        else -> reader.skipValue()
+      }
+    }
+    reader.endObject()
+
+    return DocumentCaptureResult(
+      selfieFile = selfieFile,
+      documentFrontFile = frontFile,
+      documentBackFile = backFile,
+      livenessFiles = livenessFiles,
+      didSubmitDocumentVerificationJob = didSubmitDocumentVerificationJob,
+      didSubmitEnhancedDocVJob = didSubmitEnhancedDocVJob
+    )
+  }
+
+  @ToJson
+  override fun toJson(writer: JsonWriter, value: DocumentCaptureResult?) {
+    if (value == null) {
+      writer.nullValue()
+      return
+    }
+
+    writer.beginObject()
+    writer.name("selfieFile").value(value.selfieFile?.absolutePath)
+    writer.name("documentFrontFile").value(value.documentFrontFile?.absolutePath)
+    writer.name("documentBackFile").value(value.documentBackFile?.absolutePath)
+
+    writer.name("livenessFiles")
+    if (value.livenessFiles == null) {
+      writer.nullValue()
+    } else {
+      writer.beginArray()
+      for (file in value.livenessFiles) {
+        writer.value(file.absolutePath)
+      }
+      writer.endArray()
+    }
+
+    writer.name("didSubmitDocumentVerificationJob").value(value.didSubmitDocumentVerificationJob)
+    writer.name("didSubmitEnhancedDocVJob").value(value.didSubmitEnhancedDocVJob)
+
+    writer.endObject()
+  }
+
+  companion object {
+    val FACTORY = object : Factory {
+      override fun create(
+        type: Type,
+        annotations: Set<Annotation>,
+        moshi: Moshi
+      ): JsonAdapter<*>? {
+        return if (type == DocumentCaptureResult::class.java) DocumentCaptureResultAdapter() else null
+      }
+    }
+  }
+}

package/android/src/main/java/com/smileidentity/react/utils/SelfieCaptureResultAdapter.kt

@@ -0,0 +1,78 @@
+package com.smileidentity.react.utils
+
+import com.smileidentity.SmileID
+import com.smileidentity.models.v2.SmartSelfieResponse
+import com.smileidentity.react.results.SmartSelfieCaptureResult
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonAdapter.Factory
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import java.io.File
+
+class SelfieCaptureResultAdapter : JsonAdapter<SmartSelfieCaptureResult>() {
+
+  @FromJson
+  override fun fromJson(reader: JsonReader): SmartSelfieCaptureResult {
+    reader.beginObject()
+    var selfieFile: File? = null
+    var livenessFiles: List<File>? = null
+    var apiResponse: SmartSelfieResponse? = null
+
+    while (reader.hasNext()) {
+      when (reader.nextName()) {
+        "selfieFile" -> selfieFile = reader.nextString()?.let { File(it) }
+        "livenessFiles" -> {
+          // Assuming livenessFiles is an array of file paths in the JSON
+          val files = mutableListOf<File>()
+          reader.beginArray()
+          while (reader.hasNext()) {
+            reader.nextString()?.let { files.add(File(it)) }
+          }
+          reader.endArray()
+          livenessFiles = files
+        }
+
+        "apiResponse" -> apiResponse =
+          SmileID.moshi.adapter(SmartSelfieResponse::class.java).fromJson(reader)
+
+        else -> reader.skipValue()
+      }
+    }
+
+    reader.endObject()
+    return SmartSelfieCaptureResult(
+      selfieFile = selfieFile,
+      livenessFiles = livenessFiles,
+      apiResponse = apiResponse
+    )
+  }
+
+  @ToJson
+  override fun toJson(writer: JsonWriter, value: SmartSelfieCaptureResult?) {
+    if (value == null) {
+      writer.nullValue()
+      return
+    }
+    writer.beginObject()
+    writer.name("selfieFile").value(value.selfieFile?.absolutePath)
+
+    writer.name("livenessFiles")
+    writer.beginArray()
+    value.livenessFiles?.forEach { writer.value(it.absolutePath) }
+    writer.endArray()
+
+    writer.name("apiResponse")
+    if (value.apiResponse != null) {
+      SmileID.moshi.adapter(SmartSelfieResponse::class.java).toJson(writer, value.apiResponse)
+    } else {
+      writer.nullValue()
+    }
+    writer.endObject()
+  }
+
+  companion object {
+    val FACTORY = Factory { type, annotations, moshi -> if (type == SmartSelfieCaptureResult::class.java) SelfieCaptureResultAdapter() else null }
+  }
+}

package/android/src/main/java/com/smileidentity/react/viewmanagers/SmileIDDocumentCaptureViewManager.kt

@@ -0,0 +1,65 @@
+package com.smileidentity.react.viewmanagers
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.smileidentity.react.utils.getBoolOrDefault
+import com.smileidentity.react.utils.getStringOrDefault
+import com.smileidentity.react.views.SmileIDDocumentCaptureView
+
+@ReactModule(name = SmileIDDocumentCaptureViewManager.NAME)
+class SmileIDDocumentCaptureViewManager(
+  private val reactApplicationContext: ReactApplicationContext
+) : SimpleViewManager<SmileIDDocumentCaptureView>() {
+  override fun getName(): String = NAME
+
+  override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
+    return mapOf(
+      "onSmileResult" to mapOf(
+        "phasedRegistrationNames" to mapOf(
+          "bubbled" to "onResult"
+        )
+      )
+    )
+  }
+
+  override fun getCommandsMap(): Map<String, Int> {
+    return mapOf("setParams" to COMMAND_SET_PARAMS)
+  }
+
+  override fun receiveCommand(
+    view: SmileIDDocumentCaptureView,
+    commandId: String?,
+    args: ReadableArray?
+  ) {
+    super.receiveCommand(view, commandId, args)
+    when (commandId?.toInt()) {
+      COMMAND_SET_PARAMS -> {
+        // Extract params from args and apply to view
+        val params = args?.getMap(0)
+        params?.let {
+          view.userId = params.getStringOrDefault("userId")
+          view.jobId = params.getStringOrDefault("jobId")
+          view.allowAgentMode = params.getBoolOrDefault("allowAgentMode", true)
+          view.showAttribution = params.getBoolOrDefault("showAttribution", true)
+          view.showInstructions = params.getBoolOrDefault("showInstructions", true)
+          view.showConfirmation = params.getBoolOrDefault("showConfirmation", true)
+          view.allowGalleryUpload = params.getBoolOrDefault("allowGalleryUpload", false)
+          view.front = params.getBoolOrDefault("isDocumentFrontSide", true)
+          view.renderContent()
+        }
+      }
+    }
+  }
+
+  override fun createViewInstance(p0: ThemedReactContext): SmileIDDocumentCaptureView {
+    return SmileIDDocumentCaptureView(reactApplicationContext)
+  }
+
+  companion object {
+    const val NAME = "SmileIDDocumentCaptureView"
+    const val COMMAND_SET_PARAMS = 1
+  }
+}

package/android/src/main/java/com/smileidentity/react/viewmanagers/SmileIDSmartSelfieCaptureViewManager.kt

@@ -0,0 +1,63 @@
+package com.smileidentity.react.viewmanagers
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.smileidentity.react.utils.getBoolOrDefault
+import com.smileidentity.react.utils.getStringOrDefault
+import com.smileidentity.react.views.SmileIDSmartSelfieCaptureView
+
+@ReactModule(name = SmileIDSmartSelfieCaptureViewManager.NAME)
+class SmileIDSmartSelfieCaptureViewManager(
+  private val reactApplicationContext: ReactApplicationContext
+) : SimpleViewManager<SmileIDSmartSelfieCaptureView>() {
+  override fun getName(): String = NAME
+
+  override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
+    return mapOf(
+      "onSmileResult" to mapOf(
+        "phasedRegistrationNames" to mapOf(
+          "bubbled" to "onResult"
+        )
+      )
+    )
+  }
+
+  override fun getCommandsMap(): Map<String, Int> {
+    return mapOf("setParams" to COMMAND_SET_PARAMS)
+  }
+
+  override fun receiveCommand(
+    view: SmileIDSmartSelfieCaptureView,
+    commandId: String?,
+    args: ReadableArray?
+  ) {
+    super.receiveCommand(view, commandId, args)
+    when (commandId?.toInt()) {
+      COMMAND_SET_PARAMS -> {
+        // Extract params from args and apply to view
+        val params = args?.getMap(0)
+        params?.let {
+          view.userId = params.getStringOrDefault("userId")
+          view.jobId = params.getStringOrDefault("jobId")
+          view.allowAgentMode = params.getBoolOrDefault("allowAgentMode", false)
+          view.showAttribution = params.getBoolOrDefault("showAttribution", true)
+          view.showInstructions = params.getBoolOrDefault("showInstructions", true)
+          view.showConfirmation = params.getBoolOrDefault("showConfirmation", true)
+          view.renderContent()
+        }
+      }
+    }
+  }
+
+  override fun createViewInstance(p0: ThemedReactContext): SmileIDSmartSelfieCaptureView {
+    return SmileIDSmartSelfieCaptureView(reactApplicationContext)
+  }
+
+  companion object {
+    const val NAME = "SmileIDSmartSelfieCaptureView"
+    const val COMMAND_SET_PARAMS = 1
+  }
+}

package/android/src/main/java/com/smileidentity/react/views/SmileIDBiometricKYCView.kt

@@ -7,12 +7,12 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.BiometricKYC
 import com.smileidentity.models.IdInfo
-import com.smileidentity.results.BiometricKycResult
+import com.smileidentity.react.results.SmartSelfieCaptureResult
+import com.smileidentity.react.utils.SelfieCaptureResultAdapter
 import com.smileidentity.results.SmileIDResult
 import com.smileidentity.util.randomJobId
 import com.smileidentity.util.randomUserId
 import kotlinx.collections.immutable.toImmutableMap
-import timber.log.Timber
 
 class SmileIDBiometricKYCView(context: ReactApplicationContext) : SmileIDView(context) {
   var idInfo: IdInfo? = null
@@ -35,24 +35,35 @@ class SmileIDBiometricKYCView(context: ReactApplicationContext) : SmileIDView(co
             showAttribution = showAttribution ?: true,
             showInstructions = showInstructions ?: true,
             extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-          ) { result ->
-            when (result) {
+          ) { res ->
+            when (res) {
               is SmileIDResult.Success -> {
-                val json = try {
+                val result =
+                  SmartSelfieCaptureResult(
+                    selfieFile = res.data.selfieFile,
+                    livenessFiles = res.data.livenessFiles,
+                    didSubmitBiometricKycJob = res.data.didSubmitBiometricKycJob,
+                  )
+                val newMoshi =
                   SmileID.moshi
-                    .adapter(BiometricKycResult::class.java)
-                    .toJson(result.data)
-                } catch (e: Exception) {
-                  Timber.w(e)
-                  "null"
+                    .newBuilder()
+                    .add(SelfieCaptureResultAdapter.FACTORY)
+                    .build()
+                val json =
+                  try {
+                    newMoshi
+                      .adapter(SmartSelfieCaptureResult::class.java)
+                      .toJson(result)
+                  } catch (e: Exception) {
+                    emitFailure(e)
+                    return@BiometricKYC
+                  }
+                json?.let { js ->
+                  emitSuccess(js)
                 }
-                emitSuccess(json)
               }
 
-              is SmileIDResult.Error -> {
-                result.throwable.printStackTrace()
-                emitFailure(result.throwable)
-              }
+              is SmileIDResult.Error -> emitFailure(res.throwable)
             }
           }
         }

package/android/src/main/java/com/smileidentity/react/views/SmileIDDocumentCaptureView.kt

@@ -0,0 +1,102 @@
+package com.smileidentity.react.views
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
+import com.facebook.react.bridge.ReactApplicationContext
+import com.smileidentity.R
+import com.smileidentity.SmileID
+import com.smileidentity.compose.document.DocumentCaptureScreen
+import com.smileidentity.compose.document.DocumentCaptureSide
+import com.smileidentity.compose.theme.colorScheme
+import com.smileidentity.react.results.DocumentCaptureResult
+import com.smileidentity.react.utils.DocumentCaptureResultAdapter
+import com.smileidentity.util.randomJobId
+import timber.log.Timber
+import java.io.File
+
+class SmileIDDocumentCaptureView(context: ReactApplicationContext) : SmileIDView(context) {
+  var showConfirmation: Boolean = true
+  var front: Boolean = true
+  var allowGalleryUpload: Boolean = false
+  var idAspectRatio: Float? = null
+
+  override fun renderContent() {
+    composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
+      setContent {
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          val colorScheme = SmileID.colorScheme.copy(background = Color.White)
+          Box(
+            modifier = Modifier
+              .background(color = colorScheme.background)
+              .windowInsetsPadding(WindowInsets.statusBars)
+              .consumeWindowInsets(WindowInsets.statusBars)
+              .fillMaxSize()
+          ) {
+            RenderDocumentCaptureScreen()
+          }
+        }
+      }
+    }
+  }
+
+  @Composable
+  private fun RenderDocumentCaptureScreen() {
+    val jobId = jobId ?: rememberSaveable { randomJobId() }
+    val hero = if (front) R.drawable.si_doc_v_front_hero else R.drawable.si_doc_v_back_hero
+    val instructionTitle = if (front) R.string.si_doc_v_instruction_title else
+      R.string.si_doc_v_instruction_back_title
+    val instructionSubTitle = if (front) R.string.si_verify_identity_instruction_subtitle else
+      R.string.si_doc_v_instruction_back_subtitle
+    val captureTitleText = if (front) R.string.si_doc_v_capture_instructions_front_title else
+      R.string.si_doc_v_capture_instructions_back_title
+    DocumentCaptureScreen(
+      jobId = jobId,
+      side = if (front) DocumentCaptureSide.Front else DocumentCaptureSide.Back,
+      showInstructions = showInstructions,
+      showAttribution = showAttribution,
+      allowGallerySelection = allowGalleryUpload,
+      showConfirmation = showConfirmation,
+      showSkipButton = false,
+      instructionsHeroImage = hero,
+      instructionsTitleText = stringResource(instructionTitle),
+      instructionsSubtitleText = stringResource(instructionSubTitle),
+      captureTitleText = stringResource(captureTitleText),
+      knownIdAspectRatio = idAspectRatio,
+      onConfirm = { file -> handleConfirmation(file) },
+      onError = { throwable -> emitFailure(throwable) },
+      onSkip = { }
+    )
+  }
+
+  private fun handleConfirmation(file: File) {
+    val newMoshi = SmileID.moshi.newBuilder()
+      .add(DocumentCaptureResultAdapter.FACTORY)
+      .build()
+    val result = DocumentCaptureResult(
+      documentFrontFile = if (front) file else null,
+      documentBackFile =  if (!front) file else null,
+    )
+    val json = try {
+      newMoshi
+        .adapter(DocumentCaptureResult::class.java)
+        .toJson(result)
+    } catch (e: Exception) {
+      Timber.w(e)
+      "null"
+    }
+    emitSuccess(json)
+  }
+}

package/android/src/main/java/com/smileidentity/react/views/SmileIDDocumentVerificationView.kt

@@ -6,12 +6,12 @@ import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.DocumentVerification
-import com.smileidentity.results.DocumentVerificationResult
+import com.smileidentity.react.results.DocumentCaptureResult
+import com.smileidentity.react.utils.DocumentCaptureResultAdapter
 import com.smileidentity.results.SmileIDResult
 import com.smileidentity.util.randomJobId
 import com.smileidentity.util.randomUserId
 import kotlinx.collections.immutable.toImmutableMap
-import timber.log.Timber
 import java.io.File
 
 class SmileIDDocumentVerificationView(context: ReactApplicationContext) : SmileIDView(context) {
@@ -49,24 +49,37 @@ class SmileIDDocumentVerificationView(context: ReactApplicationContext) : SmileI
             allowNewEnroll = allowNewEnroll ?: false,
             bypassSelfieCaptureWithFile = bypassSelfieCaptureWithFile,
             extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-          ) { result ->
-            when (result) {
+          ) { res ->
+            when (res) {
               is SmileIDResult.Success -> {
-                val json = try {
+                val result =
+                  DocumentCaptureResult(
+                    selfieFile = res.data.selfieFile,
+                    documentFrontFile = res.data.documentFrontFile,
+                    livenessFiles = res.data.livenessFiles,
+                    documentBackFile = res.data.documentBackFile,
+                    didSubmitDocumentVerificationJob = res.data.didSubmitDocumentVerificationJob,
+                  )
+                val newMoshi =
                   SmileID.moshi
-                    .adapter(DocumentVerificationResult::class.java)
-                    .toJson(result.data)
-                } catch (e: Exception) {
-                  Timber.w(e)
-                  "null"
+                    .newBuilder()
+                    .add(DocumentCaptureResultAdapter.FACTORY)
+                    .build()
+                val json =
+                  try {
+                    newMoshi
+                      .adapter(DocumentCaptureResult::class.java)
+                      .toJson(result)
+                  } catch (e: Exception) {
+                    emitFailure(e)
+                    return@DocumentVerification
+                  }
+                json?.let { js ->
+                  emitSuccess(js)
                 }
-                emitSuccess(json)
               }
 
-              is SmileIDResult.Error -> {
-                result.throwable.printStackTrace()
-                emitFailure(result.throwable)
-              }
+              is SmileIDResult.Error -> emitFailure(res.throwable)
             }
           }
         }