feat: Add support for VC model 2.0 in presentation exchange

Signed-off-by: Bob Stasyszyn <bob.stasyszyn@gendigital.com>
trustbloc · Sep 27, 2024 · fb65af3 · fb65af3
1 parent 659c2aa
commit fb65af3
Show file tree

Hide file tree

Showing 24 changed files with 662 additions and 38 deletions.
diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
 	github.com/trustbloc/logutil-go v1.0.0
 	github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
 	github.com/trustbloc/vcs v0.0.0
 	github.com/trustbloc/vcs/component/credentialstatus v0.0.0-00010101000000-000000000000
 	github.com/trustbloc/vcs/component/echo v0.0.0-00010101000000-000000000000

diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum
@@ -676,8 +676,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/trustbloc/kms-go v1.1.2
 	github.com/trustbloc/logutil-go v1.0.0
 	github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
 	github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
 )
 

diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum
@@ -472,8 +472,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

diff --git a/component/event/go.mod b/component/event/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/trustbloc/cmdutil-go v1.0.0
 	github.com/trustbloc/logutil-go v1.0.0
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
 	github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
 	go.opentelemetry.io/otel/trace v1.29.0
 )

diff --git a/component/event/go.sum b/component/event/go.sum
@@ -454,8 +454,8 @@ github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwy
 github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
 github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYttMypcE=
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod
@@ -125,7 +125,7 @@ require (
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/trustbloc/bbs-signature-go v1.0.2 // indirect
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e // indirect
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/veraison/go-cose v1.3.0-rc.1 // indirect

diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum
@@ -476,8 +476,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod
@@ -15,7 +15,6 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.6.0
 	github.com/henvic/httpretty v0.1.0
-	github.com/jinzhu/copier v0.3.5
 	github.com/makiuchi-d/gozxing v0.1.1
 	github.com/ory/dockertest/v3 v3.10.1-0.20240704115616-d229e74b748d
 	github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
@@ -28,7 +27,7 @@ require (
 	github.com/trustbloc/kms-go v1.1.2
 	github.com/trustbloc/logutil-go v1.0.0
 	github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
 	github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
 	github.com/valyala/fastjson v1.6.4
 	github.com/veraison/go-cose v1.3.0-rc.1

diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum
@@ -624,8 +624,8 @@ github.com/trustbloc/logutil-go v1.0.0 h1:KzNs9TRbnmn+M3oYw9UkrtOjNd3ZGO8aLgfYtt
 github.com/trustbloc/logutil-go v1.0.0/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104 h1:0IW4muaGvhjJ4OkG6/PQG3DGf5POWxlA1wwEYsxWQ+4=
 github.com/trustbloc/sidetree-go v1.0.1-0.20240219121130-f4260aff7104/go.mod h1:3yChjB5KOT7B9eZe0W1XaIx3MNUuC1Oe9nR/GCtI1W0=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

diff --git a/go.mod b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
 	github.com/trustbloc/kms-go v1.1.2
 	github.com/trustbloc/logutil-go v1.0.0-rc1
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
 	github.com/valyala/fastjson v1.6.4
 	github.com/veraison/go-cose v1.3.0-rc.1
 	github.com/xeipuuv/gojsonschema v1.2.0

diff --git a/go.sum b/go.sum
@@ -637,8 +637,8 @@ github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwy
 github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
 github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c=
 github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=

diff --git a/pkg/restapi/v1/verifier/controller.go b/pkg/restapi/v1/verifier/controller.go
@@ -623,8 +623,14 @@ func (c *Controller) verifyAuthorizationResponseTokens(
 			vpTokenClaims.VP.CustomFields = map[string]interface{}{}
 		}
 
-		vpTokenClaims.VP.Context = append(vpTokenClaims.VP.Context, presexch.PresentationSubmissionJSONLDContextIRI)
-		vpTokenClaims.VP.Type = append(vpTokenClaims.VP.Type, presexch.PresentationSubmissionJSONLDType)
+		if !lo.Contains(vpTokenClaims.VP.Context, presexch.PresentationSubmissionJSONLDContextIRI) {
+			vpTokenClaims.VP.Context = append(vpTokenClaims.VP.Context, presexch.PresentationSubmissionJSONLDContextIRI)
+		}
+
+		if !lo.Contains(vpTokenClaims.VP.Type, presexch.PresentationSubmissionJSONLDType) {
+			vpTokenClaims.VP.Type = append(vpTokenClaims.VP.Type, presexch.PresentationSubmissionJSONLDType)
+		}
+
 		vpTokenClaims.VP.CustomFields[vpSubmissionProperty] = presentationSubmission
 
 		processedVPTokens = append(processedVPTokens,

diff --git a/pkg/restapi/v1/verifier/controller_test.go b/pkg/restapi/v1/verifier/controller_test.go
@@ -539,12 +539,10 @@ func TestController_CheckAuthorizationResponse(t *testing.T) {
 			&verifiable.Presentation{
 				Context: []string{
 					"https://www.w3.org/2018/credentials/v1",
-					"https://identity.foundation/presentation-exchange/submission/v1",
 					"https://w3id.org/security/suites/jws-2020/v1",
 				},
 				Type: []string{
 					"VerifiablePresentation",
-					"PresentationSubmission",
 				},
 			},
 			vcsverifiable.Ldp,

diff --git a/test/bdd/attestation/go.mod b/test/bdd/attestation/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/trustbloc/cmdutil-go v1.0.0
 	github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
-	github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e
+	github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
 )
 

diff --git a/test/bdd/attestation/go.sum b/test/bdd/attestation/go.sum
@@ -232,8 +232,8 @@ github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwy
 github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
 github.com/trustbloc/logutil-go v0.0.0-20221124174025-c46110e3ea42 h1:Mzg9wvEoUIWPoI/GHz3YlVbd4nKWeSPGc6+3l95eOZU=
 github.com/trustbloc/logutil-go v0.0.0-20221124174025-c46110e3ea42/go.mod h1:HRaXVV1caceumbDBwLO3ByiCcAc18KwrNvZ7JQBvDIQ=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e h1:m2C6rWOMPzFjvjzv/1uuz8RlVd8uIMlOCfcWX9cRvtk=
-github.com/trustbloc/vc-go v1.2.1-0.20240923190115-62cdfe76225e/go.mod h1:mjjE1cfzbV5s1NTXhi10YceDyg7c+EBl70LUYcX1mYo=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
+github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
 github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd h1:QhdCHSW1/oosJbzBTEYLU6xcKxXbQzzqFnhCtW2UWbA=
 github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd/go.mod h1:D1wnviyjdmcF8AO5Y9kVGU6OGuvXUMGiE0Auo/fYRYo=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

diff --git a/test/bdd/features/oidc4vc_api.feature b/test/bdd/features/oidc4vc_api.feature
@@ -50,13 +50,20 @@ Feature: OIDC4VC REST API
     And Verifier with profile "<verifierProfile>" requests deleted interactions claims
 
     Examples:
-      | issuerProfile                         | credentialType             | clientRegistrationMethod | credentialTemplate                 | verifierProfile      | presentationDefinitionID                     | fields                                                       |
+      | issuerProfile                         | credentialType             | clientRegistrationMethod | credentialTemplate                 | verifierProfile      | presentationDefinitionID                        | fields                                                       |
 #     SDJWT issuer, JWT verifier, no limit disclosure in PD query.
-      | bank_issuer_v2/v1.0                   | UniversityDegreeCredential | dynamic                  | universityDegreeTemplateID         | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field    | degree_type_id                                               |
+      | bank_issuer_v2/v1.0                   | UniversityDegreeCredential | dynamic                  | universityDegreeTemplateID         | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field       | degree_type_id                                               |
 #     SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query.
-      | bank_issuer_v2/v1.0                   | CrudeProductCredential     | discoverable             | crudeProductCredentialV2TemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields    | unit_of_measure_barrel,api_gravity,category,supplier_address |
+      | bank_issuer_v2/v1.0                   | CrudeProductCredential     | discoverable             | crudeProductCredentialV2TemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields       | unit_of_measure_barrel,api_gravity,category,supplier_address |
 #     JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query.
-      | i_myprofile_ud_es256k_jwt_v2/v1.0     | PermanentResidentCard      | pre-registered           | permanentResidentCardTemplateID    | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification    |
+      | i_myprofile_ud_es256k_jwt_v2/v1.0     | PermanentResidentCard      | pre-registered           | permanentResidentCardTemplateID    | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields    | lpr_category_id,registration_city,commuter_classification    |
+#     JWT issuer with status list feature disabled, JWT verifier, no limit disclosure and optional fields in PD query.
+      | i_myprofile_ud_es256k_jwt_no_csl_v2/v1.0 | PermanentResidentCard   | pre-registered           | permanentResidentCardTemplateID    | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields    | lpr_category_id,registration_city,commuter_classification    |
+#     LDP Data Integrity issuer V2, LDP verifier, no limit disclosure and schema match in PD query.
+#     TODO: Implement Data Integrity V2
+#      | i_myprofile_ud_di_ecdsa-2019_v2/v1.0  | PermanentResidentCard      | pre-registered           | permanentResidentCardTemplateID    | v_myprofile_ldp/v1.0 | 062759b1-no-limit-disclosure-optional-fields-v2  | lpr_category_id,registration_city,commuter_classification    |
+#     LDP issuer, LDP verifier, no limit disclosure and schema match in PD query.
+      | i_myprofile_cmtr_p256_ldp_v2/v1.0     | CrudeProductCredential     | pre-registered           | crudeProductCredentialTemplateID   | v_myprofile_ldp/v1.0 | lp403pb9-schema-match-v2                        | schema_id                                                    |
 
   @oidc4vc_rest_auth_flow_fail
   Scenario Outline: OIDC credential issuance and verification Auth flow negative tests