test(wallet2): validate proofs in verifier issuer fixture

Author: chsavvaidis

waltid-services/waltid-wallet-api2/src/test/kotlin/id/walt/wallet2/Wallet2IssuerVerifier2IntegrationTest.kt

@@ -281,6 +281,7 @@ class Wallet2IssuerVerifier2IntegrationTest {
                 credentialEndpointHandlers = CredentialEndpointHandlers()
             )
         )
+        val proofSupport = TestIssuerProofSupport(issuerBase, accessTokenKey)
 
         // Seed the pre-authorized code directly into the repository
         val session = DefaultSession(subject = "holder-${Uuid.random()}")
@@ -350,6 +351,14 @@ class Wallet2IssuerVerifier2IntegrationTest {
                 get("/credential-offer") {
                     call.respond(offer)
                 }
+                post("/nonce") {
+                    val nonce = proofSupport.issueNonce()
+                    call.response.header(HttpHeaders.CacheControl, "no-store")
+                    call.respond(buildJsonObject {
+                        put("c_nonce", nonce.nonce)
+                        put("c_nonce_expires_in", nonce.expiresInSeconds)
+                    })
+                }
                 post("/token") {
                     val params = call.receiveParameters()
                     val code = params["pre-authorized_code"]
@@ -378,11 +387,12 @@ class Wallet2IssuerVerifier2IntegrationTest {
                             buildJsonObject { put("error", "server_error") }
                         )
                     }
+                    val nonce = proofSupport.issueNonce()
                     call.respond(buildJsonObject {
                         put("access_token", tokenResponse.response.accessToken)
                         put("token_type", "Bearer")
-                        put("c_nonce", "test-nonce")
-                        put("c_nonce_expires_in", 300)
+                        put("c_nonce", nonce.nonce)
+                        put("c_nonce_expires_in", nonce.expiresInSeconds)
                     })
                 }
                 post("/credential") {
@@ -425,26 +435,23 @@ class Wallet2IssuerVerifier2IntegrationTest {
                             buildJsonObject { put("error", "invalid_proof") }
                         )
                     }
+                    val request = credentialRequestResult.request.withIssuer(issuerBase)
                     val credentialResponse = provider.createCredentialResponse(
-                        request = credentialRequestResult.request.withIssuer(issuerBase),
+                        request = request,
                         configuration = configuration,
                         issuerKey = issuerKey,
                         issuerId = issuerBase,
                         credentialData = credentialData,
-                        selectiveDisclosure = selectiveDisclosure
+                        selectiveDisclosure = selectiveDisclosure,
+                        proofValidationContext = proofSupport.validationContext(request)
                     )
                     if (credentialResponse !is CredentialResponseResult.Success) {
                         val failure = credentialResponse as CredentialResponseResult.Failure
-                        return@post call.respond(
-                            HttpStatusCode.InternalServerError,
-                            buildJsonObject {
-                                put("error", failure.error.error)
-                                put("error_description", failure.error.description ?: "no description")
-                            }
-                        )
+                        val httpResponse = provider.writeCredentialError(request, failure.error)
+                        return@post call.respond(HttpStatusCode.fromValue(httpResponse.status), httpResponse.payload)
                     }
                     val httpResponse = provider.writeCredentialResponse(
-                        credentialRequestResult.request.withIssuer(issuerBase),
+                        request,
                         credentialResponse.response
                     )
                     call.respond(HttpStatusCode.fromValue(httpResponse.status), httpResponse.payload)