Merge pull request #60 from danubetech/fix/v2-jwt-issues

V2 Jwt issues

Author: azuzi

src/main/java/com/danubetech/verifiablecredentials/VerifiableCredentialV2.java

@@ -113,6 +113,12 @@ public B credentialSubject(CredentialSubject credentialSubject) {
 			return (B) this;
 		}
 
+		public B credentialSubject(Collection<CredentialSubject> credentialSubject) {
+			if (this.credentialSubject == null) this.credentialSubject = new ArrayList<>();
+			this.credentialSubject.addAll(credentialSubject);
+			return (B) this;
+		}
+
 		public B credentialStatus(CredentialStatus credentialStatus) {
 			if (this.credentialStatus == null) this.credentialStatus = new ArrayList<>();
 			this.credentialStatus.add(credentialStatus);
@@ -256,7 +262,7 @@ public Date getValidUntil() {
 	}
 
 	public CredentialSubject getCredentialSubject() {
-		return CredentialSubject.getFromJsonLDObject(this);
+		return this.getCredentialSubjectAsList().get(0);
 	}
 
 	public List<CredentialSubject> getCredentialSubjectAsList() {

src/main/java/com/danubetech/verifiablecredentials/jwt/FromJwtConverter.java

@@ -12,6 +12,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 public class FromJwtConverter {
 
@@ -110,7 +111,9 @@ public static VerifiablePresentation fromJwtVerifiableCredentialToVerifiablePres
     public static VerifiableCredentialV2 fromJwtVerifiableCredentialV2(JwtVerifiableCredentialV2 jwtVerifiableCredential) {
 
         VerifiableCredentialV2 payloadVerifiableCredential = VerifiableCredentialV2.fromJson(jwtVerifiableCredential.getPayloadObject().toString());
-        CredentialSubject payloadCredentialSubject = payloadVerifiableCredential.getCredentialSubject();
+
+        List<CredentialSubject> credentialSubjects = payloadVerifiableCredential.getCredentialSubjectAsList();
+
         CredentialSubject.removeFromJsonLdObject(payloadVerifiableCredential);
 
         VerifiableCredentialV2.Builder<? extends VerifiableCredentialV2.Builder<?>> verifiableCredentialBuilder = VerifiableCredentialV2.builder()
@@ -125,21 +128,19 @@ public static VerifiableCredentialV2 fromJwtVerifiableCredentialV2(JwtVerifiable
             verifiableCredentialBuilder.id(URI.create(jwtId));
         }
 
-        if (payloadCredentialSubject != null) {
-
+        for(CredentialSubject cs : credentialSubjects) {
             CredentialSubject.Builder<? extends CredentialSubject.Builder<?>> credentialSubjectBuilder = CredentialSubject.builder()
-                    .base(payloadCredentialSubject);
+                    .base(cs);
 
             String subject = payload.getSubject();
-            if (subject != null && payloadCredentialSubject.getId() == null) {
+            if (subject != null && cs.getId() == null) {
                 credentialSubjectBuilder.id(URI.create(subject));
             }
-
             CredentialSubject credentialSubject = credentialSubjectBuilder.build();
-
             verifiableCredentialBuilder.credentialSubject(credentialSubject);
         }
 
+
         String issuer = payload.getIssuer();
         if (issuer != null && payloadVerifiableCredential.getIssuer() == null) {
             verifiableCredentialBuilder.issuer(URI.create(issuer));

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiableCredential.java

@@ -29,7 +29,7 @@ public static JwtVerifiableCredential fromCompactSerialization(String compactSer
 		if (jsonObject == null) return null;
 
 		VerifiableCredential payloadVerifiableCredential = VerifiableCredential.fromJsonObject(new LinkedHashMap<>(jsonObject));
-
+		if(!payloadVerifiableCredential.getContexts().contains(VerifiableCredential.DEFAULT_JSONLD_CONTEXTS[0])) throw new ParseException("The 'vc' claim must contain the default context v1",0);
 		return new JwtVerifiableCredential(jwtPayload, payloadVerifiableCredential, signedJWT, compactSerialization);
 	}
 }

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiableCredentialV2.java

@@ -30,7 +30,7 @@ public static JwtVerifiableCredentialV2 fromCompactSerialization(String compactS
 		if (jsonObject == null) return null;
 
 		VerifiableCredentialV2 payloadVerifiableCredential = VerifiableCredentialV2.fromJsonObject(new LinkedHashMap<>(jsonObject));
-
+		if(!payloadVerifiableCredential.getContexts().contains(VerifiableCredentialV2.DEFAULT_JSONLD_CONTEXTS[0])) throw new ParseException("The 'vc' claim must contain the default context v2",0);
 		return new JwtVerifiableCredentialV2(jwtPayload, payloadVerifiableCredential, signedJWT, compactSerialization);
 	}
 }

src/main/java/com/danubetech/verifiablecredentials/jwt/ToJwtConverter.java

@@ -175,15 +175,30 @@ public static JwtVerifiableCredentialV2 toJwtVerifiableCredentialV2(VerifiableCr
         }
 
         CredentialSubject credentialSubject = verifiableCredential.getCredentialSubject();
+        var credentialSubjectList = verifiableCredential.getCredentialSubjectAsList();
         if (credentialSubject != null && credentialSubject.getId() != null) {
             jwtPayloadBuilder.subject(credentialSubject.getId().toString());
-            if (!preserveVerifiableCredentialProperties) {
-                CredentialSubject payloadCredentialSubject = CredentialSubject.builder()
-                        .base(credentialSubject)
-                        .build();
-                JsonLDUtils.jsonLdRemove(payloadCredentialSubject, JsonLDKeywords.JSONLD_TERM_ID);
-                CredentialSubject.removeFromJsonLdObject(payloadVerifiableCredential);
-                payloadCredentialSubject.addToJsonLDObject(payloadVerifiableCredential);
+            if(credentialSubjectList.size()>1){
+                if (!preserveVerifiableCredentialProperties) {
+                    CredentialSubject.removeFromJsonLdObject(payloadVerifiableCredential);
+                    for(CredentialSubject subject: credentialSubjectList){
+                        CredentialSubject payloadCredentialSubject = CredentialSubject.builder()
+                                .base(subject)
+                                .build();
+                        JsonLDUtils.jsonLdRemove(payloadCredentialSubject, JsonLDKeywords.JSONLD_TERM_ID);
+
+                        payloadCredentialSubject.addToJsonLDObjectAsJsonArray(payloadVerifiableCredential);
+                    }
+                }
+            }else{
+                if (!preserveVerifiableCredentialProperties) {
+                    CredentialSubject payloadCredentialSubject = CredentialSubject.builder()
+                            .base(credentialSubject)
+                            .build();
+                    JsonLDUtils.jsonLdRemove(payloadCredentialSubject, JsonLDKeywords.JSONLD_TERM_ID);
+                    CredentialSubject.removeFromJsonLdObject(payloadVerifiableCredential);
+                    payloadCredentialSubject.addToJsonLDObject(payloadVerifiableCredential);
+                }
             }
         }
 
@@ -239,7 +254,7 @@ public static JwtVerifiableCredentialV2 toJwtVerifiableCredentialV2(VerifiableCr
         return toJwtVerifiableCredentialV2(verifiableCredential, null, false, false);
     }
 
-    public static JwtVerifiablePresentationV2 toJwtVerifiablePresentation(VerifiablePresentationV2 verifiablePresentation, String aud) {
+    public static JwtVerifiablePresentationV2 toJwtVerifiablePresentationV2(VerifiablePresentationV2 verifiablePresentation, String aud) {
 
         JWTClaimsSet.Builder jwtPayloadBuilder = new JWTClaimsSet.Builder();
 
@@ -275,8 +290,8 @@ public static JwtVerifiablePresentationV2 toJwtVerifiablePresentation(Verifiable
         return new JwtVerifiablePresentationV2(jwtPayload, payloadVerifiablePresentation, null, null);
     }
 
-    public static JwtVerifiablePresentationV2 toJwtVerifiablePresentation(VerifiablePresentationV2 verifiablePresentation) {
+    public static JwtVerifiablePresentationV2 toJwtVerifiablePresentationV2(VerifiablePresentationV2 verifiablePresentation) {
 
-        return toJwtVerifiablePresentation(verifiablePresentation, null);
+        return toJwtVerifiablePresentationV2(verifiablePresentation, null);
     }
 }