test(wallet2): validate proofs in extended issuer fixture

Author: chsavvaidis

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

@@ -338,6 +338,7 @@ class Wallet2ExtendedIntegrationTest {
                 credentialEndpointHandlers = CredentialEndpointHandlers()
             )
         )
+        val proofSupport = TestIssuerProofSupport(issuerBase, accessTokenKey)
         val session = DefaultSession(subject = "holder-isolated")
         runBlocking {
             preAuthRepo.save(
@@ -387,6 +388,14 @@ class Wallet2ExtendedIntegrationTest {
                     )
                 }
                 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"] ?: return@post call.respond(
@@ -406,11 +415,12 @@ class Wallet2ExtendedIntegrationTest {
                     if (tokenResponse !is AccessTokenResponseResult.Success) return@post call.respond(
                         HttpStatusCode.InternalServerError, 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", "isolated-nonce")
-                        put("c_nonce_expires_in", 300)
+                        put("c_nonce", nonce.nonce)
+                        put("c_nonce_expires_in", nonce.expiresInSeconds)
                     })
                 }
                 post("/credential") {
@@ -430,22 +440,26 @@ class Wallet2ExtendedIntegrationTest {
                     if (credentialRequest !is CredentialRequestResult.Success) return@post call.respond(
                         HttpStatusCode.BadRequest, buildJsonObject { put("error", "invalid_proof") }
                     )
+                    val request = credentialRequest.request.withIssuer(issuerBase)
                     val credentialResponse = provider.createCredentialResponse(
-                        request = credentialRequest.request.withIssuer(issuerBase),
+                        request = request,
                         configuration = configuration,
                         issuerKey = issuerKey,
                         issuerId = issuerBase,
                         credentialData = buildJsonObject {
                             put("given_name", "Alice"); put("family_name", "Wonder")
                             put("issuing_country", "DE")
                         },
-                        selectiveDisclosure = null
-                    )
-                    if (credentialResponse !is CredentialResponseResult.Success) return@post call.respond(
-                        HttpStatusCode.InternalServerError, buildJsonObject { put("error", "server_error") }
+                        selectiveDisclosure = null,
+                        proofValidationContext = proofSupport.validationContext(request)
                     )
+                    if (credentialResponse !is CredentialResponseResult.Success) {
+                        val failure = credentialResponse as CredentialResponseResult.Failure
+                        val httpResp = provider.writeCredentialError(request, failure.error)
+                        return@post call.respond(HttpStatusCode.fromValue(httpResp.status), httpResp.payload)
+                    }
                     val httpResp = provider.writeCredentialResponse(
-                        credentialRequest.request.withIssuer(issuerBase), credentialResponse.response
+                        request, credentialResponse.response
                     )
                     call.respond(HttpStatusCode.fromValue(httpResp.status), httpResp.payload)
                 }