Merge pull request eu-digital-identity-wallet#441 from niscy-eudiw/feature/core_updates

Support for VP v1, New RQES

Author: stzouvaras

README.md

@@ -35,7 +35,7 @@ The EUDIW project provides, through this repository, an Android app. Please refe
 
 The app consumes the SDK called EUDIW Wallet core [Wallet core](https://github.com/eu-digital-identity-wallet/eudi-lib-android-wallet-core) and a list of available libraries to facilitate remote presentation, proximity, and issuing test/demo functionality following the specification of the [ARF](https://github.com/eu-digital-identity-wallet/eudi-doc-architecture-and-reference-framework), including:
 
-- OpenID4VP - draft 24 (remote presentation), presentation exchange v2.0, DCQL
+- OpenID4VP - v1 (remote presentation), DCQL
 
 - ISO18013-5 (proximity presentation),
 

business-logic/src/dev/java/eu/europa/ec/businesslogic/config/RQESConfigImpl.kt

@@ -32,7 +32,7 @@ class RQESConfigImpl(val context: Context) : EudiRQESUiConfig {
         get() = listOf(
             QtspData(
                 name = "Wallet-Centric",
-                endpoint = "https://walletcentric.signer.eudiw.dev/csc/v2".toUriOrEmpty(),
+                endpoint = "https://walletcentric.signer.dev.eudiw.dev/csc/v2".toUriOrEmpty(),
                 tsaUrl = "https://timestamp.sectigo.com/qualified",
                 clientId = "wallet-client",
                 clientSecret = "somesecret2",

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

@@ -21,8 +21,6 @@ import eu.europa.ec.corelogic.BuildConfig
 import eu.europa.ec.eudi.wallet.EudiWalletConfig
 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.EncryptionAlgorithm
-import eu.europa.ec.eudi.wallet.transfer.openId4vp.EncryptionMethod
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.Format
 import eu.europa.ec.resourceslogic.R
 
@@ -48,17 +46,12 @@ internal class WalletCoreConfigImpl(
                         useStrongBoxForKeys = true
                     )
                     configureOpenId4Vp {
-                        withEncryptionAlgorithms(listOf(EncryptionAlgorithm.ECDH_ES))
-                        withEncryptionMethods(
+                        withClientIdSchemes(
                             listOf(
-                                EncryptionMethod.A128CBC_HS256,
-                                EncryptionMethod.A256GCM
+                                ClientIdScheme.X509SanDns,
+                                ClientIdScheme.X509Hash
                             )
                         )
-
-                        withClientIdSchemes(
-                            listOf(ClientIdScheme.X509SanDns)
-                        )
                         withSchemes(
                             listOf(
                                 BuildConfig.OPENID4VP_SCHEME,
@@ -67,7 +60,7 @@ internal class WalletCoreConfigImpl(
                             )
                         )
                         withFormats(
-                            Format.MsoMdoc, Format.SdJwtVc.ES256
+                            Format.MsoMdoc.ES256, Format.SdJwtVc.ES256
                         )
                     }
 

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

@@ -21,8 +21,6 @@ import eu.europa.ec.corelogic.BuildConfig
 import eu.europa.ec.eudi.wallet.EudiWalletConfig
 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.EncryptionAlgorithm
-import eu.europa.ec.eudi.wallet.transfer.openId4vp.EncryptionMethod
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.Format
 import eu.europa.ec.resourceslogic.R
 
@@ -48,17 +46,12 @@ internal class WalletCoreConfigImpl(
                         useStrongBoxForKeys = true
                     )
                     configureOpenId4Vp {
-                        withEncryptionAlgorithms(listOf(EncryptionAlgorithm.ECDH_ES))
-                        withEncryptionMethods(
+                        withClientIdSchemes(
                             listOf(
-                                EncryptionMethod.A128CBC_HS256,
-                                EncryptionMethod.A256GCM
+                                ClientIdScheme.X509SanDns,
+                                ClientIdScheme.X509Hash
                             )
                         )
-
-                        withClientIdSchemes(
-                            listOf(ClientIdScheme.X509SanDns)
-                        )
                         withSchemes(
                             listOf(
                                 BuildConfig.OPENID4VP_SCHEME,
@@ -67,7 +60,7 @@ internal class WalletCoreConfigImpl(
                             )
                         )
                         withFormats(
-                            Format.MsoMdoc, Format.SdJwtVc.ES256
+                            Format.MsoMdoc.ES256, Format.SdJwtVc.ES256
                         )
                     }
 

gradle/libs.versions.toml

@@ -54,7 +54,7 @@ slf4j = "2.0.17"
 gson = "2.13.2"
 googlePhoneNumber = "9.0.14"
 zxing = "3.5.3"
-eudiWalletCore = "0.19.0"
+eudiWalletCore = "0.20.0-SNAPSHOT"
 cameraCore = "1.5.0"
 owaspDependencyCheck = "12.1.3"
 material3 = "1.3.2"
@@ -63,7 +63,7 @@ sonar = "6.3.1.5724"
 baselineprofile = "1.4.1"
 timber = "5.0.1"
 treessence = "1.1.2"
-rqesUiSDK = "0.3.1"
+rqesUiSDK = "0.3.2"
 androidxRoom = "2.8.0"
 cloudy = "0.2.7"
 

wiki/configuration.md

@@ -27,11 +27,11 @@ interface WalletCoreConfig {
 You can configure the *EudiWalletConfig* per flavor. You can find both implementations inside the core-logic module at src/demo/config/WalletCoreConfigImpl and src/dev/config/WalletCoreConfigImpl
 
 ```Kotlin
-    private companion object {
-        const val VCI_ISSUER_URL = "https://issuer.eudiw.dev"
-        const val VCI_CLIENT_ID = "wallet-demo"
-        const val AUTHENTICATION_REQUIRED = false
-    }
+private companion object {
+   const val VCI_ISSUER_URL = "https://issuer.eudiw.dev"
+   const val VCI_CLIENT_ID = "wallet-demo"
+   const val AUTHENTICATION_REQUIRED = false
+}
 ```
 
 2. Trusted certificates
@@ -63,7 +63,7 @@ const val OPENID4VP_VERIFIER_API_URI = "your_verifier_url"
 const val OPENID4VP_VERIFIER_LEGAL_NAME = "your_verifier_legal_name"
 const val OPENID4VP_VERIFIER_CLIENT_ID = "your_verifier_client_id"
 
-.openId4VpConfig {
+configureOpenId4Vp {
     withClientIdSchemes(
         listOf(
             ClientIdScheme.Preregistered(
@@ -277,15 +277,15 @@ enum class DeepLinkType(val schemas: List<String>, val host: String? = null) {
 In the case of an additive change regarding OpenID4VP, you also need to update the *EudiWalletConfig* for each flavor inside the core-logic module.
 
 ```Kotlin
-.openId4VpConfig {
-    withScheme(
-        listOf(
-                BuildConfig.OPENID4VP_SCHEME,
-                BuildConfig.EUDI_OPENID4VP_SCHEME,
-                BuildConfig.MDOC_OPENID4VP_SCHEME,
-                BuildConfig.YOUR_OWN_OPENID4VP_SCHEME
-            )
-    )
+configureOpenId4Vp {
+   withSchemes(
+      listOf(
+         BuildConfig.OPENID4VP_SCHEME,
+         BuildConfig.EUDI_OPENID4VP_SCHEME,
+         BuildConfig.MDOC_OPENID4VP_SCHEME,
+         BuildConfig.YOUR_OWN_OPENID4VP_SCHEME
+      )
+   )
 }
 ```