Handle auth server metadata from the credential offer

leecam · Jan 8, 2025 · 252d7e1 · 252d7e1
1 parent 35c7201
commit 252d7e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/src/main/java/com/credman/cmwallet/openid4vci/OpenId4VCI.kt b/app/src/main/java/com/credman/cmwallet/openid4vci/OpenId4VCI.kt
@@ -1,5 +1,6 @@
 package com.credman.cmwallet.openid4vci
 
+import android.util.Log
 import com.credman.cmwallet.createJWTES256
 import com.credman.cmwallet.openid4vci.data.CredentialOffer
 import com.credman.cmwallet.openid4vci.data.CredentialRequest
@@ -47,6 +48,9 @@ class OpenId4VCI(val credentialOfferJson: String) {
     }
 
     suspend fun requestAuthServerMetadata(server: String): OauthAuthorizationServer {
+        if (credentialOffer.authorizationServerMetadata != null) {
+            return credentialOffer.authorizationServerMetadata
+        }
         if (server !in authServerCache) {
             authServerCache[server] =
                 httpClient.get("$server/.well-known/oauth-authorization-server").body()

diff --git a/app/src/main/java/com/credman/cmwallet/openid4vci/data/CredentialOfferEndpoint.kt b/app/src/main/java/com/credman/cmwallet/openid4vci/data/CredentialOfferEndpoint.kt
@@ -152,5 +152,6 @@ data class CredentialOffer(
     @SerialName("credential_issuer") val credentialIssuer: String,
     @SerialName("credential_configuration_ids") val credentialConfigurationIds: List<String>,
     @SerialName("grants") val grants: Grants?,
-    @SerialName("issuer_metadata") val issuerMetadata: CredentialIssuerMetadata
+    @SerialName("issuer_metadata") val issuerMetadata: CredentialIssuerMetadata,
+    @SerialName("authorization_server_metadata") val authorizationServerMetadata: OauthAuthorizationServer?
 )