Merge pull request #850 from walt-id/fix-issuer-metadata-cors-error

fix issuance CORS issue, fix x5c validator test
walt-id · Dec 10, 2024 · 66e2030 · 66e2030
2 parents 4de8aaf + b10586f
commit 66e2030
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/waltid-applications/waltid-web-wallet/libs/composables/issuance.ts b/waltid-applications/waltid-web-wallet/libs/composables/issuance.ts
@@ -47,7 +47,7 @@ export async function useIssuance(query: any) {
         issuerHost = issuer;
     }
 
-    const credential_issuer: { credential_configurations_supported: Array<{ types: Array<String>; }>; } = await $fetch(`${issuer}/.well-known/openid-credential-issuer`)
+    const credential_issuer: { credential_configurations_supported: Array<{ types: Array<String>; }>; } = await $fetch(`/wallet-api/wallet/${currentWallet.value}/exchange/resolveIssuerOpenIDMetadata?issuer=${issuer}`)
     const credentialList = credentialOffer.credential_configuration_ids.map((id) => credential_issuer.credential_configurations_supported[id]);
 
     let credentialTypes: String[] = [];
@@ -122,4 +122,4 @@ export async function useIssuance(query: any) {
         groupedCredentialTypes,
         issuerHost
     }
-}
+}
diff --git a/...d-libraries/protocols/waltid-openid4vc/src/commonMain/kotlin/id/walt/oid4vc/OpenID4VCI.kt b/...d-libraries/protocols/waltid-openid4vc/src/commonMain/kotlin/id/walt/oid4vc/OpenID4VCI.kt
@@ -131,7 +131,9 @@ object OpenID4VCI {
                 appendPathSegments(it.fullPath.trim('/'))
         }.buildString() }
 
-    suspend fun resolveCIProviderMetadata(credOffer: CredentialOffer) = http.get(getCIProviderMetadataUrl(credOffer)).bodyAsText().let {
+    suspend fun resolveCIProviderMetadata(credOffer: CredentialOffer) = resolveCIProviderMetadata(credOffer.credentialIssuer)
+
+    suspend fun resolveCIProviderMetadata(issuerBaseUrl: String) = http.get(getCIProviderMetadataUrl(issuerBaseUrl)).bodyAsText().let {
         OpenIDProviderMetadata.fromJSONString(it)
     }
 

diff --git a/...llet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt b/...llet-api/src/main/kotlin/id/walt/webwallet/web/controllers/exchange/ExchangeController.kt
@@ -1,6 +1,8 @@
 package id.walt.webwallet.web.controllers.exchange
 
+import id.walt.oid4vc.OpenID4VCI
 import id.walt.oid4vc.data.CredentialOffer
+import id.walt.oid4vc.data.OpenIDProviderMetadata
 import id.walt.oid4vc.data.dif.PresentationDefinition
 import id.walt.oid4vc.requests.CredentialOfferRequest
 import id.walt.sdjwt.SDJWTVCTypeMetadata
@@ -18,6 +20,7 @@ import io.github.smiley4.ktorswaggerui.dsl.routing.post
 import io.github.smiley4.ktorswaggerui.dsl.routing.route
 import io.ktor.http.*
 import io.ktor.server.application.*
+import io.ktor.server.plugins.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.util.*
@@ -261,6 +264,21 @@ fun Application.exchange() = walletRoute {
                 context.respond(HttpStatusCode.BadRequest, error.message ?: "Unknown error")
             }
         }
+        get("resolveIssuerOpenIDMetadata", {
+            summary = "Resolved Issuer OpenID Metadata"
+            request {
+                queryParameter<String>("issuer")
+            }
+            response {
+                HttpStatusCode.OK to {
+                    description = "Resolved Issuer OpenID Metadata"
+                    body<OpenIDProviderMetadata>()
+                }
+            }
+        }) {
+            val issuer = call.request.queryParameters["issuer"] ?: throw BadRequestException("Issuer base url not set")
+            context.respond(HttpStatusCode.OK, OpenID4VCI.resolveCIProviderMetadata(issuer).toJSON())
+        }
     }
 }
 

diff --git a/...id-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/X5CValidatorTest.kt b/...id-services/waltid-wallet-api/src/test/kotlin/id/walt/webwallet/utils/X5CValidatorTest.kt
@@ -14,7 +14,7 @@ import kotlin.test.assertTrue
 
 class X5CValidatorTest {
 
-    //we don't care about the bit size of the key, it's a test case (as long as it's bigger than 512)
+    //we don't care about the bit size of the key, it's a test case (as long as it's bigger than 1024)
     private val keyPairGenerator = KeyPairGenerator
         .getInstance("RSA").apply {
             initialize(2048)