@smile_identity/react-native 10.2.4 → 10.2.6

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

@@ -8,6 +8,7 @@ import com.smileidentity.SmileID
 import com.smileidentity.compose.SmartSelfieEnrollmentEnhanced
 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.randomUserId
 import kotlinx.coroutines.CoroutineScope
@@ -15,8 +16,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
-class SmileIDSmartSelfieEnrollmentEnhancedView(context: ReactApplicationContext) : SmileIDView(context) {
-  private val viewScope = CoroutineScope(Dispatchers.Main + Job())
+class SmileIDSmartSelfieEnrollmentEnhancedView(context: ReactApplicationContext) : SmileIDSelfieView(context) {
   override fun renderContent() {
     composeView.apply {
       setContent {
@@ -27,40 +27,10 @@ class SmileIDSmartSelfieEnrollmentEnhancedView(context: ReactApplicationContext)
             allowNewEnroll = allowNewEnroll ?: false,
             showAttribution = showAttribution,
             showInstructions = showInstructions,
+            skipApiSubmission = skipApiSubmission,
             extraPartnerParams = extraPartnerParams,
-          ) {res ->
-            viewScope.launch {
-              when (res) {
-                is SmileIDResult.Success -> {
-                  val result =
-                    SmartSelfieCaptureResult(
-                      selfieFile = res.data.selfieFile,
-                      livenessFiles = res.data.livenessFiles,
-                      apiResponse = res.data.apiResponse,
-                    )
-                  val newMoshi =
-                    SmileID.moshi
-                      .newBuilder()
-                      .add(SelfieCaptureResultAdapter.FACTORY)
-                      .build()
-                  val json =
-                    try {
-                      newMoshi
-                        .adapter(SmartSelfieCaptureResult::class.java)
-                        .toJson(result)
-                    } catch (e: Exception) {
-                      emitFailure(e)
-                      return@launch
-                    }
-                  json?.let { js ->
-                    emitSuccess(js)
-                  }
-                }
-
-                is SmileIDResult.Error -> emitFailure(res.throwable)
-              }
-            }
-          }
+            onResult = { res -> handleResultCallback(res) },
+          )
         }
       }
     }

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

@@ -1,7 +1,6 @@
 package com.smileidentity.react.views
 
 import android.content.Context
-import android.util.Log
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
@@ -9,15 +8,12 @@ import com.smileidentity.SmileID
 import com.smileidentity.compose.SmartSelfieEnrollment
 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 kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 
-class SmileIDSmartSelfieEnrollmentView(context: Context) : SmileIDView(context) {
-  private val viewScope = CoroutineScope(Dispatchers.Main + Job())
+class SmileIDSmartSelfieEnrollmentView(context: Context) : SmileIDSelfieView(context) {
   override fun renderContent() {
     composeView.apply {
       setContent {
@@ -25,44 +21,15 @@ class SmileIDSmartSelfieEnrollmentView(context: Context) : SmileIDView(context)
         CompositionLocalProvider(LocalViewModelStoreOwner provides customViewModelStoreOwner) {
           SmileID.SmartSelfieEnrollment(
             userId = userId ?: rememberSaveable { randomUserId() },
+            jobId = jobId ?: rememberSaveable { randomJobId() },
             allowAgentMode = allowAgentMode ?: false,
             allowNewEnroll = allowNewEnroll ?: false,
             showAttribution = showAttribution,
             showInstructions = showInstructions,
+            skipApiSubmission = skipApiSubmission,
             extraPartnerParams = extraPartnerParams,
-          ) { res ->
-            viewScope.launch {
-              when (res) {
-                is SmileIDResult.Success -> {
-                  val result =
-                    SmartSelfieCaptureResult(
-                      selfieFile = res.data.selfieFile,
-                      livenessFiles = res.data.livenessFiles,
-                      apiResponse = res.data.apiResponse,
-                    )
-                  val newMoshi =
-                    SmileID.moshi
-                      .newBuilder()
-                      .add(SelfieCaptureResultAdapter.FACTORY)
-                      .build()
-                  val json =
-                    try {
-                      newMoshi
-                        .adapter(SmartSelfieCaptureResult::class.java)
-                        .toJson(result)
-                    } catch (e: Exception) {
-                      emitFailure(e)
-                      return@launch
-                    }
-                  json?.let { js ->
-                    emitSuccess(js)
-                  }
-                }
-
-                is SmileIDResult.Error -> emitFailure(res.throwable)
-              }
-            }
-          }
+            onResult = { res -> handleResultCallback(res)},
+          )
         }
       }
     }

package/ios/RNSmileID.swift

@@ -171,10 +171,23 @@ class RNSmileID: NSObject {
             return
         }
 
+        let consentInfo: ConsentInformation
+        if let consentInformation = request["consentInformation"] as? NSDictionary{
+          consentInfo = consentInformation.toConsentInfo()
+        } else  {
+          consentInfo = ConsentInformation(
+            consentGrantedDate: getCurrentIsoTimestamp(),
+            personalDetailsConsentGranted: false,
+            contactInformationConsentGranted: false,
+            documentInformationConsentGranted: false
+          )
+        }
+
         let request = EnhancedKycRequest(
             country: country,
             idType: idType,
             idNumber: idNumber,
+            consentInformation: consentInfo,
             firstName: request["firstName"] as? String,
             middleName: request["middleName"] as? String,
             lastName: request["lastName"] as? String,
@@ -234,10 +247,16 @@ class RNSmileID: NSObject {
             return
         }
 
+        guard let consentInformation = request["consentInformation"] as? NSDictionary else {
+            reject("doEnhancedKyc", "consentInformation is required", nil)
+            return
+        }
+
         let request = EnhancedKycRequest(
             country: country,
             idType: idType,
             idNumber: idNumber,
+            consentInformation: consentInformation.toConsentInfo(),
             firstName: request["firstName"] as? String,
             middleName: request["middleName"] as? String,
             lastName: request["lastName"] as? String,

package/ios/Utils/SmileIDDictExt.swift

@@ -2,235 +2,261 @@ import Foundation
 import SmileID
 
 extension NSDictionary {
-    func toConfig() -> Config {
-        return Config(
-            partnerId: (self["partnerId"] as? String)!,
-            authToken: (self["authToken"] as? String)!,
-            prodLambdaUrl: (self["prodLambdaUrl"] as? String)!,
-            testLambdaUrl: (self["testLambdaUrl"] as? String)!
-        )
+  func toConfig() -> Config {
+    return Config(
+      partnerId: (self["partnerId"] as? String)!,
+      authToken: (self["authToken"] as? String)!,
+      prodLambdaUrl: (self["prodLambdaUrl"] as? String)!,
+      testLambdaUrl: (self["testLambdaUrl"] as? String)!
+    )
+  }
+  
+  func toAuthenticationRequest() -> AuthenticationRequest? {
+    guard let jobTypeValue = self["jobType"] as? Int,
+          let jobType = JobType(rawValue: jobTypeValue),
+          let jobId = self["jobId"] as? String,
+          let userId = self["userId"] as? String
+    else {
+      return nil
     }
-
-    func toAuthenticationRequest() -> AuthenticationRequest? {
-        guard let jobTypeValue = self["jobType"] as? Int,
-              let jobType = JobType(rawValue: jobTypeValue),
-              let jobId = self["jobId"] as? String,
-              let userId = self["userId"] as? String
-        else {
-            return nil
-        }
-
-        let country = self["country"] as? String
-        let idType = self["idType"] as? String
-        let updateEnrolledImage = self["updateEnrolledImage"] as? Bool
-
-        return AuthenticationRequest(
-            jobType: jobType,
-            updateEnrolledImage: updateEnrolledImage,
-            jobId: jobId,
-            userId: userId,
-            country: country,
-            idType: idType
-        )
+    
+    let country = self["country"] as? String
+    let idType = self["idType"] as? String
+    let updateEnrolledImage = self["updateEnrolledImage"] as? Bool
+    
+    return AuthenticationRequest(
+      jobType: jobType,
+      updateEnrolledImage: updateEnrolledImage,
+      jobId: jobId,
+      userId: userId,
+      country: country,
+      idType: idType
+    )
+  }
+  
+  func toPrepUploadRequest() -> PrepUploadRequest? {
+    guard let partnerParamsDict = self["partnerParams"] as? NSDictionary,
+          let partnerParams = partnerParamsDict.toPartnerParams(),
+          let callbackUrl = self["callbackUrl"] as? String,
+          let partnerId = self["partnerId"] as? String,
+          let timestamp = self["timestamp"] as? String,
+          let signature = self["signature"] as? String
+    else {
+      return nil
     }
-
-    func toPrepUploadRequest() -> PrepUploadRequest? {
-        guard let partnerParamsDict = self["partnerParams"] as? NSDictionary,
-              let partnerParams = partnerParamsDict.toPartnerParams(),
-              let callbackUrl = self["callbackUrl"] as? String,
-              let partnerId = self["partnerId"] as? String,
-              let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String
-        else {
-            return nil
-        }
-
-        return PrepUploadRequest(
-            partnerParams: partnerParams,
-            callbackUrl: callbackUrl,
-            partnerId: partnerId,
-            sourceSdk: self["sourceSdk"] as? String ?? "ios (react-native)",
-            timestamp: timestamp,
-            signature: signature
-        )
+    
+    return PrepUploadRequest(
+      partnerParams: partnerParams,
+      callbackUrl: callbackUrl,
+      partnerId: partnerId,
+      sourceSdk: self["sourceSdk"] as? String ?? "ios (react-native)",
+      timestamp: timestamp,
+      signature: signature
+    )
+  }
+  
+  func toUploadRequest() -> UploadRequest? {
+    guard let imagesArray = self["images"] as? [NSDictionary] else {
+      return nil
     }
-
-    func toUploadRequest() -> UploadRequest? {
-        guard let imagesArray = self["images"] as? [NSDictionary] else {
-            return nil
-        }
-        let images = imagesArray.compactMap { $0.toUploadImageInfo() }
-        let idInfo = (self["idInfo"] as? NSDictionary)?.toIdInfo()
-
-        return UploadRequest(
-            images: images,
-            idInfo: idInfo
-        )
+    let images = imagesArray.compactMap { $0.toUploadImageInfo() }
+    let idInfo = (self["idInfo"] as? NSDictionary)?.toIdInfo()
+    
+    return UploadRequest(
+      images: images,
+      idInfo: idInfo
+    )
+  }
+  
+  func toUploadImageInfo() -> UploadImageInfo? {
+    guard let imageTypeIdValue = self["imageTypeId"] as? String,
+          let imageTypeId = ImageType(rawValue: imageTypeIdValue),
+          let imageName = self["imageName"] as? String
+    else {
+      return nil
     }
-
-    func toUploadImageInfo() -> UploadImageInfo? {
-        guard let imageTypeIdValue = self["imageTypeId"] as? String,
-              let imageTypeId = ImageType(rawValue: imageTypeIdValue),
-              let imageName = self["imageName"] as? String
-        else {
-            return nil
-        }
-
-        return UploadImageInfo(
-            imageTypeId: imageTypeId,
-            fileName: imageName
-        )
+    
+    return UploadImageInfo(
+      imageTypeId: imageTypeId,
+      fileName: imageName
+    )
+  }
+  
+  func toIdInfo() -> IdInfo? {
+    guard let country = self["country"] as? String else {
+      return nil
     }
-
-    func toIdInfo() -> IdInfo? {
-        guard let country = self["country"] as? String else {
-            return nil
-        }
-
-        let idType = self["idType"] as? String
-        let idNumber = self["idNumber"] as? String
-        let firstName = self["firstName"] as? String
-        let middleName = self["middleName"] as? String
-        let lastName = self["lastName"] as? String
-        let dob = self["dob"] as? String
-        let bankCode = self["bankCode"] as? String
-        let entered = self["entered"] as? Bool
-
-        return IdInfo(
-            country: country,
-            idType: idType,
-            idNumber: idNumber,
-            firstName: firstName,
-            middleName: middleName,
-            lastName: lastName,
-            dob: dob,
-            bankCode: bankCode,
-            entered: entered
-        )
+    
+    let idType = self["idType"] as? String
+    let idNumber = self["idNumber"] as? String
+    let firstName = self["firstName"] as? String
+    let middleName = self["middleName"] as? String
+    let lastName = self["lastName"] as? String
+    let dob = self["dob"] as? String
+    let bankCode = self["bankCode"] as? String
+    let entered = self["entered"] as? Bool
+    
+    return IdInfo(
+      country: country,
+      idType: idType,
+      idNumber: idNumber,
+      firstName: firstName,
+      middleName: middleName,
+      lastName: lastName,
+      dob: dob,
+      bankCode: bankCode,
+      entered: entered
+    )
+  }
+  
+  func toConsentInfo() -> ConsentInformation {
+    let consentGrantedDate = self["consentGrantedDate"] as? String ?? getCurrentIsoTimestamp()
+    let personalDetailsConsentGranted = self["personalDetailsConsentGranted"] as? Bool ?? false
+    let contactInfoConsentGranted = self["contactInfoConsentGranted"] as? Bool ?? false
+    let documentInfoConsentGranted = self["documentInfoConsentGranted"] as? Bool ?? false
+    return ConsentInformation(
+      consentGrantedDate: consentGrantedDate,
+      personalDetailsConsentGranted: personalDetailsConsentGranted,
+      contactInformationConsentGranted: contactInfoConsentGranted,
+      documentInformationConsentGranted: documentInfoConsentGranted
+    )
+  }
+  
+  func toEnhancedKycRequest() -> EnhancedKycRequest? {
+    guard let country = self["country"] as? String,
+          let idType = self["idType"] as? String,
+          let idNumber = self["idNumber"] as? String,
+          let firstName = self["firstName"] as? String,
+          let middleName = self["middleName"] as? String,
+          let lastName = self["lastName"] as? String,
+          let dob = self["dob"] as? String,
+          let phoneNumber = self["phoneNumber"] as? String,
+          let bankCode = self["bankCode"] as? String,
+          let callbackUrl = self["callbackUrl"] as? String,
+          let partnerParamsDict = self["partnerParams"] as? NSDictionary,
+          let partnerParams = partnerParamsDict.toPartnerParams(),
+          let timestamp = self["timestamp"] as? String,
+          let signature = self["signature"] as? String
+    else {
+      return nil
     }
-
-    func toEnhancedKycRequest() -> EnhancedKycRequest? {
-        guard let country = self["country"] as? String,
-              let idType = self["idType"] as? String,
-              let idNumber = self["idNumber"] as? String,
-              let firstName = self["firstName"] as? String,
-              let middleName = self["middleName"] as? String,
-              let lastName = self["lastName"] as? String,
-              let dob = self["dob"] as? String,
-              let phoneNumber = self["phoneNumber"] as? String,
-              let bankCode = self["bankCode"] as? String,
-              let callbackUrl = self["callbackUrl"] as? String,
-              let partnerParamsDict = self["partnerParams"] as? NSDictionary,
-              let partnerParams = partnerParamsDict.toPartnerParams(),
-              let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String
-        else {
-            return nil
-        }
-
-        return EnhancedKycRequest(
-            country: country,
-            idType: idType,
-            idNumber: idNumber,
-            firstName: firstName,
-            middleName: middleName,
-            lastName: lastName,
-            dob: dob,
-            phoneNumber: phoneNumber,
-            bankCode: bankCode,
-            callbackUrl: callbackUrl,
-            partnerParams: partnerParams,
-            sourceSdk: self["sourceSdk"] as? String ?? "ios (react-native)",
-            timestamp: timestamp,
-            signature: signature
-        )
+    
+    let consentInfo: ConsentInformation
+    if let consentInformation = self["consentInformation"] as? NSDictionary{
+      consentInfo = consentInformation.toConsentInfo()
+    } else  {
+      consentInfo = ConsentInformation(
+        consentGrantedDate: getCurrentIsoTimestamp(),
+        personalDetailsConsentGranted: false,
+        contactInformationConsentGranted: false,
+        documentInformationConsentGranted: false
+      )
     }
-
-    func toJobStatusRequest() -> JobStatusRequest? {
-        guard let userId = self["userId"] as? String,
-              let jobId = self["jobId"] as? String,
-              let includeImageLinks = self["includeImageLinks"] as? Bool,
-              let includeHistory = self["includeHistory"] as? Bool,
-              let partnerId = self["partnerId"] as? String,
-              let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String
-        else {
-            return nil
-        }
-
-        return JobStatusRequest(
-            userId: userId,
-            jobId: jobId,
-            includeImageLinks: includeImageLinks,
-            includeHistory: includeHistory,
-            partnerId: partnerId,
-            timestamp: timestamp,
-            signature: signature
-        )
+    
+    return EnhancedKycRequest(
+      country: country,
+      idType: idType,
+      idNumber: idNumber,
+      consentInformation: consentInfo,
+      firstName: firstName,
+      middleName: middleName,
+      lastName: lastName,
+      dob: dob,
+      phoneNumber: phoneNumber,
+      bankCode: bankCode,
+      callbackUrl: callbackUrl,
+      partnerParams: partnerParams,
+      sourceSdk: self["sourceSdk"] as? String ?? "ios (react-native)",
+      timestamp: timestamp,
+      signature: signature
+    )
+  }
+  
+  func toJobStatusRequest() -> JobStatusRequest? {
+    guard let userId = self["userId"] as? String,
+          let jobId = self["jobId"] as? String,
+          let includeImageLinks = self["includeImageLinks"] as? Bool,
+          let includeHistory = self["includeHistory"] as? Bool,
+          let partnerId = self["partnerId"] as? String,
+          let timestamp = self["timestamp"] as? String,
+          let signature = self["signature"] as? String
+    else {
+      return nil
     }
-
-    func toProductsConfigRequest() -> ProductsConfigRequest? {
-        guard let partnerId = self["partnerId"] as? String,
-              let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String
-        else {
-            return nil
-        }
-
-        return ProductsConfigRequest(
-            timestamp: timestamp,
-            signature: signature,
-            partnerId: partnerId
-        )
+    
+    return JobStatusRequest(
+      userId: userId,
+      jobId: jobId,
+      includeImageLinks: includeImageLinks,
+      includeHistory: includeHistory,
+      partnerId: partnerId,
+      timestamp: timestamp,
+      signature: signature
+    )
+  }
+  
+  func toProductsConfigRequest() -> ProductsConfigRequest? {
+    guard let partnerId = self["partnerId"] as? String,
+          let timestamp = self["timestamp"] as? String,
+          let signature = self["signature"] as? String
+    else {
+      return nil
     }
-
-    func toPartnerParams() -> PartnerParams? {
-        guard let country = self["country"] as? String else {
-            return nil
-        }
-        var jobType: JobType?
-        let jobId = self["jobId"] as? String
-        let userId = self["userId"] as? String
-        if let jobTypeValue = self["jobType"] as? Int {
-            jobType = JobType(rawValue: jobTypeValue)
-        }
-        let extras = self["extras"] as? [String: String] ?? [:]
-        return PartnerParams(
-            jobId: jobId ?? generateJobId(),
-            userId: userId ?? generateUserId(),
-            jobType: jobType,
-            extras: extras
-        )
+    
+    return ProductsConfigRequest(
+      timestamp: timestamp,
+      signature: signature,
+      partnerId: partnerId
+    )
+  }
+  
+  func toPartnerParams() -> PartnerParams? {
+    guard let country = self["country"] as? String else {
+      return nil
     }
+    var jobType: JobType?
+    let jobId = self["jobId"] as? String
+    let userId = self["userId"] as? String
+    if let jobTypeValue = self["jobType"] as? Int {
+      jobType = JobType(rawValue: jobTypeValue)
+    }
+    let extras = self["extras"] as? [String: String] ?? [:]
+    return PartnerParams(
+      jobId: jobId ?? generateJobId(),
+      userId: userId ?? generateUserId(),
+      jobType: jobType,
+      extras: extras
+    )
+  }
 }
 
 extension Dictionary where Key == String, Value == Any {
-    func toJSONCompatibleDictionary() -> [String: Any] {
-        var jsonCompatibleDict = [String: Any]()
-        for (key, value) in self {
-            if let arrayValue = value as? [Any] {
-                jsonCompatibleDict[key] = arrayValue.map { convertToJSONCompatible($0) }
-            } else {
-                jsonCompatibleDict[key] = convertToJSONCompatible(value)
-            }
-        }
-        return jsonCompatibleDict
+  func toJSONCompatibleDictionary() -> [String: Any] {
+    var jsonCompatibleDict = [String: Any]()
+    for (key, value) in self {
+      if let arrayValue = value as? [Any] {
+        jsonCompatibleDict[key] = arrayValue.map { convertToJSONCompatible($0) }
+      } else {
+        jsonCompatibleDict[key] = convertToJSONCompatible(value)
+      }
     }
-
-    private func convertToJSONCompatible(_ value: Any) -> Any {
-        switch value {
-        case let url as URL:
-            return url.absoluteString
-        case let bool as Bool:
-            return bool
-        case let string as String:
-            return string
-        case let number as NSNumber:
-            return number
-        case let dict as [String: Any]:
-            return dict.toJSONCompatibleDictionary()
-        default:
-            return String(describing: value)
-        }
+    return jsonCompatibleDict
+  }
+  
+  private func convertToJSONCompatible(_ value: Any) -> Any {
+    switch value {
+    case let url as URL:
+      return url.absoluteString
+    case let bool as Bool:
+      return bool
+    case let string as String:
+      return string
+    case let number as NSNumber:
+      return number
+    case let dict as [String: Any]:
+      return dict.toJSONCompatibleDictionary()
+    default:
+      return String(describing: value)
     }
+  }
 }