Skip to content

Commit b2b82b2

Browse files
paullatzelspergerpaullatzelsperger
committed
feat: support VC DataModel 2.0
1 parent 8534c24 commit b2b82b2

File tree

19 files changed

+610
-149
lines changed

19 files changed

+610
-149
lines changed

‎extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*
1010
* Contributors:
1111
* Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
12+
* Cofinity-X - updates for VCDM 2.0
1213
*
1314
*/
1415

@@ -28,6 +29,7 @@
2829
import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage;
2930
import org.eclipse.edc.iam.verifiablecredentials.spi.VcConstants;
3031
import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
32+
import org.eclipse.edc.iam.verifiablecredentials.spi.model.DataModelVersion;
3133
import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentation;
3234
import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentationContainer;
3335
import org.eclipse.edc.jsonld.spi.JsonLd;
@@ -133,12 +135,15 @@ private Result<VerifiablePresentationContainer> parseLdpVp(Object vpObj) {
133135

134136
return jsonLd.expand(jsonObj)
135137
.compose(expanded -> transformerRegistry.transform(expanded, VerifiablePresentation.class))
136-
.map(vp -> new VerifiablePresentationContainer(rawStr, CredentialFormat.JSON_LD, vp));
138+
.map(vp -> new VerifiablePresentationContainer(rawStr, CredentialFormat.VC1_0_LD, vp));
137139
}
138140

139141
private Result<VerifiablePresentationContainer> parseJwtVp(String rawJwt) {
140142
return transformerRegistry.transform(rawJwt, VerifiablePresentation.class)
141-
.map(pres -> new VerifiablePresentationContainer(rawJwt, CredentialFormat.JWT, pres));
143+
.map(pres -> {
144+
var format = pres.getDataModelVersion() == DataModelVersion.V_2_0 ? CredentialFormat.VC2_0_JOSE : CredentialFormat.VC1_0_JWT;
145+
return new VerifiablePresentationContainer(rawJwt, format, pres);
146+
});
142147

143148
}
144149

‎extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtensionTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*
1010
* Contributors:
1111
* Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
12+
* Cofinity-X - updates for VCDM 2.0
1213
*
1314
*/
1415

‎extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java

+155-94
Large diffs are not rendered by default.

‎extensions/common/iam/identity-trust/identity-trust-core/src/test/resources/vcdm20_pres_with_multiple_cred.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"presentation": [
3+
"eyJraWQiOiJ2cC1zaWduIiwiYWxnIjoiRVMyNTYifQ.eyJpZCI6ImRhdGE6YXBwbGljYXRpb24vdnArand0LGV5SnJhV1FpT2lKMmNDMXphV2R1SWl3aVlXeG5Jam9pUlZNeU5UWWlmUS5leUowZVhCbElqb2lWbVZ5YVdacFlXSnNaVkJ5WlhObGJuUmhkR2x2YmlJc0lrQmpiMjUwWlhoMElqcGJJbWgwZEhCek9pOHZkM2QzTG5jekxtOXlaeTl1Y3k5amNtVmtaVzUwYVdGc2N5OTJNaUlzSW1oMGRIQnpPaTh2ZDNkM0xuY3pMbTl5Wnk5dWN5OWpjbVZrWlc1MGFXRnNjeTlsZUdGdGNHeGxjeTkyTWlKZExDSjJaWEpwWm1saFlteGxRM0psWkdWdWRHbGhiQ0k2VzNzaVFHTnZiblJsZUhRaU9pSm9kSFJ3Y3pvdkwzZDNkeTUzTXk1dmNtY3Zibk12WTNKbFpHVnVkR2xoYkhNdmRqSWlMQ0pwWkNJNkltUmhkR0U2WVhCd2JHbGpZWFJwYjI0dmRtTXJhbmQwTEdWNVNuSmhWMUZwVDJsS01sbDVNWHBoVjJSMVNXbDNhVmxYZUc1SmFtOXBVbFpOZVU1VVdXbG1VUzVsZVVwcVkyMVdhMXBYTlRCaFYwWnpWVEpPYjFwWE1XaEphbkJpWlhsS2NGcERTVFpKYldnd1pFaENlazlwT0haYVdHaG9ZbGhDYzFwVE5YWmpiV04yV2xob2FHSllRbk5hV0UxMldrZFdibU50Vm14TWJYQjZZakkwYVV4RFNqQmxXRUpzU1dwdmFWTnVUblppYkU1cVlVZFdkRmxUU2psTVNITnBZVmRSYVU5cFNtOWtTRkozWTNwdmRrd3lWalJaVnpGM1lrZFZkV0l6U201TU1sWTBXVmN4ZDJKSFZucE1Na1p6WkZjeGRXRlROWEZqTWpsMVNXbDNhV1JJYkhkYVUwazJTV3R3ZW1JeU5WUlpNbWhzWWxkRmFXWldNSE5KYlU1NVdsZFNiR0p1VW5CWlYzaFVaRmRLY1ZwWFRqQkphbkEzU1cxc2EwbHFiMmxhUjJ4clQyMVdORmxYTVhkaVIxVTJXbGRLYlZwWFNYaGFhbU40VFcxV2FWbDZXbTFOVjAxNVRucGFiRTFVU214WmVrbDRTV2wzYVZwSFZtNWpiVlpzU1dwd04wbHVValZqUjFWcFQybEtSbVZIUm5SalIzaHNVVzFHYW1GSFZuTmlNMHBGV2xka2VWcFhWV2xNUTBwMVdWY3hiRWxxYjJsUmJVWnFZVWRXYzJJelNXZGlNbGxuVlRKT2NGcFhOV3BhVTBKb1ltMVJaMUZZU2pCamVVbzVURU5LYUdKSVZuUmliV3hRV21sSk5tVjVTblZaVnpGc1NXcHZhVkpZYUdoaVdFSnpXbE5DVm1KdGJESmFXRXA2WVZoU05VbHVNVGxNUTBwd1drTkpOa2x0YURCa1NFRTJUSGs1TVdKdGJESmFXRXA2WVZoU05VeHRWalJaVnpGM1lrZFZkbGt6U214YVIxWjFaRWRzYUdKSVRYWk5lbU42VFdsSmMwbHVXbWhpUjJ4clVtNUtkbUpUU1RaSmFrbDNUVlJCZEUxRVJYUk5SRVpWVFZSck5rMXFUVFpOYWxKaFNXbDNhV1JJYkhkYVUwazJWM2xLVjFwWVNuQmFiV3hvV1cxNGJGRXpTbXhhUjFaMVpFZHNhR0pEU1hOSmExWTBXVmN4ZDJKSFZrVmFWMlI1V2xkV1JHTnRWbXRhVnpVd1lWZEdjMGxwZDJsU1dHaG9ZbGhDYzFwV1FteGpiazUyWW10T2VWcFhVbXhpYmxKd1dWZDNhVmhUZDJsUlIwNTJZbTVTYkdWSVVXbFBiSE5wWVVoU01HTklUVFpNZVRrelpETmpkV1I2VFhWaU0wcHVUREkxZWt3eVRubGFWMUpzWW01U2NGbFhlSHBNTTFsNVNXbDNhV0ZJVWpCalNFMDJUSGs1TTJRelkzVmtlazExWWpOS2Jrd3lOWHBNTWs1NVdsZFNiR0p1VW5CWlYzaDZUREpXTkZsWE1YZGlSMVo2VEROWmVVbHNNSE5KYld4Nll6TldiR05wU1RaSmJXZ3daRWhDZWs5cE9IWmtWelZ3WkcxV2VXTXliREJsVXpWc1pVZEdkR05IZUd4TU1teDZZek5XYkdOdVRYWk5WRkZwWmxFdU5YQTNMV2xXUjB0TVJuQjRaWGxXVkU5eFJtMWpNRFJGVjJkbk1HeFZTMUJ3VVd3M1F6STBhbnBuUVZWVFR6WlVXWGh1WTJ0WWEwa3ljM3BPZW1KNlFtcGphRk4zWWpoZk4zcFlXbkF5VVhZNVNXd3pVSGNpTENKMGVYQmxJam9pUlc1MlpXeHZjR1ZrVm1WeWFXWnBZV0pzWlVOeVpXUmxiblJwWVd3aWZTeDdJa0JqYjI1MFpYaDBJam9pYUhSMGNITTZMeTkzZDNjdWR6TXViM0puTDI1ekwyTnlaV1JsYm5ScFlXeHpMM1l5SWl3aWFXUWlPaUprWVhSaE9tRndjR3hwWTJGMGFXOXVMM1pqSzJwM2RDeGxlVXB5WVZkUmFVOXBTakpaZVRGNllWZGtkVWxwZDJsWlYzaHVTV3B2YVZKV1RYbE9WRmxwWmxFdVpYbEthbU50Vm10YVZ6VXdZVmRHYzFVeVRtOWFWekZvU1dwd1ltVjVTbkJhUTBrMlNXMW9NR1JJUW5wUGFUaDJXbGhvYUdKWVFuTmFVelYyWTIxamRscFlhR2hpV0VKeldsaE5kbHBIVm01amJWWnNURzF3ZW1JeU5HbE1RMG93WlZoQ2JFbHFiMmxUYms1MllteE9hbUZIVm5SWlUwbzVURWh6YVdGWFVXbFBhVXB2WkVoU2QyTjZiM1pNTWxZMFdWY3hkMkpIVlhWaU0wcHVUREpXTkZsWE1YZGlSMVo2VERKR2MyUlhNWFZoVXpWeFl6STVkVWxwZDJsa1NHeDNXbE5KTmtscmNIcGlNalZVV1RKb2JHSlhSV2xtVmpCelNXMU9lVnBYVW14aWJsSndXVmQ0VkdSWFNuRmFWMDR3U1dwd04wbHRiR3RKYW05cFdrZHNhMDl0VmpSWlZ6RjNZa2RWTmxwWFNtMWFWMGw0V21wamVFMXRWbWxaZWxwdFRWZE5lVTU2V214TlZFcHNXWHBKZUVscGQybGFSMVp1WTIxV2JFbHFjRGRKYmxJMVkwZFZhVTlwU2tabFIwWjBZMGQ0YkZGdFJtcGhSMVp6WWpOS1JWcFhaSGxhVjFWcFRFTktkVmxYTVd4SmFtOXBVVzFHYW1GSFZuTmlNMGxuWWpKWloxVXlUbkJhVnpWcVdsTkNhR0p0VVdkUldFb3dZM2xLT1V4RFNtaGlTRlowWW0xc1VGcHBTVFpsZVVwMVdWY3hiRWxxYjJsU1dHaG9ZbGhDYzFwVFFsWmliV3d5V2xoS2VtRllValZKYmpFNVRFTktjRnBEU1RaSmJXZ3daRWhCTmt4NU9URmliV3d5V2xoS2VtRllValZNYlZZMFdWY3hkMkpIVlhaWk0wcHNXa2RXZFdSSGJHaGlTRTEyVFhwamVrMXBTWE5KYmxwb1lrZHNhMUp1U25aaVUwazJTV3BKZDAxVVFYUk5SRVYwVFVSR1ZVMVVhelpOYWswMlRXcFNZVWxwZDJsa1NHeDNXbE5KTmxkNVNsZGFXRXB3V20xc2FGbHRlR3hSTTBwc1drZFdkV1JIYkdoaVEwbHpTV3RXTkZsWE1YZGlSMVpGV2xka2VWcFhWa1JqYlZacldsYzFNR0ZYUm5OSmFYZHBVbGhvYUdKWVFuTmFWa0pzWTI1T2RtSnJUbmxhVjFKc1ltNVNjRmxYZDJsWVUzZHBVVWRPZG1KdVVteGxTRkZwVDJ4emFXRklVakJqU0UwMlRIazVNMlF6WTNWa2VrMTFZak5LYmt3eU5YcE1NazU1V2xkU2JHSnVVbkJaVjNoNlRETlplVWxwZDJsaFNGSXdZMGhOTmt4NU9UTmtNMk4xWkhwTmRXSXpTbTVNTWpWNlRESk9lVnBYVW14aWJsSndXVmQ0ZWt3eVZqUlpWekYzWWtkV2Vrd3pXWGxKYkRCelNXMXNlbU16Vm14amFVazJTVzFvTUdSSVFucFBhVGgyWkZjMWNHUnRWbmxqTW13d1pWTTFiR1ZIUm5SalIzaHNUREpzZW1NelZteGpiazEyVFZSUmFXWlJMalZ3TnkxcFZrZExURVp3ZUdWNVZsUlBjVVp0WXpBMFJWZG5aekJzVlV0UWNGRnNOME15TkdwNlowRlZVMDgyVkZsNGJtTnJXR3RKTW5ONlRucGlla0pxWTJoVGQySTRYemQ2V0Zwd01sRjJPVWxzTTFCM0lpd2lkSGx3WlNJNklrVnVkbVZzYjNCbFpGWmxjbWxtYVdGaWJHVkRjbVZrWlc1MGFXRnNJbjFkZlEubXU3bnNaVU1jbzFQVElkRVJfaUdWeUZvcE5IOFN3anBzZVFIRXozSE9PTmplSTNMZ1RIUEhxQ0szNm13TVpjbjBpRkJSNHYtRmFuZTZYVEc3dGVFU2ciLCJ0eXBlIjoiRW52ZWxvcGVkVmVyaWZpYWJsZVByZXNlbnRhdGlvbiIsIkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy9ucy9jcmVkZW50aWFscy92MiIsImh0dHBzOi8vd3d3LnczLm9yZy9ucy9jcmVkZW50aWFscy9leGFtcGxlcy92MiJdfQ.2gvlSXee-Dm6785Y499DG8Rrn8NTyjBvjmKAWpWLHg1a8sOb-wkkat33RKyQd7Pi5fmralCMzPfVNoco7bKCYQ"
4+
],
5+
"presentationSubmission": {
6+
}
7+
}

‎extensions/common/iam/identity-trust/identity-trust-core/src/test/resources/vcdm20_pres_with_single_cred.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"presentation": [
3+
"eyJraWQiOiJ2cC1zaWduIiwiYWxnIjoiRVMyNTYifQ.eyJpZCI6ImRhdGE6YXBwbGljYXRpb24vdnArand0LGV5SnJhV1FpT2lKMmNDMXphV2R1SWl3aVlXeG5Jam9pUlZNeU5UWWlmUS5leUowZVhCbElqb2lWbVZ5YVdacFlXSnNaVkJ5WlhObGJuUmhkR2x2YmlJc0lrQmpiMjUwWlhoMElqcGJJbWgwZEhCek9pOHZkM2QzTG5jekxtOXlaeTl1Y3k5amNtVmtaVzUwYVdGc2N5OTJNaUlzSW1oMGRIQnpPaTh2ZDNkM0xuY3pMbTl5Wnk5dWN5OWpjbVZrWlc1MGFXRnNjeTlsZUdGdGNHeGxjeTkyTWlKZExDSjJaWEpwWm1saFlteGxRM0psWkdWdWRHbGhiQ0k2VzNzaVFHTnZiblJsZUhRaU9pSm9kSFJ3Y3pvdkwzZDNkeTUzTXk1dmNtY3Zibk12WTNKbFpHVnVkR2xoYkhNdmRqSWlMQ0pwWkNJNkltUmhkR0U2WVhCd2JHbGpZWFJwYjI0dmRtTXJhbmQwTEdWNVNuSmhWMUZwVDJsS01sbDVNWHBoVjJSMVNXbDNhVmxYZUc1SmFtOXBVbFpOZVU1VVdXbG1VUzVsZVVwcVkyMVdhMXBYTlRCaFYwWnpWVEpPYjFwWE1XaEphbkJpWlhsS2NGcERTVFpKYldnd1pFaENlazlwT0haYVdHaG9ZbGhDYzFwVE5YWmpiV04yV2xob2FHSllRbk5hV0UxMldrZFdibU50Vm14TWJYQjZZakkwYVV4RFNqQmxXRUpzU1dwdmFWTnVUblppYkU1cVlVZFdkRmxUU2psTVNITnBZVmRSYVU5cFNtOWtTRkozWTNwdmRrd3lWalJaVnpGM1lrZFZkV0l6U201TU1sWTBXVmN4ZDJKSFZucE1Na1p6WkZjeGRXRlROWEZqTWpsMVNXbDNhV1JJYkhkYVUwazJTV3R3ZW1JeU5WUlpNbWhzWWxkRmFXWldNSE5KYlU1NVdsZFNiR0p1VW5CWlYzaFVaRmRLY1ZwWFRqQkphbkEzU1cxc2EwbHFiMmxhUjJ4clQyMVdORmxYTVhkaVIxVTJXbGRLYlZwWFNYaGFhbU40VFcxV2FWbDZXbTFOVjAxNVRucGFiRTFVU214WmVrbDRTV2wzYVZwSFZtNWpiVlpzU1dwd04wbHVValZqUjFWcFQybEtSbVZIUm5SalIzaHNVVzFHYW1GSFZuTmlNMHBGV2xka2VWcFhWV2xNUTBwMVdWY3hiRWxxYjJsUmJVWnFZVWRXYzJJelNXZGlNbGxuVlRKT2NGcFhOV3BhVTBKb1ltMVJaMUZZU2pCamVVbzVURU5LYUdKSVZuUmliV3hRV21sSk5tVjVTblZaVnpGc1NXcHZhVkpZYUdoaVdFSnpXbE5DVm1KdGJESmFXRXA2WVZoU05VbHVNVGxNUTBwd1drTkpOa2x0YURCa1NFRTJUSGs1TVdKdGJESmFXRXA2WVZoU05VeHRWalJaVnpGM1lrZFZkbGt6U214YVIxWjFaRWRzYUdKSVRYWk5lbU42VFdsSmMwbHVXbWhpUjJ4clVtNUtkbUpUU1RaSmFrbDNUVlJCZEUxRVJYUk5SRVpWVFZSck5rMXFUVFpOYWxKaFNXbDNhV1JJYkhkYVUwazJWM2xLVjFwWVNuQmFiV3hvV1cxNGJGRXpTbXhhUjFaMVpFZHNhR0pEU1hOSmExWTBXVmN4ZDJKSFZrVmFWMlI1V2xkV1JHTnRWbXRhVnpVd1lWZEdjMGxwZDJsU1dHaG9ZbGhDYzFwV1FteGpiazUyWW10T2VWcFhVbXhpYmxKd1dWZDNhVmhUZDJsUlIwNTJZbTVTYkdWSVVXbFBiSE5wWVVoU01HTklUVFpNZVRrelpETmpkV1I2VFhWaU0wcHVUREkxZWt3eVRubGFWMUpzWW01U2NGbFhlSHBNTTFsNVNXbDNhV0ZJVWpCalNFMDJUSGs1TTJRelkzVmtlazExWWpOS2Jrd3lOWHBNTWs1NVdsZFNiR0p1VW5CWlYzaDZUREpXTkZsWE1YZGlSMVo2VEROWmVVbHNNSE5KYld4Nll6TldiR05wU1RaSmJXZ3daRWhDZWs5cE9IWmtWelZ3WkcxV2VXTXliREJsVXpWc1pVZEdkR05IZUd4TU1teDZZek5XYkdOdVRYWk5WRkZwWmxFdVlWbFFVelJTWVdOb04yRnBSVlZ6Y1ZSb05WRmpSV0kwZW5aSFVtMTNlRjgwUWtGVmFHMVBTV3BET1hsMFNITnRTMjF4Y0UxNFpIVnJjbVpxYW1aallsOWFjM0JhTVZGUVdqVmtabU5LZFcxeVNsaGFRM2NpTENKMGVYQmxJam9pUlc1MlpXeHZjR1ZrVm1WeWFXWnBZV0pzWlVOeVpXUmxiblJwWVd3aWZWMTkuZHRkUEdwOUs2emRkZmZWTk8xekU3V2JjR3FwX240a1IwWUl3UU0tU1dSVkdEeE9DX3REVVN4Q3dpVnRxVXJudmJEa2JRV2kzcERGR3FqRzZ1cU14N2ciLCJ0eXBlIjoiRW52ZWxvcGVkVmVyaWZpYWJsZVByZXNlbnRhdGlvbiIsIkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy9ucy9jcmVkZW50aWFscy92MiIsImh0dHBzOi8vd3d3LnczLm9yZy9ucy9jcmVkZW50aWFscy9leGFtcGxlcy92MiJdfQ.vc1_FpmwjMcX0Y-WjhAHDybiJtx43m1ZzYit9f2UcRuV8NE0ToRE8Qr-UFUvtMq10uZXRyXXLpzKHgQ7PNZ2jw"
4+
],
5+
"presentationSubmission": {
6+
}
7+
}

‎extensions/common/iam/identity-trust/identity-trust-service/src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ void obtainClientCredentials_stsFails() {
140140
when(mockedSts.createToken(any(), any())).thenReturn(success(createJwt()));
141141
assertThat(service.obtainClientCredentials(tp)).isSucceeded();
142142
verify(mockedSts).createToken(argThat(m -> m.get("iss").equals(EXPECTED_OWN_DID) &&
143-
m.get("sub").equals(EXPECTED_OWN_DID) &&
144-
m.get("aud").equals(tp.getStringClaim(AUDIENCE))), eq(scope));
143+
m.get("sub").equals(EXPECTED_OWN_DID) &&
144+
m.get("aud").equals(tp.getStringClaim(AUDIENCE))), eq(scope));
145145
}
146146
}
147147

@@ -216,7 +216,7 @@ void verify_failsWithWrongHolder() {
216216
.build()))
217217
.build()))
218218
.build();
219-
var vpContainer = new VerifiablePresentationContainer("test-vp", CredentialFormat.JSON_LD, presentation);
219+
var vpContainer = new VerifiablePresentationContainer("test-vp", CredentialFormat.VC1_0_LD, presentation);
220220
when(mockedClient.requestPresentation(any(), any(), any())).thenReturn(success(List.of(vpContainer)));
221221
when(credentialValidationServiceMock.validate(anyList(), anyCollection())).thenReturn(success());
222222
var token = createJwt(CONSUMER_DID, EXPECTED_OWN_DID);
@@ -238,7 +238,7 @@ void verify_singlePresentation_singleCredential() {
238238
.build()))
239239
.build()))
240240
.build();
241-
var vpContainer = new VerifiablePresentationContainer("test-vp", CredentialFormat.JSON_LD, presentation);
241+
var vpContainer = new VerifiablePresentationContainer("test-vp", CredentialFormat.VC1_0_LD, presentation);
242242
when(mockedClient.requestPresentation(any(), any(), any())).thenReturn(success(List.of(vpContainer)));
243243
when(credentialValidationServiceMock.validate(anyList(), anyCollection())).thenReturn(success());
244244
var token = createJwt(CONSUMER_DID, EXPECTED_OWN_DID);
@@ -269,7 +269,7 @@ void verify_singlePresentation_multipleCredentials() {
269269
.build()))
270270
.build()))
271271
.build();
272-
var vpContainer = new VerifiablePresentationContainer("test-vp", CredentialFormat.JSON_LD, presentation);
272+
var vpContainer = new VerifiablePresentationContainer("test-vp", CredentialFormat.VC1_0_LD, presentation);
273273
when(mockedClient.requestPresentation(any(), any(), any())).thenReturn(success(List.of(vpContainer)));
274274
when(credentialValidationServiceMock.validate(anyList(), anyCollection())).thenReturn(success());
275275
var token = createJwt(CONSUMER_DID, EXPECTED_OWN_DID);
@@ -301,7 +301,7 @@ void verify_multiplePresentations_multipleCredentialsEach() {
301301
.build()))
302302
.build()))
303303
.build();
304-
var vpContainer1 = new VerifiablePresentationContainer("test-vp", CredentialFormat.JSON_LD, presentation1);
304+
var vpContainer1 = new VerifiablePresentationContainer("test-vp", CredentialFormat.VC1_0_LD, presentation1);
305305

306306
var presentation2 = createPresentationBuilder()
307307
.holder(CONSUMER_DID)
@@ -319,7 +319,7 @@ void verify_multiplePresentations_multipleCredentialsEach() {
319319
.build()))
320320
.build()))
321321
.build();
322-
var vpContainer2 = new VerifiablePresentationContainer("test-vp", CredentialFormat.JSON_LD, presentation2);
322+
var vpContainer2 = new VerifiablePresentationContainer("test-vp", CredentialFormat.VC1_0_LD, presentation2);
323323

324324
when(mockedClient.requestPresentation(any(), any(), any())).thenReturn(success(List.of(vpContainer1, vpContainer2)));
325325
when(credentialValidationServiceMock.validate(anyList(), anyCollection())).thenReturn(success());

0 commit comments

Comments
 (0)