TIQR-481: Rename 'eHerkenning' to 'eIDAS'

Tiqr · Nov 15, 2024 · ef654d6 · ef654d6
1 parent 82961fb
commit ef654d6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/app/src/main/kotlin/nl/eduid/di/model/EduIdModels.kt b/app/src/main/kotlin/nl/eduid/di/model/EduIdModels.kt
@@ -134,7 +134,7 @@ data class ExternalLinkedAccount(
 @JsonClass(generateAdapter = true)
 data class ExternalLinkedAccountIssuer(
     val id: String,
-    val name: String
+    val name: String?
 ) : Parcelable
 
 @Parcelize

diff --git a/app/src/main/kotlin/nl/eduid/di/model/ModelToState.kt b/app/src/main/kotlin/nl/eduid/di/model/ModelToState.kt
@@ -1,12 +1,9 @@
 package nl.eduid.di.model
 
-import com.squareup.moshi.Moshi
 import kotlinx.collections.immutable.toImmutableList
 import nl.eduid.screens.personalinfo.PersonalInfo
-import java.net.URLEncoder
 import java.time.Instant
 import java.time.LocalDate
-import java.time.ZoneId
 import java.time.ZoneOffset
 
 fun LinkedAccount.mapToInstitutionAccount(): PersonalInfo.InstitutionAccount? =

diff --git a/app/src/main/kotlin/nl/eduid/screens/personalinfo/verified/VerifiedPersonalInfoScreen.kt b/app/src/main/kotlin/nl/eduid/screens/personalinfo/verified/VerifiedPersonalInfoScreen.kt
@@ -48,6 +48,7 @@ import nl.eduid.ui.VerifiedInfoField
 import nl.eduid.ui.getShortDateString
 import nl.eduid.ui.theme.ColorScale_Gray_200
 import nl.eduid.ui.theme.EduidAppAndroidTheme
+import nl.eduid.util.normalizedIssuerName
 
 @Composable
 fun VerifiedPersonalInfoRoute(
@@ -171,7 +172,7 @@ fun VerifiedPersonalInfoScreen(
                     color = MaterialTheme.colorScheme.onSecondary
                 ), text = stringResource(
                     R.string.YourVerifiedInformation_FromInstitution_COPY,
-                    account.institution
+                    account.institution.normalizedIssuerName()
                 ), modifier = Modifier.fillMaxWidth()
             )
             Spacer(Modifier.size(12.dp))
@@ -217,7 +218,7 @@ fun VerifiedPersonalInfoScreen(
                 VerifiedInfoField(
                     title = it, subtitle = stringResource(
                         id = R.string.YourVerifiedInformation_AtInstitution_COPY,
-                        account.institution
+                        account.institution.normalizedIssuerName()
                     )
                 )
                 Spacer(Modifier.size(24.dp))

diff --git a/app/src/main/kotlin/nl/eduid/ui/ConnectionCard.kt b/app/src/main/kotlin/nl/eduid/ui/ConnectionCard.kt
@@ -55,6 +55,7 @@ import nl.eduid.ui.theme.ColorAlertRed
 import nl.eduid.ui.theme.ColorScale_Gray_500
 import nl.eduid.ui.theme.ColorSupport_Blue_100
 import nl.eduid.ui.theme.EduidAppAndroidTheme
+import nl.eduid.util.normalizedIssuerName
 import java.util.Locale
 
 @Composable
@@ -103,7 +104,7 @@ fun ConnectionCard(
                     Text(
                         text = stringResource(
                             id = R.string.Profile_VerifiedBy_COPY,
-                            confirmedByInstitution.institution
+                            confirmedByInstitution.institution.normalizedIssuerName()
                         ),
                         style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
                     )
@@ -243,7 +244,7 @@ private fun InstitutionInfoBlock(
     Modifier.fillMaxWidth()
 ) {
     InfoRowOld(
-        label = stringResource(R.string.Profile_VerifiedBy_COPY, institutionInfo.institution)
+        label = stringResource(R.string.Profile_VerifiedBy_COPY, institutionInfo.institution.normalizedIssuerName())
                 + stringResource(
             R.string.Profile_VerifiedOn_COPY, institutionInfo.createdStamp.getShortDateString()
         )

diff --git a/app/src/main/kotlin/nl/eduid/ui/InfoField.kt b/app/src/main/kotlin/nl/eduid/ui/InfoField.kt
@@ -52,6 +52,7 @@ import nl.eduid.ui.theme.BlueButton
 import nl.eduid.ui.theme.ColorScale_Gray_500
 import nl.eduid.ui.theme.ColorSupport_Blue_100
 import nl.eduid.ui.theme.EduidAppAndroidTheme
+import nl.eduid.util.normalizedIssuerName
 import java.util.Locale
 
 @Composable
@@ -339,7 +340,7 @@ fun ExpandableVerifiedInfoField(
                     Text(
                         text = stringResource(
                             id = R.string.Profile_VerifiedBy_COPY,
-                            confirmedByInstitution.institution
+                            confirmedByInstitution.institution.normalizedIssuerName()
                         ),
                         style = MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold),
                     )

diff --git a/app/src/main/kotlin/nl/eduid/util/Extensions.kt b/app/src/main/kotlin/nl/eduid/util/Extensions.kt
@@ -0,0 +1,18 @@
+package nl.eduid.util
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import nl.eduid.R
+import nl.eduid.di.model.ExternalLinkedAccountIssuer
+import nl.eduid.di.model.IdpScoping
+
+@Composable
+fun String.normalizedIssuerName(): String {
+    if (this == IdpScoping.EHERKENNING.toString()) {
+        return stringResource(R.string.ReferenceNames_Eherkenning_COPY)
+    } else if (this == IdpScoping.IDIN.toString()) {
+        return stringResource(R.string.ReferenceNames_Idin_COPY)
+    } else {
+        return this
+    }
+}