TIQR-475: Linking success screen

app/src/main/kotlin/nl/eduid/di/api/EduIdApi.kt

@@ -8,7 +8,6 @@ import nl.eduid.di.model.EmailChangeRequest
 import nl.eduid.di.model.EnrollResponse
 import nl.eduid.di.model.IdpScoping
 import nl.eduid.di.model.InstitutionNameResponse
-import nl.eduid.di.model.LinkedAccount
 import nl.eduid.di.model.LinkedAccountUpdateRequest
 import nl.eduid.di.model.RequestEduIdAccount
 import nl.eduid.di.model.RequestPhoneCode
@@ -78,6 +77,12 @@ interface EduIdApi {
         @Query("schac_home") schac_home: String,
     ): Response<InstitutionNameResponse>
 
+    @PUT("/mobile/api/sp/prefer-linked-account")
+    suspend fun preferLinkedAccount(
+        @Body request: LinkedAccountUpdateRequest,
+    ): Response<InstitutionNameResponse>
+
+
     @GET("/mobile/api/sp/confirm-email")
     suspend fun confirmEmail(
         @Query("h") hash: String,

app/src/main/kotlin/nl/eduid/di/assist/DataAssistant.kt

@@ -1,6 +1,7 @@
 package nl.eduid.di.assist
 
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.firstOrNull
@@ -28,7 +29,7 @@ constructor(
     private val cachedDetails = MutableStateFlow<SaveableResult<UserDetails>?>(null)
     val observableDetails: Flow<SaveableResult<UserDetails>?> = cachedDetails.map { knownValue ->
         if (knownValue == null) {
-            val fromNetwork =  try { loadInCache() } catch (ex: Exception) { return@map handleError(ex) }
+            val fromNetwork = try { loadInCache() } catch (ex: Exception) { return@map handleError(ex) }
             fromNetwork.fold(
                 onSuccess = {
                     SaveableResult.Success(it)
@@ -42,6 +43,16 @@ constructor(
         }
     }
 
+    suspend fun refreshDetails() = withContext(dispatcher) {
+        val fromNetwork = loadInCache()
+        cachedDetails.emit(
+            fromNetwork.fold(
+                onSuccess = { SaveableResult.Success(it) },
+                onFailure = { handleError(it) }
+            )
+        )
+    }
+
     private suspend fun handleError(ex: Throwable): SaveableResult.LoadError {
         return if (ex is UnauthorizedException) {
             storageRepository.clearInvalidAuth()
@@ -144,6 +155,16 @@ constructor(
         )
     }
 
+    suspend fun preferLinkedAccount(request: LinkedAccountUpdateRequest) = withContext(dispatcher) {
+        if (infoRepository.preferLinkedAccount(request)) {
+            // Also refresh the details, if it was a success, so we have the latest data
+            refreshDetails()
+            true
+        } else {
+            false
+        }
+    }
+
     suspend fun getExternalAccountLinkResult(idpScoping: IdpScoping, bankId: String?): String? = withContext(dispatcher) {
         val result = infoRepository.getExternalAccountLinkResult(idpScoping, bankId)
         result.fold(

app/src/main/kotlin/nl/eduid/di/model/EduIdModels.kt

@@ -59,6 +59,7 @@ data class UserDetails(
     val givenName: String,
     val chosenName: String,
     val familyName: String,
+    val dateOfBirth: Long?,
     val usePassword: Boolean,
     val usePublicKey: Boolean,
     val forgottenPassword: Boolean,
@@ -150,8 +151,8 @@ data class Registration(
 @Parcelize
 @JsonClass(generateAdapter = true)
 data class InstitutionNameResponse(
-    val displayNameEn: String,
-    val displayNameNl: String,
+    val displayNameEn: String?,
+    val displayNameNl: String?,
 ) : Parcelable
 
 @Parcelize

app/src/main/kotlin/nl/eduid/di/model/ModelToState.kt

@@ -24,6 +24,12 @@ fun LinkedAccount.mapToInstitutionAccount(): PersonalInfo.InstitutionAccount? =
             familyName = this.familyName,
             createdStamp = this.createdAt,
             expiryStamp = this.expiresAt,
+            updateRequest = LinkedAccountUpdateRequest(
+                eduPersonPrincipalName = this.eduPersonPrincipalName,
+                subjectId = this.subjectId,
+                external = false,
+                idpScoping = null
+            )
         )
     }
 
@@ -39,6 +45,12 @@ fun ExternalLinkedAccount.mapToInstitutionAccount(): PersonalInfo.InstitutionAcc
         dateOfBirth = this.dateOfBirth?.let { LocalDate.ofInstant(Instant.ofEpochMilli(it), ZoneOffset.UTC) },
         createdStamp = this.createdAt,
         expiryStamp = this.expiresAt,
+        updateRequest = LinkedAccountUpdateRequest(
+            eduPersonPrincipalName = null,
+            subjectId = this.subjectId,
+            external = true,
+            idpScoping = this.idpScoping
+        )
     )
 
 
@@ -57,6 +69,8 @@ fun UserDetails.mapToPersonalInfo(): PersonalInfo {
     } ?: "${this.chosenName} ${this.familyName}"
 
     val email: String = this.email
+    val dateOfBirth: LocalDate? = this.dateOfBirth?.let { LocalDate.ofInstant(Instant.ofEpochMilli(it), ZoneOffset.UTC) }
+
     val linkedInternalAccounts = linkedAccounts.mapNotNull { account ->
         account.mapToInstitutionAccount()
     }.toImmutableList()
@@ -77,6 +91,7 @@ fun UserDetails.mapToPersonalInfo(): PersonalInfo {
             givenName = givenNameConfirmer?.givenName,
             givenNameConfirmedBy = givenNameConfirmer?.institutionIdentifier
         ),
+        dateOfBirth = dateOfBirth,
         nameProvider = nameProvider,
         email = email,
         linkedInternalAccounts = linkedInternalAccounts,

app/src/main/kotlin/nl/eduid/graphs/MainGraph.kt

@@ -311,7 +311,7 @@ fun MainGraph(
     composable(Graph.FIRST_TIME_DIALOG) { entry ->
         val viewModel = hiltViewModel<LinkAccountViewModel>(entry)
         FirstTimeDialogRoute(viewModel = viewModel,
-            goToAccountLinked = { navController.goToWithPopCurrent(AccountLinked.route) },
+            goToAccountLinked = { navController.goToWithPopCurrent(AccountLinked.routeWithRegistrationFlowParam(true)) },
             skipThis = {
                 navController.navigate(Graph.HOME_PAGE) {
                     //Clear existing home page that has no account
@@ -332,7 +332,8 @@ fun MainGraph(
         })
     }
     composable(//region Account Linked
-        route = AccountLinked.route, deepLinks = listOf(
+        route = AccountLinked.routeWithArgs,
+        deepLinks = listOf(
             navDeepLink {
                 uriPattern = AccountLinked.getUriPatternOK(baseUrl)
             },
@@ -342,7 +343,8 @@ fun MainGraph(
             navDeepLink {
                 uriPattern = AccountLinked.getUriPatternExpired(baseUrl)
             },
-        )
+        ),
+        arguments = AccountLinked.arguments
     ) { entry ->
         val deepLinkIntent: Intent? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             entry.arguments?.getParcelable(
@@ -360,7 +362,13 @@ fun MainGraph(
         AccountLinkedScreen(
             viewModel = viewModel,
             result = result,
-            continueToHome = { navController.goToWithPopCurrent(Graph.HOME_PAGE) },
+            continueToHome = {
+                navController.goToWithPopCurrent(Graph.HOME_PAGE)
+            },
+            continueToPersonalInfo = {
+                navController.goToWithPopCurrent(Graph.HOME_PAGE) //Clear the entire backstack
+                navController.navigate(Graph.PERSONAL_INFO)
+            }
         )
     }//endregion
     //endregion

app/src/main/kotlin/nl/eduid/graphs/Routes.kt

@@ -5,6 +5,9 @@ import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
 import nl.eduid.di.model.SelfAssertedName
+import nl.eduid.graphs.RequestEduIdLinkSent.LOGIN_REASON
+import nl.eduid.graphs.RequestEduIdLinkSent.emailArg
+import nl.eduid.graphs.RequestEduIdLinkSent.reasonArg
 import java.io.UnsupportedEncodingException
 
 object Graph {
@@ -48,6 +51,19 @@ object AccountLinked {
     fun getUriPatternOK(baseUrl: String) = "$baseUrl/client/mobile/account-linked"
     fun getUriPatternFailed(baseUrl: String) = "$baseUrl/client/mobile/eppn-already-linked"
     fun getUriPatternExpired(baseUrl: String) = "$baseUrl/client/mobile/expired"
+
+    const val isRegistrationFlowArg = "is_registration_flow"
+
+    const val routeWithArgs = "${route}?isRegistrationFlow={$isRegistrationFlowArg}"
+    val arguments = listOf(navArgument(isRegistrationFlowArg) {
+        type = NavType.BoolType
+        nullable = false
+        defaultValue = false
+    })
+
+    fun routeWithRegistrationFlowParam(isRegistrationFlow: Boolean) =
+        "$route/isRegistrationFlow=$isRegistrationFlow"
+
 }
 
 object VerifiedPersonalInfoRoute {