Fix Client Authentication Type related unit tests

Author: sraptis-scy

wallet-core/src/test/java/eu/europa/ec/eudi/wallet/EudiWalletConfigTest.kt

@@ -16,6 +16,7 @@
 
 package eu.europa.ec.eudi.wallet
 
+import eu.europa.ec.eudi.wallet.issue.openid4vci.OpenId4VciManager
 import eu.europa.ec.eudi.wallet.logging.Logger
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.ClientIdScheme
 import eu.europa.ec.eudi.wallet.transfer.openId4vp.EncryptionAlgorithm
@@ -42,7 +43,7 @@ class EudiWalletConfigTest {
             configureDocumentManager("storage/path")
             configureOpenId4Vci {
                 withIssuerUrl("https://example.com")
-                withClientId("client-id")
+                withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.AttestationBased)
                 withAuthFlowRedirectionURI("eudi-openid4ci://authorize")
             }
             configureOpenId4Vp {
@@ -103,7 +104,7 @@ class EudiWalletConfigTest {
             config.openId4VpConfig?.encryptionMethods?.get(0)
         )
         assertEquals("https://example.com", config.openId4VciConfig?.issuerUrl)
-        assertEquals("client-id", config.openId4VciConfig?.clientId)
+        assertEquals(OpenId4VciManager.ClientAuthenticationType.AttestationBased, config.openId4VciConfig?.clientAuthenticationType)
         assertEquals("eudi-openid4ci://authorize", config.openId4VciConfig?.authFlowRedirectionURI)
 
         assertEquals(true, config.dcapiConfig?.enabled)

wallet-core/src/test/java/eu/europa/ec/eudi/wallet/issue/openid4vci/OpenId4VciManagerBuilderTest.kt

@@ -31,7 +31,7 @@ class OpenId4VciManagerBuilderTest {
     private val walletKeyManager = mockk<WalletKeyManager>(relaxed = true)
     private val config = OpenId4VciManager.Config(
         issuerUrl = "https://issuer.example.com",
-        clientId = "testClientId",
+        clientAuthenticationType = OpenId4VciManager.ClientAuthenticationType.None("testClientId"),
         authFlowRedirectionURI = "app://redirect",
         dPoPUsage = OpenId4VciManager.Config.DPoPUsage.IfSupported(),
         parUsage = OpenId4VciManager.Config.ParUsage.IF_SUPPORTED,
@@ -68,4 +68,25 @@ class OpenId4VciManagerBuilderTest {
             builder.build()
         }
     }
+
+    @Test
+    fun `Builder throws exception when walletAttestationsProvider is not set for AttestationBased authentication`() {
+        val configWithAttestationBased = OpenId4VciManager.Config(
+            issuerUrl = "https://issuer.example.com",
+            clientAuthenticationType = OpenId4VciManager.ClientAuthenticationType.AttestationBased,
+            authFlowRedirectionURI = "app://redirect",
+            dPoPUsage = OpenId4VciManager.Config.DPoPUsage.IfSupported(),
+            parUsage = OpenId4VciManager.Config.ParUsage.IF_SUPPORTED,
+        )
+
+        val builder = OpenId4VciManager.Builder(context)
+            .config(configWithAttestationBased)
+            .documentManager(documentManager)
+            .walletKeyManager(walletKeyManager)
+        // Intentionally not setting walletAttestationsProvider
+
+        assertThrows(IllegalStateException::class.java) {
+            builder.build()
+        }
+    }
 }

wallet-core/src/test/java/eu/europa/ec/eudi/wallet/issue/openid4vci/OpenId4VciManagerConfigBuilderParUsageTest.kt

@@ -30,7 +30,7 @@ class OpenId4VciManagerConfigBuilderParUsageTest(
     fun `ConfigBuilder set the parUsage property correctly`() {
         val builder = OpenId4VciManager.Config.Builder()
             .withIssuerUrl("https://issuer.example.com")
-            .withClientId("testClientId")
+            .withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.None("testClientId"))
             .withAuthFlowRedirectionURI("app://redirect")
             .withParUsage(parUsage)
 

wallet-core/src/test/java/eu/europa/ec/eudi/wallet/issue/openid4vci/OpenId4VciManagerConfigBuilderTest.kt

@@ -28,10 +28,10 @@ import kotlin.test.assertIs
 class OpenId4VciManagerConfigBuilderTest {
 
     @Test
-    fun `ConfigBuilder builds Config with valid issuerUrl, clientId and authFlowRedirectionURI`() {
+    fun `ConfigBuilder builds Config with valid issuerUrl, clientAuthenticationType and authFlowRedirectionURI`() {
         val builder = OpenId4VciManager.Config.Builder()
             .withIssuerUrl("https://issuer.example.com")
-            .withClientId("testClientId")
+            .withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.AttestationBased)
             .withAuthFlowRedirectionURI("app://redirect")
 
         val config = builder.build()
@@ -42,7 +42,7 @@ class OpenId4VciManagerConfigBuilderTest {
     @Test
     fun `ConfigBuilder throws exception when issuerUrl is not set`() {
         val builder = OpenId4VciManager.Config.Builder()
-            .withClientId("testClientId")
+            .withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.AttestationBased)
             .withAuthFlowRedirectionURI("app://redirect")
 
         assertThrows(IllegalStateException::class.java) {
@@ -51,7 +51,7 @@ class OpenId4VciManagerConfigBuilderTest {
     }
 
     @Test
-    fun `ConfigBuilder throws exception when clientId is not set`() {
+    fun `ConfigBuilder throws exception when clientAuthenticationType is not set`() {
         val builder = OpenId4VciManager.Config.Builder()
             .withIssuerUrl("https://issuer.example.com")
             .withAuthFlowRedirectionURI("app://redirect")
@@ -65,7 +65,7 @@ class OpenId4VciManagerConfigBuilderTest {
     fun `ConfigBuilder throws exception when authFlowRedirectionURI is not set`() {
         val builder = OpenId4VciManager.Config.Builder()
             .withIssuerUrl("https://issuer.example.com")
-            .withClientId("testClientId")
+            .withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.AttestationBased)
 
         assertThrows(IllegalStateException::class.java) {
             builder.build()
@@ -76,13 +76,13 @@ class OpenId4VciManagerConfigBuilderTest {
     fun `ConfigBuilder sets issuerUrl correctly`() {
         val builder = OpenId4VciManager.Config.Builder()
             .withIssuerUrl("https://issuer.example.com")
-            .withClientId("testClientId")
+            .withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.AttestationBased)
             .withAuthFlowRedirectionURI("app://redirect")
 
         val config = builder.build()
 
         assertEquals("https://issuer.example.com", config.issuerUrl)
-        assertEquals("testClientId", config.clientId)
+        assertEquals(OpenId4VciManager.ClientAuthenticationType.AttestationBased, config.clientAuthenticationType)
         assertEquals("app://redirect", config.authFlowRedirectionURI)
         assertIs<OpenId4VciManager.Config.DPoPUsage.IfSupported>(config.dPoPUsage)
         assertEquals(Algorithm.ESP256, config.dPoPUsage.algorithm)
@@ -92,7 +92,7 @@ class OpenId4VciManagerConfigBuilderTest {
     fun `ConfigBuilder sets useDPoPIfSupported correctly`() {
         val builder = OpenId4VciManager.Config.Builder()
             .withIssuerUrl("https://issuer.example.com")
-            .withClientId("testClientId")
+            .withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.AttestationBased)
             .withAuthFlowRedirectionURI("app://redirect")
             .withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.IfSupported())