@smile_identity/react-native 10.3.2 → 10.3.3

package/android/build.gradle

@@ -8,10 +8,10 @@ buildscript {
     google()
     mavenCentral()
     gradlePluginPortal()
-//     uncomment for development to test snapshots
-//     maven {
-//        url 'https://oss.sonatype.org/content/repositories/snapshots/'
-//     }
+//  uncomment for development to test snapshots
+//  maven {
+//    url = 'https://central.sonatype.com/repository/maven-snapshots/'
+//  }
   }
 
   dependencies {
@@ -121,9 +121,10 @@ repositories {
   mavenCentral()
   google()
   gradlePluginPortal()
-  maven {
-    url 'https://oss.sonatype.org/content/repositories/snapshots/'
-  }
+//  uncomment for development to test snapshots
+//  maven {
+//    url = 'https://central.sonatype.com/repository/maven-snapshots/'
+//  }
 }
 
 def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["SmileId_kotlinVersion"]

package/android/gradle.properties

@@ -3,7 +3,5 @@ SmileId_minSdkVersion=21
 SmileId_targetSdkVersion=35
 SmileId_compileSdkVersion=35
 SmileId_ndkversion=21.4.7075529
-SmileId_androidVersion=10.6.0
-; Uncomment for dev also uncomment snapshots repo in build.gradle
-; SmileId_androidVersion=10.6.1-SNAPSHOT
+SmileId_androidVersion=10.6.3
 SmileId_kotlinCompilerExtensionVersion=1.5.11

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

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.smileidentity.models.AuthenticationRequest
 import com.smileidentity.models.Config
 import com.smileidentity.models.ConsentInformation
+import com.smileidentity.models.ConsentedInformation
 import com.smileidentity.models.EnhancedKycRequest
 import com.smileidentity.models.IdInfo
 import com.smileidentity.models.ImageType
@@ -153,23 +154,47 @@ fun ReadableMap.toEnhancedKycRequest(): EnhancedKycRequest {
     },
     consentInformation = getMapOrDefault("consentInformation", null)?.toConsentInfo() ?: run {
       ConsentInformation(
-        consentGrantedDate = getCurrentIsoTimestamp(),
-        personalDetailsConsentGranted = false,
-        contactInfoConsentGranted = false,
-        documentInfoConsentGranted = false
+        consented = ConsentedInformation(
+          consentGrantedDate = getCurrentIsoTimestamp(),
+          personalDetails = false,
+          contactInformation = false,
+          documentInformation = false
+        )
       )
     },
   )
 }
 
 fun ReadableMap.toConsentInfo(): ConsentInformation {
+  val consentGrantedDate =
+    getStringOrDefault("consentGrantedDate", getCurrentIsoTimestamp()) ?: getCurrentIsoTimestamp()
+
+  // Try the new property names first, fall back to old property names if new ones aren't present
+  val personalDetailsConsentGranted = if (hasKey("personalDetails")) {
+    getBoolOrDefault("personalDetails", false)
+  } else {
+    getBoolOrDefault("personalDetailsConsentGranted", false)
+  }
+
+  val contactInfoConsentGranted = if (hasKey("contactInformation")) {
+    getBoolOrDefault("contactInformation", false)
+  } else {
+    getBoolOrDefault("contactInfoConsentGranted", false)
+  }
+
+  val documentInfoConsentGranted = if (hasKey("documentInformation")) {
+    getBoolOrDefault("documentInformation", false)
+  } else {
+    getBoolOrDefault("documentInfoConsentGranted", false)
+  }
+
   return ConsentInformation(
-    consentGrantedDate = getStringOrDefault("consentGrantedDate", null) ?: run {
-      getCurrentIsoTimestamp()
-    },
-    personalDetailsConsentGranted = getBoolOrDefault("personalDetailsConsentGranted", false),
-    contactInfoConsentGranted = getBoolOrDefault("contactInfoConsentGranted", false),
-    documentInfoConsentGranted = getBoolOrDefault("documentInfoConsentGranted", false)
+    consented = ConsentedInformation(
+      consentGrantedDate = consentGrantedDate,
+      personalDetails = personalDetailsConsentGranted,
+      contactInformation = contactInfoConsentGranted,
+      documentInformation = documentInfoConsentGranted
+    ),
   )
 }
 

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

@@ -4,6 +4,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.smileidentity.models.ConsentInformation
+import com.smileidentity.models.ConsentedInformation
 import com.smileidentity.react.toConsentInfo
 import com.smileidentity.react.toIdInfo
 import com.smileidentity.react.utils.getBoolOrDefault
@@ -31,11 +32,13 @@ class SmileIDBiometricKYCViewManager(
       val idInfo = idInfoMap.toIdInfo()
       view.consentInformation = it.getMapOrDefault("consentInformation")?.toConsentInfo()
         ?: ConsentInformation(
-          consentGrantedDate = getCurrentIsoTimestamp(),
-          personalDetailsConsentGranted = false,
-          contactInfoConsentGranted = false,
-          documentInfoConsentGranted = false
-        )
+          consented = ConsentedInformation(
+            consentGrantedDate = getCurrentIsoTimestamp(),
+            personalDetails = false,
+            contactInformation = false,
+            documentInformation = false
+          ),
+      )
       view.extraPartnerParams = it.getImmutableMapOrDefault("extraPartnerParams")
       view.userId = it.getStringOrDefault("userId")
       view.jobId = it.getStringOrDefault("jobId")

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

@@ -7,6 +7,7 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.smileidentity.models.ConsentInformation
+import com.smileidentity.models.ConsentedInformation
 import com.smileidentity.react.toConsentInfo
 import com.smileidentity.react.toIdInfo
 import com.smileidentity.react.utils.getBoolOrDefault
@@ -37,10 +38,12 @@ class SmileIDEnhancedDocumentVerificationViewManager(
         )
       view.consentInformation = it.getMapOrDefault("consentInformation")?.toConsentInfo()
         ?: ConsentInformation(
-          consentGrantedDate = getCurrentIsoTimestamp(),
-          personalDetailsConsentGranted = false,
-          contactInfoConsentGranted = false,
-          documentInfoConsentGranted = false
+          consented = ConsentedInformation(
+            consentGrantedDate = getCurrentIsoTimestamp(),
+            personalDetails = false,
+            contactInformation = false,
+            documentInformation = false
+          ),
         )
       view.extraPartnerParams = it.getImmutableMapOrDefault("extraPartnerParams")
       view.userId = it.getStringOrDefault("userId")

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

@@ -1,22 +1,53 @@
 package com.smileidentity.react.views
 
+import android.graphics.BitmapFactory
+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.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.painter.BitmapPainter
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.facebook.react.bridge.ReactApplicationContext
+import com.smileidentity.R
 import com.smileidentity.SmileID
 import com.smileidentity.SmileIDOptIn
 import com.smileidentity.compose.SmartSelfieEnrollment
 import com.smileidentity.compose.SmartSelfieEnrollmentEnhanced
+import com.smileidentity.compose.components.ImageCaptureConfirmationDialog
+import com.smileidentity.compose.components.LocalMetadata
+import com.smileidentity.compose.selfie.SelfieCaptureScreen
+import com.smileidentity.compose.selfie.SmartSelfieInstructionsScreen
 import com.smileidentity.compose.theme.colorScheme
 import com.smileidentity.compose.theme.typography
+import com.smileidentity.models.v2.Metadata
 import com.smileidentity.react.results.SmartSelfieCaptureResult
 import com.smileidentity.react.utils.SelfieCaptureResultAdapter
 import com.smileidentity.results.SmartSelfieResult
 import com.smileidentity.results.SmileIDResult
 import com.smileidentity.util.randomJobId
 import com.smileidentity.util.randomUserId
+import com.smileidentity.viewmodel.SelfieUiState
+import com.smileidentity.viewmodel.SelfieViewModel
+import com.smileidentity.viewmodel.viewModelFactory
 
 
 @OptIn(SmileIDOptIn::class)
@@ -29,11 +60,10 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
       val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
         CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
-          val userId = randomUserId()
-          val jobId = randomJobId()
-          MaterialTheme(colorScheme = SmileID.colorScheme, typography = SmileID.typography) {
-            Surface(content = {
-              if (useStrictMode) {
+          if (useStrictMode) {
+            val userId = randomUserId()
+            MaterialTheme(colorScheme = SmileID.colorScheme, typography = SmileID.typography) {
+              Surface(content = {
                 SmileID.SmartSelfieEnrollmentEnhanced(
                   userId = userId,
                   showAttribution = showAttribution,
@@ -42,22 +72,122 @@ class SmileIDSmartSelfieCaptureView(context: ReactApplicationContext) : SmileIDS
                   extraPartnerParams = extraPartnerParams,
                   onResult = { res -> handleResultCallback(res) },
                 )
-              } else {
-                SmileID.SmartSelfieEnrollment(
-                  userId = userId,
-                  jobId = jobId,
-                  allowAgentMode = allowAgentMode ?: false,
-                  showAttribution = showAttribution,
-                  showInstructions = showInstructions,
-                  skipApiSubmission = true,
-                  extraPartnerParams = extraPartnerParams,
-                  onResult = { res -> handleResultCallback(res) },
-                )
-              }
-            })
+              })
+            }
+          } else {
+            RenderSmartSelfieCaptureContent()
           }
         }
       }
     }
   }
+
+  @Composable
+  private fun RenderSmartSelfieCaptureContent() {
+    val userId = randomUserId()
+    val jobId = randomJobId()
+    val metadata = Metadata.default().items.toMutableStateList()
+
+    val viewModel: SelfieViewModel = viewModel(
+      factory = viewModelFactory {
+        SelfieViewModel(
+          isEnroll = false,
+          userId = userId,
+          jobId = jobId,
+          allowNewEnroll = false,
+          skipApiSubmission = true,
+          metadata = metadata,
+        )
+      },
+    )
+
+    val uiState = viewModel.uiState.collectAsStateWithLifecycle().value
+    var acknowledgedInstructions by rememberSaveable { mutableStateOf(false) }
+
+    CompositionLocalProvider(
+      LocalMetadata provides remember { metadata },
+    ) {
+      MaterialTheme(colorScheme = SmileID.colorScheme, typography = SmileID.typography) {
+        Surface(content = {
+          when {
+            showInstructions && !acknowledgedInstructions -> SmartSelfieInstructionsScreen(
+              showAttribution = showAttribution,
+            ) {
+              acknowledgedInstructions = true
+            }
+            uiState.processingState != null -> HandleProcessingState(viewModel)
+            uiState.selfieToConfirm != null -> HandleSelfieConfirmation(
+              showConfirmation,
+              uiState,
+              viewModel,
+            )
+            else -> RenderSelfieCaptureScreen(userId, jobId, allowAgentMode ?: true, viewModel)
+          }
+        })
+      }
+    }
+  }
+
+  @Composable
+  private fun RenderSelfieCaptureScreen(
+    userId: String,
+    jobId: String,
+    allowAgentMode: Boolean,
+    viewModel: SelfieViewModel,
+  ) {
+    Box(
+      modifier = Modifier
+        .background(color = Color.White)
+        .windowInsetsPadding(WindowInsets.statusBars)
+        .consumeWindowInsets(WindowInsets.statusBars)
+        .fillMaxSize(),
+    ) {
+      SelfieCaptureScreen(
+        userId = userId,
+        jobId = jobId,
+        allowAgentMode = allowAgentMode,
+        allowNewEnroll = false,
+        skipApiSubmission = true,
+        viewModel = viewModel,
+      )
+    }
+  }
+
+  @Composable
+  private fun HandleSelfieConfirmation(
+    showConfirmation: Boolean,
+    uiState: SelfieUiState,
+    viewModel: SelfieViewModel,
+  ) {
+    if (showConfirmation) {
+      ImageCaptureConfirmationDialog(
+        titleText = stringResource(R.string.si_smart_selfie_confirmation_dialog_title),
+        subtitleText = stringResource(R.string.si_smart_selfie_confirmation_dialog_subtitle),
+        painter = BitmapPainter(
+          BitmapFactory
+            .decodeFile(uiState.selfieToConfirm!!.absolutePath)
+            .asImageBitmap()
+        ),
+        confirmButtonText = stringResource(R.string.si_smart_selfie_confirmation_dialog_confirm_button),
+        onConfirm = {
+          viewModel.submitJob()
+        },
+        retakeButtonText = stringResource(R.string.si_smart_selfie_confirmation_dialog_retake_button),
+        onRetake = viewModel::onSelfieRejected,
+        scaleFactor = 1.25f,
+      )
+    } else {
+      // If confirmation is disabled, automatically confirm
+      viewModel.submitJob()
+    }
+  }
+
+  @Composable
+  private fun HandleProcessingState(viewModel: SelfieViewModel) {
+    try {
+      viewModel.onFinished { res -> handleResultCallback(res)}
+    } catch (e: Exception) {
+      emitFailure(e)
+    }
+  }
 }