@smile_identity/react-native 10.0.0-beta02 → 10.0.0

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

@@ -1,6 +1,8 @@
 package com.smileidentity.react.views
 
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.BiometricKYC
@@ -9,6 +11,7 @@ import com.smileidentity.results.BiometricKycResult
 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) {
@@ -18,32 +21,37 @@ class SmileIDBiometricKYCView(context: ReactApplicationContext) : SmileIDView(co
       emitFailure(IllegalArgumentException("idInfo is required for BiometricKYC"))
       return
     }
-
     composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        SmileID.BiometricKYC(
-          idInfo = idInfo!!,
-          userId = userId ?: rememberSaveable { randomUserId() },
-          jobId = jobId ?: rememberSaveable { randomJobId() },
-          allowAgentMode = allowAgentMode ?: false,
-          showAttribution = showInstructions ?: true,
-        ) { result ->
-          when (result) {
-            is SmileIDResult.Success -> {
-              val json = try {
-                SmileID.moshi
-                  .adapter(BiometricKycResult::class.java)
-                  .toJson(result.data)
-              } catch (e: Exception) {
-                Timber.w(e)
-                "null"
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          SmileID.BiometricKYC(
+            idInfo = idInfo!!,
+            userId = userId ?: rememberSaveable { randomUserId() },
+            jobId = jobId ?: rememberSaveable { randomJobId() },
+            allowAgentMode = allowAgentMode ?: false,
+            allowNewEnroll = allowNewEnroll ?: false,
+            showAttribution = showAttribution ?: true,
+            showInstructions = showInstructions ?: true,
+            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
+          ) { result ->
+            when (result) {
+              is SmileIDResult.Success -> {
+                val json = try {
+                  SmileID.moshi
+                    .adapter(BiometricKycResult::class.java)
+                    .toJson(result.data)
+                } catch (e: Exception) {
+                  Timber.w(e)
+                  "null"
+                }
+                emitSuccess(json)
               }
-              emitSuccess(json)
-            }
 
-            is SmileIDResult.Error -> {
-              result.throwable.printStackTrace()
-              emitFailure(result.throwable)
+              is SmileIDResult.Error -> {
+                result.throwable.printStackTrace()
+                emitFailure(result.throwable)
+              }
             }
           }
         }

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

@@ -1,7 +1,9 @@
 package com.smileidentity.react.views
 
 import android.webkit.URLUtil
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.res.painterResource
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.ConsentScreen
@@ -39,21 +41,24 @@ class SmileIDConsentView(context: ReactApplicationContext) : SmileIDView(context
       (context as? ReactApplicationContext)?.currentActivity?.packageName
     )
     composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        SmileID.ConsentScreen(
-          partnerIcon = painterResource(
-            id = partnerIcon
-          ),
-          partnerName = partnerName!!,
-          productName = productName!!,
-          partnerPrivacyPolicy = URL(partnerPrivacyPolicy),
-          onConsentDenied = {
-            emitSuccess("denied")
-          },
-          onConsentGranted = {
-            emitSuccess("accepted")
-          },
-        )
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          SmileID.ConsentScreen(
+            partnerIcon = painterResource(
+              id = partnerIcon
+            ),
+            partnerName = partnerName!!,
+            productName = productName!!,
+            partnerPrivacyPolicy = URL(partnerPrivacyPolicy),
+            onConsentDenied = {
+              emitSuccess("denied")
+            },
+            onConsentGranted = {
+              emitSuccess("accepted")
+            },
+          )
+        }
       }
     }
   }

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

@@ -1,6 +1,8 @@
 package com.smileidentity.react.views
 
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.DocumentVerification
@@ -30,36 +32,41 @@ class SmileIDDocumentVerificationView(context: ReactApplicationContext) : SmileI
       bypassSelfieCaptureWithFile = File(it)
     }
     composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        SmileID.DocumentVerification(
-          userId = userId ?: rememberSaveable { randomUserId() },
-          jobId = jobId ?: rememberSaveable { randomJobId() },
-          countryCode = countryCode!!,
-          documentType = documentType,
-          idAspectRatio = idAspectRatio,
-          showAttribution = showAttribution ?: true,
-          showInstructions = showInstructions ?: true,
-          allowGalleryUpload = allowGalleryUpload,
-          captureBothSides = captureBothSides,
-          bypassSelfieCaptureWithFile = bypassSelfieCaptureWithFile,
-          extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-        ) { result ->
-          when (result) {
-            is SmileIDResult.Success -> {
-              val json = try {
-                SmileID.moshi
-                  .adapter(DocumentVerificationResult::class.java)
-                  .toJson(result.data)
-              } catch (e: Exception) {
-                Timber.w(e)
-                "null"
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          SmileID.DocumentVerification(
+            userId = userId ?: rememberSaveable { randomUserId() },
+            jobId = jobId ?: rememberSaveable { randomJobId() },
+            countryCode = countryCode!!,
+            documentType = documentType,
+            idAspectRatio = idAspectRatio,
+            showAttribution = showAttribution ?: true,
+            allowAgentMode = allowAgentMode ?: false,
+            showInstructions = showInstructions ?: true,
+            allowGalleryUpload = allowGalleryUpload,
+            captureBothSides = captureBothSides,
+            allowNewEnroll = allowNewEnroll ?: false,
+            bypassSelfieCaptureWithFile = bypassSelfieCaptureWithFile,
+            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
+          ) { result ->
+            when (result) {
+              is SmileIDResult.Success -> {
+                val json = try {
+                  SmileID.moshi
+                    .adapter(DocumentVerificationResult::class.java)
+                    .toJson(result.data)
+                } catch (e: Exception) {
+                  Timber.w(e)
+                  "null"
+                }
+                emitSuccess(json)
               }
-              emitSuccess(json)
-            }
 
-            is SmileIDResult.Error -> {
-              result.throwable.printStackTrace()
-              emitFailure(result.throwable)
+              is SmileIDResult.Error -> {
+                result.throwable.printStackTrace()
+                emitFailure(result.throwable)
+              }
             }
           }
         }

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

@@ -1,6 +1,8 @@
 package com.smileidentity.react.views
 
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.EnhancedDocumentVerificationScreen
@@ -24,36 +26,42 @@ class SmileIDEnhancedDocumentVerificationView(context: ReactApplicationContext)
       emitFailure(IllegalArgumentException("countryCode is required for DocumentVerification"))
       return;
     }
+
     composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        SmileID.EnhancedDocumentVerificationScreen(
-          userId = userId ?: rememberSaveable { randomUserId() },
-          jobId = jobId ?: rememberSaveable { randomJobId() },
-          countryCode = countryCode!!,
-          documentType = documentType,
-          idAspectRatio = idAspectRatio,
-          showAttribution = showAttribution ?: true,
-          showInstructions = showInstructions ?: true,
-          allowGalleryUpload = allowGalleryUpload,
-          captureBothSides = captureBothSides,
-          extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-        ) { result ->
-          when (result) {
-            is SmileIDResult.Success -> {
-              val json = try {
-                SmileID.moshi
-                  .adapter(EnhancedDocumentVerificationResult::class.java)
-                  .toJson(result.data)
-              } catch (e: Exception) {
-                Timber.w(e)
-                "null"
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          SmileID.EnhancedDocumentVerificationScreen(
+            userId = userId ?: rememberSaveable { randomUserId() },
+            jobId = jobId ?: rememberSaveable { randomJobId() },
+            countryCode = countryCode!!,
+            documentType = documentType,
+            idAspectRatio = idAspectRatio,
+            showAttribution = showAttribution ?: true,
+            allowAgentMode = allowAgentMode ?: false,
+            showInstructions = showInstructions ?: true,
+            allowNewEnroll = allowNewEnroll ?: false,
+            allowGalleryUpload = allowGalleryUpload,
+            captureBothSides = captureBothSides,
+            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
+          ) { result ->
+            when (result) {
+              is SmileIDResult.Success -> {
+                val json = try {
+                  SmileID.moshi
+                    .adapter(EnhancedDocumentVerificationResult::class.java)
+                    .toJson(result.data)
+                } catch (e: Exception) {
+                  Timber.w(e)
+                  "null"
+                }
+                emitSuccess(json)
               }
-              emitSuccess(json)
-            }
 
-            is SmileIDResult.Error -> {
-              result.throwable.printStackTrace()
-              emitFailure(result.throwable)
+              is SmileIDResult.Error -> {
+                result.throwable.printStackTrace()
+                emitFailure(result.throwable)
+              }
             }
           }
         }

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

@@ -1,6 +1,8 @@
 package com.smileidentity.react.views
 
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.SmartSelfieAuthentication
@@ -16,31 +18,35 @@ class SmileIDSmartSelfieAuthenticationView(context: ReactApplicationContext) :
 
   override fun renderContent() {
     composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        SmileID.SmartSelfieAuthentication(
-          userId = userId ?: rememberSaveable { randomUserId() },
-          jobId = jobId ?: rememberSaveable { randomJobId() },
-          allowAgentMode = allowAgentMode ?: false,
-          showAttribution = showAttribution ?: true,
-          showInstructions = showInstructions ?: true,
-          extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-        ) { result ->
-          when (result) {
-            is SmileIDResult.Success -> {
-              val json = try {
-                SmileID.moshi
-                  .adapter(SmartSelfieResult::class.java)
-                  .toJson(result.data)
-              } catch (e: Exception) {
-                Timber.w(e)
-                "null"
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          SmileID.SmartSelfieAuthentication(
+            userId = userId ?: rememberSaveable { randomUserId() },
+            jobId = jobId ?: rememberSaveable { randomJobId() },
+            allowAgentMode = allowAgentMode ?: false,
+            allowNewEnroll = allowNewEnroll ?: false,
+            showAttribution = showAttribution ?: true,
+            showInstructions = showInstructions ?: true,
+            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
+          ) { result ->
+            when (result) {
+              is SmileIDResult.Success -> {
+                val json = try {
+                  SmileID.moshi
+                    .adapter(SmartSelfieResult::class.java)
+                    .toJson(result.data)
+                } catch (e: Exception) {
+                  Timber.w(e)
+                  "null"
+                }
+                emitSuccess(json)
               }
-              emitSuccess(json)
-            }
 
-            is SmileIDResult.Error -> {
-              result.throwable.printStackTrace()
-              emitFailure(result.throwable)
+              is SmileIDResult.Error -> {
+                result.throwable.printStackTrace()
+                emitFailure(result.throwable)
+              }
             }
           }
         }

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

@@ -1,6 +1,8 @@
 package com.smileidentity.react.views
 
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import com.facebook.react.bridge.ReactApplicationContext
 import com.smileidentity.SmileID
 import com.smileidentity.compose.SmartSelfieEnrollment
@@ -15,31 +17,35 @@ class SmileIDSmartSelfieEnrollmentView(context: ReactApplicationContext) : Smile
 
   override fun renderContent() {
     composeView.apply {
+      val customViewModelStoreOwner = CustomViewModelStoreOwner()
       setContent {
-        SmileID.SmartSelfieEnrollment(
-          userId = userId ?: rememberSaveable { randomUserId() },
-          jobId = jobId ?: rememberSaveable { randomJobId() },
-          allowAgentMode = allowAgentMode ?: false,
-          showAttribution = showAttribution ?: true,
-          showInstructions = showInstructions ?: true,
-          extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
-        ) { result ->
-          when (result) {
-            is SmileIDResult.Success -> {
-              val json = try {
-                SmileID.moshi
-                  .adapter(SmartSelfieResult::class.java)
-                  .toJson(result.data)
-              } catch (e: Exception) {
-                Timber.w(e)
-                "null"
+        CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
+          SmileID.SmartSelfieEnrollment(
+            userId = userId ?: rememberSaveable { randomUserId() },
+            jobId = jobId ?: rememberSaveable { randomJobId() },
+            allowAgentMode = allowAgentMode ?: false,
+            allowNewEnroll = allowNewEnroll ?: false,
+            showAttribution = showAttribution ?: true,
+            showInstructions = showInstructions ?: true,
+            extraPartnerParams = (extraPartnerParams ?: mapOf()).toImmutableMap(),
+          ) { result ->
+            when (result) {
+              is SmileIDResult.Success -> {
+                val json = try {
+                  SmileID.moshi
+                    .adapter(SmartSelfieResult::class.java)
+                    .toJson(result.data)
+                } catch (e: Exception) {
+                  Timber.w(e)
+                  "null"
+                }
+                emitSuccess(json)
               }
-              emitSuccess(json)
-            }
 
-            is SmileIDResult.Error -> {
-              result.throwable.printStackTrace()
-              emitFailure(result.throwable)
+              is SmileIDResult.Error -> {
+                result.throwable.printStackTrace()
+                emitFailure(result.throwable)
+              }
             }
           }
         }

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

@@ -4,6 +4,7 @@ import android.view.Choreographer
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.compose.ui.platform.ComposeView
+import androidx.core.view.contains
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
@@ -13,11 +14,12 @@ import com.smileidentity.models.JobType
 import timber.log.Timber
 
 abstract class SmileIDView(context: ReactApplicationContext) : LinearLayout(context) {
-  val composeView: ComposeView = ComposeView(context.currentActivity!!)
+  lateinit var composeView: ComposeView
   var userId: String? = null
   var jobId: String? = null
   private var jobType: JobType? = null
   var allowAgentMode: Boolean? = false
+  var allowNewEnroll: Boolean? = false
   var showInstructions: Boolean? = true
   var showAttribution: Boolean? = true
   var extraPartnerParams: Map<String, String>? = null
@@ -34,19 +36,30 @@ abstract class SmileIDView(context: ReactApplicationContext) : LinearLayout(cont
     orientation = VERTICAL
     render()
 
-    composeView.layoutParams = ViewGroup.LayoutParams(
-      ViewGroup.LayoutParams.MATCH_PARENT,
-      ViewGroup.LayoutParams.MATCH_PARENT
-    )
-    addView(composeView)
-
     setupLayoutHack()
     manuallyLayoutChildren()
   }
 
+  private fun setUpViews() {
+    if (::composeView.isInitialized && contains(composeView)) {
+      removeView(composeView)
+    }
+    (context as ReactContext).currentActivity?.let {
+      it.runOnUiThread {
+        composeView = ComposeView(it)
+        composeView.layoutParams = ViewGroup.LayoutParams(
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        addView(composeView)
+      }
+    }
+  }
+
   abstract fun renderContent()
 
   open fun render() {
+    setUpViews()
     renderContent()
   }
 

package/android/src/oldarch/SmileIdSpec.kt

@@ -11,6 +11,28 @@ abstract class SmileIdSpec internal constructor(context: ReactApplicationContext
   abstract fun initialize(useSandBox: Boolean ,promise: Promise)
 
   abstract fun disableCrashReporting(promise: Promise)
-  abstract fun doEnhancedKycAsync(request: ReadableMap, promise: Promise)
+
+  abstract fun authenticate(request: ReadableMap, promise: Promise)
+
+  abstract fun prepUpload(request: ReadableMap, promise: Promise)
+
+  abstract fun upload(url: String, request: ReadableMap, promise: Promise)
+
   abstract fun doEnhancedKyc(request: ReadableMap, promise: Promise)
+
+  abstract fun doEnhancedKycAsync(request: ReadableMap, promise: Promise)
+
+  abstract fun getSmartSelfieJobStatus(request: ReadableMap, promise: Promise)
+
+  abstract fun getDocumentVerificationJobStatus(request: ReadableMap, promise: Promise)
+
+  abstract fun getBiometricKycJobStatus(request: ReadableMap, promise: Promise)
+
+  abstract fun getEnhancedDocumentVerificationJobStatus(request: ReadableMap, promise: Promise)
+
+  abstract fun getProductsConfig(request: ReadableMap, promise: Promise)
+
+  abstract fun getValidDocuments(request: ReadableMap, promise: Promise)
+
+  abstract fun getServices(promise: Promise)
 }

package/ios/RNSmileID.mm

@@ -2,6 +2,16 @@
 
 @interface RCT_EXTERN_MODULE(RNSmileID, NSObject)
 RCT_EXTERN_METHOD(initialize:(BOOL)useSandBox withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(authenticate:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(prepUpload:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(upload:(NSString *)url request:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(doEnhancedKyc:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(doEnhancedKycAsync:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getSmartSelfieJobStatus:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getDocumentVerificationJobStatus:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getBiometricKycJobStatus:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getEnhancedDocumentVerificationJobStatus:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getProductsConfig:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getValidDocuments:(NSDictionary *)request withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getServicesWithResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
 @end