SecureAreaDpopSigner updated with KeyUnlockDataProvider - Unit tests updated dpopConfig instead of dpopUsage

Author: sraptis-scy

wallet-core/src/main/java/eu/europa/ec/eudi/wallet/issue/openid4vci/dpop/SecureAreaDpopSigner.kt

@@ -2,12 +2,15 @@ package eu.europa.ec.eudi.wallet.issue.openid4vci.dpop
 
 import com.nimbusds.jose.jwk.JWK
 import eu.europa.ec.eudi.openid4vci.SignOperation
+import eu.europa.ec.eudi.wallet.internal.asProvider
 import eu.europa.ec.eudi.wallet.internal.d
 import eu.europa.ec.eudi.wallet.issue.openid4vci.javaAlgorithm
 import eu.europa.ec.eudi.wallet.logging.Logger
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.multipaz.crypto.Algorithm
 import org.multipaz.securearea.KeyInfo
+import org.multipaz.securearea.UnlockReason
 
 /**
  * Secure area-based implementation of [DPopSigner] for OpenID4VCI credential issuance.
@@ -178,7 +181,10 @@ class SecureAreaDpopSigner(
         return SignOperation(
             function = { input ->
                 val keyUnlockData = config.keyUnlockDataProvider(keyInfo.alias, secureArea)
-                secureArea.sign(keyInfo.alias, input, keyUnlockData).toDerEncoded()
+                val provider = keyUnlockData.asProvider()
+                withContext(provider) {
+                    secureArea.sign(keyInfo.alias, input, UnlockReason.Unspecified).toDerEncoded()
+                }
             },
             publicMaterial = jwk
         )

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

@@ -18,6 +18,7 @@ package eu.europa.ec.eudi.wallet.issue.openid4vci
 
 import android.content.Context
 import eu.europa.ec.eudi.wallet.document.DocumentManager
+import eu.europa.ec.eudi.wallet.issue.openid4vci.dpop.DPopConfig
 import eu.europa.ec.eudi.wallet.logging.Logger
 import eu.europa.ec.eudi.wallet.provider.WalletKeyManager
 import io.mockk.mockk
@@ -98,14 +99,15 @@ class AuthorizationHandlerIntegrationTest {
             withClientAuthenticationType(OpenId4VciManager.ClientAuthenticationType.None("wallet-client"))
             withAuthFlowRedirectionURI("eudi-wallet://oauth-callback")
             withAuthorizationHandler(customHandler)
-            withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.Disabled)
+            withDPopConfig(DPopConfig.Disabled)
+//            withDPoPUsage(OpenId4VciManager.Config.DPoPUsage.Disabled)
             withParUsage(OpenId4VciManager.Config.ParUsage.REQUIRED)
         }
 
         assertEquals("https://issuer.example.com", config.issuerUrl)
         assertEquals("eudi-wallet://oauth-callback", config.authFlowRedirectionURI)
         assertEquals(customHandler, config.authorizationHandler)
-        assertEquals(OpenId4VciManager.Config.DPoPUsage.Disabled, config.dPoPUsage)
+        assertEquals(DPopConfig.Disabled, config.dpopConfig)
         assertEquals(OpenId4VciManager.Config.ParUsage.REQUIRED, config.parUsage)
     }
 

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

@@ -77,7 +77,7 @@ class OpenId4VciManagerBuilderTest {
             issuerUrl = "https://issuer.example.com",
             clientAuthenticationType = OpenId4VciManager.ClientAuthenticationType.AttestationBased,
             authFlowRedirectionURI = "app://redirect",
-            dPoPUsage = OpenId4VciManager.Config.DPoPUsage.IfSupported(),
+            dpopConfig = DPopConfig.Default,
             parUsage = OpenId4VciManager.Config.ParUsage.IF_SUPPORTED,
         )