Merge pull request eu-digital-identity-wallet#462 from niscy-eudiw/main

OpenID4VCI V1 Support

Author: stzouvaras

core-logic/src/demo/java/eu/europa/ec/corelogic/config/WalletCoreConfigImpl.kt

@@ -23,6 +23,7 @@ import eu.europa.ec.eudi.wallet.issue.openid4vci.OpenId4VciManager
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.ClientIdScheme
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.Format
 import eu.europa.ec.resourceslogic.R
+import kotlin.time.Duration.Companion.seconds
 
 internal class WalletCoreConfigImpl(
     private val context: Context
@@ -36,7 +37,7 @@ internal class WalletCoreConfigImpl(
                 _config = EudiWalletConfig {
                     configureDocumentKeyCreation(
                         userAuthenticationRequired = false,
-                        userAuthenticationTimeout = 30_000L,
+                        userAuthenticationTimeout = 30.seconds,
                         useStrongBoxForKeys = true
                     )
                     configureOpenId4Vp {
@@ -81,14 +82,14 @@ internal class WalletCoreConfigImpl(
                 .withClientId(clientId = "wallet-dev")
                 .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
                 .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-                .withUseDPoPIfSupported(true)
+                .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
                 .build(),
             OpenId4VciManager.Config.Builder()
                 .withIssuerUrl(issuerUrl = "https://issuer-backend.eudiw.dev")
                 .withClientId(clientId = "wallet-dev")
                 .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
                 .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-                .withUseDPoPIfSupported(true)
+                .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
                 .build()
         )
 }

core-logic/src/dev/java/eu/europa/ec/corelogic/config/WalletCoreConfigImpl.kt

@@ -23,6 +23,7 @@ import eu.europa.ec.eudi.wallet.issue.openid4vci.OpenId4VciManager
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.ClientIdScheme
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.Format
 import eu.europa.ec.resourceslogic.R
+import kotlin.time.Duration.Companion.seconds
 
 internal class WalletCoreConfigImpl(
     private val context: Context
@@ -36,7 +37,7 @@ internal class WalletCoreConfigImpl(
                 _config = EudiWalletConfig {
                     configureDocumentKeyCreation(
                         userAuthenticationRequired = false,
-                        userAuthenticationTimeout = 30_000L,
+                        userAuthenticationTimeout = 30.seconds,
                         useStrongBoxForKeys = true
                     )
                     configureOpenId4Vp {
@@ -81,14 +82,14 @@ internal class WalletCoreConfigImpl(
                 .withClientId(clientId = "wallet-dev")
                 .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
                 .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-                .withUseDPoPIfSupported(true)
+                .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
                 .build(),
             OpenId4VciManager.Config.Builder()
                 .withIssuerUrl(issuerUrl = "https://dev.issuer-backend.eudiw.dev")
                 .withClientId(clientId = "wallet-dev")
                 .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
                 .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-                .withUseDPoPIfSupported(true)
+                .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
                 .build()
         )
 }

core-logic/src/main/java/eu/europa/ec/corelogic/controller/WalletCoreDocumentsController.kt

@@ -251,7 +251,7 @@ class WalletCoreDocumentsControllerImpl(
                     metadata.flatMap { (issuer, meta) ->
                         meta.credentialConfigurationsSupported.map { (id, config) ->
 
-                            val name = config.display.getLocalizedDisplayName(
+                            val name: String = config.credentialMetadata.getLocalizedDisplayName(
                                 userLocale = locale,
                                 fallback = id.value
                             )
@@ -372,7 +372,14 @@ class WalletCoreDocumentsControllerImpl(
         callbackFlow {
             resolveDocumentOffer(offerUri).collect {
                 when (it) {
-                    is ResolveDocumentOfferPartialState.Failure -> throw Throwable(it.errorMessage)
+                    is ResolveDocumentOfferPartialState.Failure -> {
+                        trySendBlocking(
+                            IssueDocumentsPartialState.Failure(
+                                errorMessage = it.errorMessage
+                            )
+                        )
+                    }
+
                     is ResolveDocumentOfferPartialState.Success -> {
 
                         val issuerId = it
@@ -496,9 +503,13 @@ class WalletCoreDocumentsControllerImpl(
 
             manager.resolveDocumentOffer(offerUri) { result ->
                 when (result) {
-                    is OfferResult.Failure -> throw Throwable(
-                        result.cause.localizedMessage ?: genericErrorMessage
-                    )
+                    is OfferResult.Failure -> {
+                        trySendBlocking(
+                            ResolveDocumentOfferPartialState.Failure(
+                                result.cause.localizedMessage ?: genericErrorMessage
+                            )
+                        )
+                    }
 
                     is OfferResult.Success -> {
                         trySendBlocking(
@@ -783,10 +794,11 @@ class WalletCoreDocumentsControllerImpl(
         return listener
     }
 
-    private fun extractCredentialIssuerFromOfferUri(offerUri: String): Result<String> = runCatching {
-        val credentialOffer = offerUri.toUri().getQueryParameter("credential_offer")
-        val decoded = URLDecoder.decode(credentialOffer, "UTF-8")
-        val json = JSONObject(decoded)
-        json.getString("credential_issuer")
-    }
+    private fun extractCredentialIssuerFromOfferUri(offerUri: String): Result<String> =
+        runCatching {
+            val credentialOffer = offerUri.toUri().getQueryParameter("credential_offer")
+            val decoded = URLDecoder.decode(credentialOffer, "UTF-8")
+            val json = JSONObject(decoded)
+            json.getString("credential_issuer")
+        }
 }

core-logic/src/main/java/eu/europa/ec/corelogic/extension/DisplayExtensions.kt

@@ -17,9 +17,8 @@
 package eu.europa.ec.corelogic.extension
 
 import eu.europa.ec.businesslogic.extension.getLocalizedString
-import eu.europa.ec.eudi.openid4vci.Display
+import eu.europa.ec.eudi.openid4vci.CredentialMetadata
 import eu.europa.ec.eudi.wallet.document.metadata.IssuerMetadata
-
 import java.util.Locale
 
 /**
@@ -49,23 +48,25 @@ fun List<IssuerMetadata.Claim.Display>?.getLocalizedClaimName(
 }
 
 /**
- * Retrieves the localized display name from a list of [Display] objects based on the user's locale.
+ * Retrieves the localized display name of a document based on the user's locale.
  *
- * This function searches through a list of [Display] objects to find a display name that matches
- * the provided [userLocale]. If a matching locale is found, the corresponding name is returned.
- * If no matching locale is found, the provided [fallback] string is returned.
+ * This function attempts to find a localized version of the document's name
+ * within the [CredentialMetadata.display] property of the [CredentialMetadata] object. If a localized
+ * version matching the user's locale is found, it is returned. If no matching
+ * localized version is found, a fallback string is returned instead.
  *
- * @param userLocale The user's locale to match against.
- * @param fallback The fallback string to use if no match is found.
- * @return The localized display name if found, otherwise the [fallback] string.
+ * @param userLocale The user's locale, used to find a matching localized name.
+ * @param fallback The string to return if no matching localized name is found.
+ * @return The localized document name, or the fallback string if no matching localized name is available.
+ * If [CredentialMetadata] or its display is null, it will return the [fallback].
  *
  * @see getLocalizedString
  */
-fun List<Display>.getLocalizedDisplayName(
+fun CredentialMetadata?.getLocalizedDisplayName(
     userLocale: Locale,
     fallback: String,
 ): String {
-    return this.getLocalizedString(
+    return this?.display.getLocalizedString(
         userLocale = userLocale,
         localeExtractor = { it.locale },
         stringExtractor = { it.name },

core-logic/src/main/java/eu/europa/ec/corelogic/extension/OfferExtensions.kt

@@ -52,7 +52,7 @@ val Offer.OfferedDocument.documentIdentifier: DocumentIdentifier?
     }
 
 fun Offer.OfferedDocument.getName(locale: Locale): String? {
-    return configuration.display.getLocalizedValue(
+    return configuration.credentialMetadata?.display.getLocalizedValue(
         userLocale = locale,
         localeExtractor = { it.locale },
         valueExtractor = { it.name },

gradle/libs.versions.toml

@@ -5,8 +5,8 @@ androidGradlePlugin = "8.13.0"
 androidxActivity = "1.11.0"
 androidxAppCompat = "1.7.1"
 androidxBrowser = "1.9.0"
-androidxComposeBom = "2025.10.00"
-androidxComposeRuntimeTracing = "1.9.3"
+androidxComposeBom = "2025.10.01"
+androidxComposeRuntimeTracing = "1.9.4"
 androidxCore = "1.17.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.1.7"
@@ -24,47 +24,47 @@ androidxTestOrchestrator = "1.3.0"
 androidxTracing = "1.3.0"
 androidxUiAutomator = "2.3.0"
 androidxWindowManager = "1.5.0"
-androidxWork = "2.10.5"
+androidxWork = "2.11.0"
 androidxBiometric = "1.2.0-alpha05"
 androidxAppAuth = "1.0.0"
 coil = "3.3.0"
 constraintlayoutVersion = "1.1.1"
 gmsPlugin = "4.4.4"
 junit4 = "4.13.2"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 kotlinxCoroutines = "1.10.2"
 kotlinxDatetime = "0.7.1"
 kotlinxSerializationJson = "1.9.0"
 ksp = "2.2.20-2.0.3"
 lint = "31.13.0"
-okhttp = "5.2.1"
-protobuf = "4.32.1"
+okhttp = "5.3.0"
+protobuf = "4.33.0"
 protobufPlugin = "0.9.5"
 retrofit = "3.0.0"
 robolectric = "4.16"
 secrets = "2.0.1"
 turbine = "1.2.1"
 koin = "4.1.1"
-koinAnnotations = "2.2.0"
+koinAnnotations = "2.3.0"
 material = "1.13.0"
 mockito = "5.20.0"
 mockitoKotlin = "6.1.0"
 ktor = "3.3.1"
 slf4j = "2.0.17"
 gson = "2.13.2"
-googlePhoneNumber = "9.0.16"
+googlePhoneNumber = "9.0.17"
 zxing = "3.5.3"
-eudiWalletCore = "0.20.0"
+eudiWalletCore = "0.21.0"
 cameraCore = "1.5.1"
 owaspDependencyCheck = "12.1.8"
 material3 = "1.4.0"
-kover = "0.9.2"
-sonar = "7.0.0.6105"
+kover = "0.9.3"
+sonar = "7.0.1.6134"
 baselineprofile = "1.4.1"
 timber = "5.0.1"
 treessence = "1.1.2"
 rqesUiSDK = "0.3.4"
-androidxRoom = "2.8.2"
+androidxRoom = "2.8.3"
 cloudy = "0.2.7"
 
 [libraries]

issuance-feature/src/test/java/eu/europa/ec/issuancefeature/interactor/TestDocumentOfferInteractor.kt

@@ -31,6 +31,7 @@ import eu.europa.ec.eudi.openid4vci.CredentialConfigurationIdentifier
 import eu.europa.ec.eudi.openid4vci.CredentialIssuerEndpoint
 import eu.europa.ec.eudi.openid4vci.CredentialIssuerId
 import eu.europa.ec.eudi.openid4vci.CredentialIssuerMetadata
+import eu.europa.ec.eudi.openid4vci.CredentialMetadata
 import eu.europa.ec.eudi.openid4vci.Display
 import eu.europa.ec.eudi.openid4vci.MsoMdocCredential
 import eu.europa.ec.eudi.openid4vci.TxCode
@@ -1094,7 +1095,8 @@ class TestDocumentOfferInteractor {
             credentialConfigurationsSupported = mapOf(
                 CredentialConfigurationIdentifier("identifier") to MsoMdocCredential(
                     docType = docType,
-                    isoPolicy = null
+                    isoPolicy = null,
+                    credentialMetadata = null
                 )
             ),
             display = listOf(
@@ -1122,7 +1124,7 @@ class TestDocumentOfferInteractor {
                 MsoMdocCredential(
                     docType = mockedOfferedDocumentDocType,
                     isoPolicy = null,
-                    display = display
+                    credentialMetadata = CredentialMetadata(display = display)
                 )
             )
         }

wiki/configuration.md

@@ -34,7 +34,7 @@ override val vciConfig: List<OpenId4VciManager.Config>
       .withClientId(clientId = "wallet-dev")
       .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
       .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-      .withUseDPoPIfSupported(true)
+      .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
       .build()
 )
 ```

wiki/how_to_build.md

@@ -45,7 +45,7 @@ override val vciConfig: List<OpenId4VciManager.Config>
       .withClientId(clientId = "wallet-dev")
       .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
       .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-      .withUseDPoPIfSupported(true)
+      .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
       .build()
 )
 ```
@@ -68,7 +68,7 @@ override val vciConfig: List<OpenId4VciManager.Config>
       .withClientId(clientId = "wallet-dev")
       .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
       .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-      .withUseDPoPIfSupported(true)
+      .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
       .build()
 )
 ```
@@ -81,7 +81,7 @@ override val vciConfig: List<OpenId4VciManager.Config>
       .withClientId(clientId = "wallet-dev")
       .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
       .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-      .withUseDPoPIfSupported(true)
+      .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
       .build()
 )
 ```
@@ -95,7 +95,7 @@ override val vciConfig: List<OpenId4VciManager.Config>
       .withClientId(clientId = "wallet-dev")
       .withAuthFlowRedirectionURI(BuildConfig.ISSUE_AUTHORIZATION_DEEPLINK)
       .withParUsage(OpenId4VciManager.Config.ParUsage.IF_SUPPORTED)
-      .withUseDPoPIfSupported(true)
+      .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())
       .build()
 )
 ```