@smile_identity/react-native 10.1.12 → 10.2.1

package/android/build.gradle

@@ -14,6 +14,8 @@ buildscript {
   dependencies {
     classpath "com.android.tools.build:gradle:8.3.2"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
     classpath "org.jlleitschuh.gradle:ktlint-gradle:12.1.1"
   }
 }
@@ -27,6 +29,8 @@ apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 apply plugin: 'kotlin-kapt'
 apply plugin: "org.jlleitschuh.gradle.ktlint"
+apply plugin: "org.jetbrains.kotlin.plugin.serialization"
+apply plugin: "org.jetbrains.kotlin.plugin.compose"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["SmileId_" + name]
@@ -97,7 +101,7 @@ android {
 
   sourceSets {
     main {
-       java.srcDirs += ["src/oldarch"]
+      java.srcDirs += ["src/oldarch"]
     }
   }
 }
@@ -108,8 +112,8 @@ repositories {
   gradlePluginPortal()
 }
 
-def kotlin_version = getExtOrDefault("kotlinVersion")
-def smile_id_sdk_version = getExtOrDefault("androidVersion")
+def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : getExtOrDefault("kotlinVersion")
+def smile_id_sdk_version = rootProject.ext.has("androidVersion") ? rootProject.ext.get("androidVersion") : getExtOrDefault("androidVersion")
 
 dependencies {
   implementation "com.facebook.react:react-native:0.72"
@@ -119,14 +123,16 @@ dependencies {
   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.8.1")
-  implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.6")
+  implementation("androidx.navigation:navigation-compose:2.8.4")
+  implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
+  implementation("androidx.compose.runtime:runtime:1.7.5")
 
   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.09.02')
+  androidTestImplementation platform('androidx.compose:compose-bom:2024.11.00')
   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.3.1
+SmileId_androidVersion=10.3.7

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

@@ -1,6 +1,6 @@
 package com.smileidentity.react.utils
 
-import com.smileidentity.react.views.DocumentCaptureResult
+import com.smileidentity.react.results.DocumentCaptureResult
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
@@ -15,17 +15,44 @@ 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(frontFile, backFile)
+
+    return DocumentCaptureResult(
+      selfieFile = selfieFile,
+      documentFrontFile = frontFile,
+      documentBackFile = backFile,
+      livenessFiles = livenessFiles,
+      didSubmitDocumentVerificationJob = didSubmitDocumentVerificationJob,
+      didSubmitEnhancedDocVJob = didSubmitEnhancedDocVJob
+    )
   }
 
   @ToJson
@@ -34,9 +61,26 @@ class DocumentCaptureResultAdapter : JsonAdapter<DocumentCaptureResult>() {
       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()
   }
 

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

@@ -6,6 +6,11 @@ import com.smileidentity.models.IdInfo
 import com.smileidentity.models.JobType
 import com.smileidentity.models.PartnerParams
 import com.smileidentity.util.randomUserId
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.PersistentMap
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableMap
+import kotlinx.collections.immutable.toPersistentMap
 import timber.log.Timber
 
 fun ReadableMap.toMap(): Map<String, String> {
@@ -60,3 +65,17 @@ fun ReadableMap.getMapOrDefault(key: String, defaultValue: ReadableMap? = null):
   }
   return defaultValue
 }
+
+fun ReadableMap.getImmutableMapOrDefault(
+  key: String,
+  defaultValue: ImmutableMap<String, String> = persistentMapOf()
+): ImmutableMap<String, String> {
+  return if (hasKey(key)) {
+    getMap(key)?.toHashMap()
+      ?.mapValues { it.value?.toString() ?: "" }
+      ?.toPersistentMap()
+      ?: defaultValue
+  } else {
+    defaultValue
+  }
+}

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

@@ -1,14 +1,15 @@
 package com.smileidentity.react.utils
 
-import com.smileidentity.react.views.SmartSelfieCaptureResult
+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.Moshi
 import com.squareup.moshi.ToJson
 import java.io.File
-import java.lang.reflect.Type
 
 class SelfieCaptureResultAdapter : JsonAdapter<SmartSelfieCaptureResult>() {
 
@@ -17,23 +18,35 @@ class SelfieCaptureResultAdapter : JsonAdapter<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" -> {
-          reader.beginArray()
+          // 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, livenessFiles)
+    return SmartSelfieCaptureResult(
+      selfieFile = selfieFile,
+      livenessFiles = livenessFiles,
+      apiResponse = apiResponse
+    )
   }
 
   @ToJson
@@ -44,24 +57,22 @@ class SelfieCaptureResultAdapter : JsonAdapter<SmartSelfieCaptureResult>() {
     }
     writer.beginObject()
     writer.name("selfieFile").value(value.selfieFile?.absolutePath)
+
     writer.name("livenessFiles")
     writer.beginArray()
-    value.livenessFiles?.forEach { file ->
-      writer.value(file.absolutePath)
-    }
+    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 = object : Factory {
-      override fun create(
-        type: Type,
-        annotations: Set<Annotation>,
-        moshi: Moshi
-      ): JsonAdapter<*>? {
-        return if (type == SmartSelfieCaptureResult::class.java) SelfieCaptureResultAdapter() else null
-      }
-    }
+    val FACTORY = Factory { type, annotations, moshi -> if (type == SmartSelfieCaptureResult::class.java) SelfieCaptureResultAdapter() else null }
   }
 }

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

@@ -7,8 +7,8 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.smileidentity.react.toIdInfo
 import com.smileidentity.react.utils.getBoolOrDefault
+import com.smileidentity.react.utils.getImmutableMapOrDefault
 import com.smileidentity.react.utils.getStringOrDefault
-import com.smileidentity.react.utils.toMap
 import com.smileidentity.react.views.SmileIDBiometricKYCView
 
 @ReactModule(name = SmileIDBiometricKYCViewManager.NAME)
@@ -47,7 +47,7 @@ class SmileIDBiometricKYCViewManager(
             ?: return view.emitFailure(IllegalArgumentException("idInfo is required to run Biometric KYC"))
           val idInfo = idInfoMap.toIdInfo()
             ?: return view.emitFailure(IllegalArgumentException("idInfo is required to run Biometric KYC"))
-          view.extraPartnerParams = params.getMap("extraPartnerParams")?.toMap()
+          view.extraPartnerParams = params.getImmutableMapOrDefault("extraPartnerParams")
           view.userId = params.getStringOrDefault("userId")
           view.jobId = params.getStringOrDefault("jobId")
           view.idInfo = idInfo

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

@@ -6,9 +6,8 @@ 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.getMapOrDefault
+import com.smileidentity.react.utils.getImmutableMapOrDefault
 import com.smileidentity.react.utils.getStringOrDefault
-import com.smileidentity.react.utils.toMap
 import com.smileidentity.react.views.SmileIDConsentView
 
 @ReactModule(name = SmileIDConsentViewManager.NAME)
@@ -54,7 +53,7 @@ class SmileIDConsentViewManager(
           val productName = params.getString("productName")
             ?: return view.emitFailure(IllegalArgumentException("productName is required to show Consent Screen"))
 
-          view.extraPartnerParams = params.getMapOrDefault("extraPartnerParams")?.toMap()
+          view.extraPartnerParams = params.getImmutableMapOrDefault("extraPartnerParams")
           view.userId = params.getStringOrDefault("userId")
           view.jobId = params.getStringOrDefault("jobId")
           view.partnerName = partnerName

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

@@ -7,9 +7,8 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.smileidentity.react.utils.getBoolOrDefault
 import com.smileidentity.react.utils.getFloatOrDefault
-import com.smileidentity.react.utils.getMapOrDefault
+import com.smileidentity.react.utils.getImmutableMapOrDefault
 import com.smileidentity.react.utils.getStringOrDefault
-import com.smileidentity.react.utils.toMap
 import com.smileidentity.react.views.SmileIDDocumentVerificationView
 
 @ReactModule(name = SmileIDDocumentVerificationViewManager.NAME)
@@ -46,7 +45,7 @@ class SmileIDDocumentVerificationViewManager(
         params?.let {
           val countryCode = params.getString("countryCode")
             ?: return view.emitFailure(IllegalArgumentException("countryCode is required to run Document Verification"))
-          view.extraPartnerParams = params.getMapOrDefault("extraPartnerParams")?.toMap()
+          view.extraPartnerParams = params.getImmutableMapOrDefault("extraPartnerParams")
           view.userId = params.getStringOrDefault("userId")
           view.jobId = params.getStringOrDefault("jobId")
           view.countryCode = countryCode
@@ -59,6 +58,7 @@ class SmileIDDocumentVerificationViewManager(
           view.documentType = params.getStringOrDefault("documentType", null)
           view.idAspectRatio = params.getFloatOrDefault("idAspectRatio")
           view.allowNewEnroll = params.getBoolOrDefault("allowNewEnroll", false)
+          view.skipApiSubmission = params.getBoolOrDefault("skipApiSubmission", false)
           view.renderContent()
         }
       }

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

@@ -7,9 +7,8 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.smileidentity.react.utils.getBoolOrDefault
 import com.smileidentity.react.utils.getFloatOrDefault
-import com.smileidentity.react.utils.getMapOrDefault
+import com.smileidentity.react.utils.getImmutableMapOrDefault
 import com.smileidentity.react.utils.getStringOrDefault
-import com.smileidentity.react.utils.toMap
 import com.smileidentity.react.views.SmileIDEnhancedDocumentVerificationView
 
 @ReactModule(name = SmileIDEnhancedDocumentVerificationViewManager.NAME)
@@ -46,7 +45,7 @@ class SmileIDEnhancedDocumentVerificationViewManager(
         params?.let {
           val countryCode = params.getString("countryCode")
             ?: return view.emitFailure(IllegalArgumentException("countryCode is required to run Enhanced Document Verification"))
-          view.extraPartnerParams = params.getMapOrDefault("extraPartnerParams")?.toMap()
+          view.extraPartnerParams = params.getImmutableMapOrDefault("extraPartnerParams")
           view.userId = params.getStringOrDefault("userId")
           view.jobId = params.getStringOrDefault("jobId")
           view.countryCode = countryCode
@@ -58,6 +57,7 @@ class SmileIDEnhancedDocumentVerificationViewManager(
           view.documentType = params.getStringOrDefault("documentType")
           view.idAspectRatio = params.getFloatOrDefault("idAspectRatio")
           view.allowNewEnroll = params.getBoolOrDefault("allowNewEnroll", false)
+          view.skipApiSubmission = params.getBoolOrDefault("skipApiSubmission", false)
           view.renderContent()
         }
       }

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

@@ -6,9 +6,8 @@ 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.getMapOrDefault
+import com.smileidentity.react.utils.getImmutableMapOrDefault
 import com.smileidentity.react.utils.getStringOrDefault
-import com.smileidentity.react.utils.toMap
 import com.smileidentity.react.views.SmileIDSmartSelfieAuthenticationView
 
 @ReactModule(name = SmileIDSmartSelfieAuthenticationViewManager.NAME)
@@ -43,13 +42,14 @@ class SmileIDSmartSelfieAuthenticationViewManager(
         // Extract params from args and apply to view
         val params = args?.getMap(0)
         params?.let {
-          view.extraPartnerParams = params.getMapOrDefault("extraPartnerParams")?.toMap()
+          view.extraPartnerParams = params.getImmutableMapOrDefault("extraPartnerParams")
           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.allowNewEnroll = params.getBoolOrDefault("allowNewEnroll", false)
+          view.skipApiSubmission = params.getBoolOrDefault("skipApiSubmission", false)
           view.renderContent()
         }
       }

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

@@ -6,9 +6,8 @@ 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.getMapOrDefault
+import com.smileidentity.react.utils.getImmutableMapOrDefault
 import com.smileidentity.react.utils.getStringOrDefault
-import com.smileidentity.react.utils.toMap
 import com.smileidentity.react.views.SmileIDSmartSelfieEnrollmentView
 
 @ReactModule(name = SmileIDSmartSelfieEnrollmentViewManager.NAME)
@@ -43,13 +42,14 @@ class SmileIDSmartSelfieEnrollmentViewManager(
         // Extract params from args and apply to view
         val params = args?.getMap(0)
         params?.let {
-          view.extraPartnerParams = params.getMapOrDefault("extraPartnerParams")?.toMap()
+          view.extraPartnerParams = params.getImmutableMapOrDefault("extraPartnerParams")
           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.allowNewEnroll = params.getBoolOrDefault("allowNewEnroll", false)
+          view.skipApiSubmission = params.getBoolOrDefault("skipApiSubmission", false)
           view.renderContent()
         }
       }

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

@@ -7,12 +7,11 @@ 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
@@ -34,25 +33,36 @@ class SmileIDBiometricKYCView(context: ReactApplicationContext) : SmileIDView(co
             allowNewEnroll = allowNewEnroll ?: false,
             showAttribution = showAttribution ?: true,
             showInstructions = showInstructions ?: true,
-            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-          ) { result ->
-            when (result) {
+            extraPartnerParams = extraPartnerParams,
+          ) { 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

@@ -17,22 +17,15 @@ import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.R
 import com.smileidentity.SmileID
-import com.smileidentity.SmileIDOptIn
 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 com.squareup.moshi.JsonClass
 import timber.log.Timber
 import java.io.File
 
-data class DocumentCaptureResult(
-  val documentFrontFile: File? = null,
-  val documentBackFile: File? = null
-)
-
-@OptIn(SmileIDOptIn::class)
 class SmileIDDocumentCaptureView(context: ReactApplicationContext) : SmileIDView(context) {
   var showConfirmation: Boolean = true
   var front: Boolean = true
@@ -72,19 +65,10 @@ class SmileIDDocumentCaptureView(context: ReactApplicationContext) : SmileIDView
     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 = { }
     )
   }
 

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) {
@@ -47,26 +47,40 @@ class SmileIDDocumentVerificationView(context: ReactApplicationContext) : SmileI
             allowGalleryUpload = allowGalleryUpload,
             captureBothSides = captureBothSides,
             allowNewEnroll = allowNewEnroll ?: false,
+            skipApiSubmission = skipApiSubmission,
             bypassSelfieCaptureWithFile = bypassSelfieCaptureWithFile,
-            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-          ) { result ->
-            when (result) {
+            extraPartnerParams = extraPartnerParams,
+          ) { 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)
             }
           }
         }