From 5e1034e0916a7affc58a1d1f8033f75e6d8c9ec4 Mon Sep 17 00:00:00 2001
From: Matteo Cristino <102997993+matteo-cristino@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:28:02 +0100
Subject: [PATCH] fix(sd_jwt): move from credential_definition to vct and
 clamis (#958)

---
 src/lua/zencode_sd_jwt.lua | 38 ++++++++++--------------
 test/zencode/sd_jwt.bats   | 59 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/src/lua/zencode_sd_jwt.lua b/src/lua/zencode_sd_jwt.lua
index 35b864cbd..f0cd11122 100644
--- a/src/lua/zencode_sd_jwt.lua
+++ b/src/lua/zencode_sd_jwt.lua
@@ -81,27 +81,16 @@ local function import_supported_selective_disclosure(obj)
     end
     res.authorization_servers = schema_get(obj, 'authorization_servers', import_url_f, tostring)
     local creds = obj.credential_configurations_supported
-    for i=1,#creds do
-        check_display(creds[i].display)
-        check_support(creds[i], 'format', 'vc+sd-jwt')
-        check_support(creds[i], 'credential_signing_alg_values_supported', {'ES256'})
-        check_support(creds[i], 'cryptographic_binding_methods_supported', {"jwk", "did:dyne:sandbox.signroom"})
-       -- check_support(creds[i], 'proof_types_supported', {jwt = { proof_signing_alg_values_supported = {"ES256"}}})
-        if(not creds[i].credential_definition) then
-            error("Invalid supported selective disclosure: missing parameter credential_definition", 2)
-        end
-        if(not creds[i].credential_definition.type) then
-            error("Invalid supported selective disclosure: missing type parameter in credential_definition", 2)
-        end
-        if(not creds[i].credential_definition.credentialSubject) then
-            error("Invalid supported selective disclosure: missing credentialSubject parameter in credential_definition", 2)
-        end
-        for j=1,#creds[i].credential_definition.credentialSubject do
-            local display = creds[i].credential_definition.credentialSubject[j]
-            if display then
-                check_display(display)
-            end
+    for _,v in pairs(creds) do
+        check_display(v.display)
+        check_support(v, 'format', 'vc+sd-jwt')
+        check_support(v, 'credential_signing_alg_values_supported', {'ES256'})
+        check_support(v, 'cryptographic_binding_methods_supported', {"jwk", "did:dyne:sandbox.signroom"})
+        -- check_support(creds[i], 'proof_types_supported', {jwt = { proof_signing_alg_values_supported = {"ES256"}}})
+        if (not v.vct) then
+            error("Invalid supported selective disclosure: missing parameter vct", 2)
         end
+        -- claims and everything in it are optional
     end
 
     res.credential_configurations_supported =
@@ -367,11 +356,14 @@ When("create selective disclosure request from '' with id '' for ''", function(s
     local id = have(id_name)
     local object = have(object_name)
 
-    local credential = ssd.credential_configurations_supported[O.to_string(id)]
+    local credential
+    for _,v in pairs(ssd.credential_configurations_supported) do
+        if v.vct == id then credential = v end
+    end
     zencode_assert(credential, "Unknown credential id")
-    local credSubject = credential.credential_definition.credentialSubject
+    local claims = credential.claims
     local fields = {}
-    for k,_ in pairs(credSubject) do
+    for k,_ in pairs(claims) do
         table.insert(fields, O.from_str(k))
     end
     ACK.selective_disclosure_request = {
diff --git a/test/zencode/sd_jwt.bats b/test/zencode/sd_jwt.bats
index 6b6b5bc89..34deee031 100644
--- a/test/zencode/sd_jwt.bats
+++ b/test/zencode/sd_jwt.bats
@@ -4,16 +4,69 @@ 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":{"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"}}
+{
+    "supported_selective_disclosure":{
+        "credential_endpoint":"http://issuer.example.org/credentials",
+        "credential_issuer":"http://issuer.example.org",
+        "authorization_servers":[
+            "http://server.example.org"
+        ],
+        "credential_configurations_supported":{
+            "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"
+                        ]
+                    }
+                },
+                "vct": "IdentityCredential",
+                "claims":{
+                    "family_name":{
+                        "display":[
+                            {
+                                "locale":"en-US",
+                                "name":"Family Name"
+                            }
+                        ]
+                    },
+                    "given_name":{
+                        "display":[
+                            {
+                                "locale":"en-US",
+                                "name":"Given Name"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
 EOF
     cat <<EOF | zexe metadata.zen metadata.keys.json
 Scenario 'sd_jwt': sign JSON
 Given I have a 'supported selective disclosure'
-and debug
 Then print data
 EOF
     save_output 'metadata.out.json'
-    assert_output "$(cat metadata.keys.json)"
+    assert_output "$(cat metadata.keys.json | jq -c --sort-keys)"
 }
 
 @test "Import and export SDR" {