[MS-1169] MF-ID: Enrol Last, adding a Credential save dialog

feature/client-api/src/main/java/com/simprints/feature/clientapi/ClientApiViewModel.kt

@@ -115,6 +115,7 @@ class ClientApiViewModel @Inject internal constructor(
                     sessionId = currentSessionId,
                     enrolledGuid = enrolResponse.guid,
                     subjectActions = coSyncEnrolmentRecords,
+                    externalCredential = enrolResponse.externalCredential,
                 ),
             ),
         )

feature/client-api/src/main/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapper.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.core.os.bundleOf
 import com.simprints.core.DeviceID
 import com.simprints.core.PackageVersionName
+import com.simprints.core.domain.externalcredential.ExternalCredential
 import com.simprints.core.domain.response.AppErrorReason
 import com.simprints.infra.orchestration.data.ActionResponse
 import com.simprints.libsimprints.Constants
@@ -32,6 +33,7 @@ internal class LibSimprintsResponseMapper @Inject constructor(
             Constants.SIMPRINTS_DEVICE_ID to deviceId,
             Constants.SIMPRINTS_APP_VERSION_NAME to appVersionName,
             Constants.SIMPRINTS_BIOMETRICS_COMPLETE_CHECK to true,
+            HAS_CREDENTIAL to (response.externalCredential != null),
         ).appendDataPerContractVersion(response) { version ->
             when {
                 version < VersionsList.INITIAL_REWORK -> putParcelable(
@@ -42,6 +44,7 @@ internal class LibSimprintsResponseMapper @Inject constructor(
                 else -> putString(Constants.SIMPRINTS_ENROLMENT, Enrolment(response.enrolledGuid).toJson())
             }
         }.appendCoSyncData(response.subjectActions)
+            .appendExternalCredential(response.externalCredential)
 
         is ActionResponse.IdentifyActionResponse -> bundleOf(
             Constants.SIMPRINTS_SESSION_ID to response.sessionId,
@@ -73,18 +76,7 @@ internal class LibSimprintsResponseMapper @Inject constructor(
                 Constants.SIMPRINTS_APP_VERSION_NAME to appVersionName,
                 Constants.SIMPRINTS_BIOMETRICS_COMPLETE_CHECK to true,
                 HAS_CREDENTIAL to (response.externalCredential != null),
-            ).also { bundle ->
-                val credentialJson = response.externalCredential?.let {
-                    JSONObject()
-                        .also {
-                            it.put(SCANNED_CREDENTIAL_VALUE, response.externalCredential?.value)
-                            it.put(SCANNED_CREDENTIAL_TYPE, response.externalCredential?.type)
-                        }.toString()
-                }
-                if (credentialJson != null) {
-                    bundle.putString(SCANNED_CREDENTIAL, credentialJson)
-                }
-            }
+            ).appendExternalCredential(response.externalCredential)
         }
 
         is ActionResponse.VerifyActionResponse -> bundleOf(
@@ -160,6 +152,18 @@ internal class LibSimprintsResponseMapper @Inject constructor(
         actions?.let { putString(Constants.SIMPRINTS_COSYNC_SUBJECT_ACTIONS, it) }
     }
 
+    private fun Bundle.appendExternalCredential(credential: ExternalCredential?) = apply {
+        if (credential != null) {
+            val credentialJson =
+                JSONObject()
+                    .also {
+                        it.put(SCANNED_CREDENTIAL_VALUE, credential.value)
+                        it.put(SCANNED_CREDENTIAL_TYPE, credential.type)
+                    }.toString()
+            putString(SCANNED_CREDENTIAL, credentialJson)
+        }
+    }
+
     private fun AppErrorReason.libSimprintsResultCode() = when (this) {
         AppErrorReason.UNEXPECTED_ERROR -> Constants.SIMPRINTS_UNEXPECTED_ERROR
         AppErrorReason.ROOTED_DEVICE -> Constants.SIMPRINTS_ROOTED_DEVICE

feature/client-api/src/test/java/com/simprints/feature/clientapi/ClientApiViewModelTest.kt

@@ -142,7 +142,10 @@ internal class ClientApiViewModelTest {
     fun `handleEnrolResponse saves correct events`() = runTest {
         viewModel.handleEnrolResponse(
             mockRequest(),
-            mockk { every { guid } returns "guid" },
+            mockk {
+                every { guid } returns "guid"
+                every { externalCredential } returns null
+            },
         )
 
         coVerify {

feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/CommCareResponseMapperTest.kt

@@ -31,6 +31,7 @@ class CommCareResponseMapperTest {
                 sessionId = "sessionId",
                 enrolledGuid = "guid",
                 subjectActions = "subjects",
+                externalCredential = null,
             ),
         ).getBundle(CommCareConstants.COMMCARE_BUNDLE_KEY) ?: bundleOf()
 

feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/LibSimprintsResponseMapperTest.kt

@@ -40,6 +40,7 @@ class LibSimprintsResponseMapperTest {
                 sessionId = "sessionId",
                 enrolledGuid = "guid",
                 subjectActions = "subjects",
+                externalCredential = null,
             ),
         )
 
@@ -62,6 +63,7 @@ class LibSimprintsResponseMapperTest {
                 sessionId = "sessionId",
                 enrolledGuid = "guid",
                 subjectActions = "subjects",
+                externalCredential = null,
             ),
         )
 

feature/client-api/src/test/java/com/simprints/feature/clientapi/mappers/response/OdkResponseMapperTest.kt

@@ -27,6 +27,7 @@ class OdkResponseMapperTest {
                 sessionId = "sessionId",
                 enrolledGuid = "guid",
                 subjectActions = "subjects",
+                externalCredential = null,
             ),
         )
 

feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/ConsentViewModel.kt

@@ -82,20 +82,23 @@ internal class ConsentViewModel @Inject constructor(
         selectedTabIndex: Int,
     ): ConsentViewState {
         val allowParentalConsent = projectConfig.consent.allowParentalConsent
+        val isMultiFactorIdEnabled = projectConfig.multifactorId?.allowedExternalCredentials?.isNotEmpty() ?: false
 
         return ConsentViewState(
             showLogo = projectConfig.consent.displaySimprintsLogo,
             showParentalConsent = allowParentalConsent,
             consentTextBuilder = GeneralConsentTextHelper(
-                projectConfig.consent,
-                projectConfig.general.modalities,
-                consentType,
+                config = projectConfig.consent,
+                modalities = projectConfig.general.modalities,
+                consentType = consentType,
+                isMultiFactorIdEnabled = isMultiFactorIdEnabled,
             ),
             parentalTextBuilder = if (allowParentalConsent) {
                 ParentalConsentTextHelper(
-                    projectConfig.consent,
-                    projectConfig.general.modalities,
-                    consentType,
+                    config = projectConfig.consent,
+                    modalities = projectConfig.general.modalities,
+                    consentType = consentType,
+                    isMultiFactorIdEnabled = isMultiFactorIdEnabled,
                 )
             } else {
                 null

feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/GeneralConsentTextHelper.kt

@@ -10,17 +10,21 @@ internal data class GeneralConsentTextHelper(
     private val config: ConsentConfiguration,
     private val modalities: List<Modality>,
     private val consentType: ConsentType,
+    private val isMultiFactorIdEnabled: Boolean,
 ) {
     // TODO All the `getString(id).format(arg,arg)` calls should be `getString(id,arg,arg)` one strings are fixed
 
-    // First argument in consent text should always be program name, second is modality specific access/use case text
     fun assembleText(context: Context) = StringBuilder()
         .apply {
             val modalityUseCase = getModalitySpecificUseCaseText(context, modalities)
-            val modalityAccess = getModalitySpecificAccessText(context, modalities)
+            val modalityAccess =
+                getModalitySpecificAccessText(context, modalities) + getMultiFactorIdAccessText(context, isMultiFactorIdEnabled)
 
-            filterAppRequestForConsent(context, consentType, config, modalityUseCase)
-            filterForDataSharingOptions(context, config, modalityUseCase, modalityAccess)
+            val requestModalityUseCase = modalityUseCase + getMultiFactorIdUseCaseText(context, isMultiFactorIdEnabled)
+            val dataSharingModalityUseCase = modalityUseCase + getMultiFactorIdSharingText(context, isMultiFactorIdEnabled)
+
+            filterAppRequestForConsent(context, consentType, config, requestModalityUseCase)
+            filterForDataSharingOptions(context, config, dataSharingModalityUseCase, modalityAccess)
         }.toString()
 
     private fun StringBuilder.filterAppRequestForConsent(
@@ -134,4 +138,42 @@ internal data class GeneralConsentTextHelper(
         Modality.FACE -> context.getString(R.string.consent_biometrics_access_face)
         Modality.FINGERPRINT -> context.getString(R.string.consent_biometrics_access_fingerprint)
     }
+
+    private fun getMultiFactorIdUseCaseText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_general),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdAccessText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_credentials_access),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdSharingText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_your_id),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
 }

feature/consent/src/main/java/com/simprints/feature/consent/screens/consent/helpers/ParentalConsentTextHelper.kt

@@ -10,17 +10,20 @@ internal data class ParentalConsentTextHelper(
     private val config: ConsentConfiguration,
     private val modalities: List<Modality>,
     private val consentType: ConsentType,
+    private val isMultiFactorIdEnabled: Boolean,
 ) {
     // TODO All the `getString(id).format(arg,arg)` calls should be `getString(id,arg,arg)` one strings are fixed
 
-    // First argument in consent text should always be program name, second is modality specific access/use case text
     fun assembleText(context: Context): String = StringBuilder()
         .apply {
             val modalityUseCase = getModalitySpecificUseCaseText(context, modalities)
-            val modalityAccess = getModalitySpecificAccessText(context, modalities)
+            val modalityAccess =
+                getModalitySpecificAccessText(context, modalities) + getMultiFactorIdAccessText(context, isMultiFactorIdEnabled)
 
-            filterAppRequestForParentalConsent(context, consentType, config, modalityUseCase)
-            extractDataSharingOptions(context, config, modalityUseCase, modalityAccess)
+            val requestModalityUseCase = modalityUseCase + getMultiFactorIdUseCaseText(context, isMultiFactorIdEnabled)
+            val dataSharingModalityUseCase = modalityUseCase + getMultiFactorIdSharingText(context, isMultiFactorIdEnabled)
+            filterAppRequestForParentalConsent(context, consentType, config, requestModalityUseCase)
+            extractDataSharingOptions(context, config, dataSharingModalityUseCase, modalityAccess)
         }.toString()
 
     private fun StringBuilder.filterAppRequestForParentalConsent(
@@ -136,4 +139,42 @@ internal data class ParentalConsentTextHelper(
         Modality.FINGERPRINT -> context.getString(R.string.consent_biometrics_access_fingerprint)
         else -> ""
     }
+
+    private fun getMultiFactorIdAccessText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_credentials_parental_access),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdUseCaseText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_parental_general),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
+
+    private fun getMultiFactorIdSharingText(
+        context: Context,
+        isMultiFactorIdEnabled: Boolean,
+    ): String = if (isMultiFactorIdEnabled) {
+        listOf(
+            ",",
+            context.getString(R.string.consent_biometric_concat_modalities),
+            context.getString(R.string.consent_credentials_parental_your_id),
+        ).joinToString(separator = " ")
+    } else {
+        ""
+    }
 }