From ad00236a1ae1b992c4282d267a187f82c7cccbee Mon Sep 17 00:00:00 2001
From: matteo-cristino <cristino.matteo97@gmail.com>
Date: Mon, 28 Oct 2024 16:44:37 +0100
Subject: [PATCH] fix(sd_jwt): credential_configuration_supported is a
 dictionary where the key is the unique identifier

as stated by https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0-13.html#name-credential-issuer-metadata-p
---
 src/lua/zencode_sd_jwt.lua | 16 +++-------------
 test/zencode/sd_jwt.bats   |  4 ++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/lua/zencode_sd_jwt.lua b/src/lua/zencode_sd_jwt.lua
index 4210473a3..35b864cbd 100644
--- a/src/lua/zencode_sd_jwt.lua
+++ b/src/lua/zencode_sd_jwt.lua
@@ -367,19 +367,9 @@ When("create selective disclosure request from '' with id '' for ''", function(s
     local id = have(id_name)
     local object = have(object_name)
 
-    local creds = ssd.credential_configurations_supported
-    local pos = 0
-    for i=1,#creds do
-        local cred_def = creds[i].credential_definition
-        for _,v in pairs(cred_def.type) do
-            if v == id then
-                pos = i
-                break
-            end
-	    end
-    end
-    zencode_assert(pos > 0, "Unknown credential id")
-    local credSubject = creds[pos].credential_definition.credentialSubject
+    local credential = ssd.credential_configurations_supported[O.to_string(id)]
+    zencode_assert(credential, "Unknown credential id")
+    local credSubject = credential.credential_definition.credentialSubject
     local fields = {}
     for k,_ in pairs(credSubject) do
         table.insert(fields, O.from_str(k))
diff --git a/test/zencode/sd_jwt.bats b/test/zencode/sd_jwt.bats
index 8c596f07d..6b6b5bc89 100644
--- a/test/zencode/sd_jwt.bats
+++ b/test/zencode/sd_jwt.bats
@@ -4,7 +4,7 @@ SUBDOC=sd_jwt
 
 @test "Import metadata" {
     cat <<EOF | save_asset metadata.keys.json
-{"supported_selective_disclosure":{"authorization_servers":["http://server.example.org"],"credential_configurations_supported":[{"credential_definition":{"credentialSubject":{"family_name":{"display":[{"locale":"en-US","name":"Family Name"}]},"given_name":{"display":[{"locale":"en-US","name":"Given Name"}]}},"type":["ab8c936e-b9ab-4cf5-9862-c3a25bb82996","VerifiableCredential","IdentityCredential"]},"credential_signing_alg_values_supported":["ES256"],"cryptographic_binding_methods_supported":["jwk","did:dyne:sandbox.signroom"],"display":[{"background_color":"#000000","locale":"en-US","name":"IdentityCredential","text_color":"#ffffff"}],"format":"vc+sd-jwt","proof_types_supported":{"jwt":{"proof_signing_alg_values_supported":["ES256"]}}}],"credential_endpoint":"http://issuer.example.org/credentials","credential_issuer":"http://issuer.example.org"}}
+{"supported_selective_disclosure":{"authorization_servers":["http://server.example.org"],"credential_configurations_supported":{"IdentityCredential":{"credential_definition":{"credentialSubject":{"family_name":{"display":[{"locale":"en-US","name":"Family Name"}]},"given_name":{"display":[{"locale":"en-US","name":"Given Name"}]}},"type":["ab8c936e-b9ab-4cf5-9862-c3a25bb82996","VerifiableCredential","IdentityCredential"]},"credential_signing_alg_values_supported":["ES256"],"cryptographic_binding_methods_supported":["jwk","did:dyne:sandbox.signroom"],"display":[{"background_color":"#000000","locale":"en-US","name":"IdentityCredential","text_color":"#ffffff"}],"format":"vc+sd-jwt","proof_types_supported":{"jwt":{"proof_signing_alg_values_supported":["ES256"]}}}},"credential_endpoint":"http://issuer.example.org/credentials","credential_issuer":"http://issuer.example.org"}}
 EOF
     cat <<EOF | zexe metadata.zen metadata.keys.json
 Scenario 'sd_jwt': sign JSON
@@ -55,7 +55,7 @@ EOF
 
 @test "SSD to SDR" {
     cat <<EOF | save_asset object.data.json
-{"object":{"age":42,"degree":"math","family_name":"Lippo","given_name":"Mimmo","iss":"http://example.org","sub":"user 42"}, "id": "ab8c936e-b9ab-4cf5-9862-c3a25bb82996"}
+{"object":{"age":42,"degree":"math","family_name":"Lippo","given_name":"Mimmo","iss":"http://example.org","sub":"user 42"}, "id": "IdentityCredential"}
 EOF
     cat <<EOF | zexe ssd_to_sdr.zen object.data.json metadata.keys.json
 Scenario 'sd_jwt'