feat: Add vp2

Author: azuzi

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

@@ -4,6 +4,7 @@
 import com.danubetech.verifiablecredentials.VerifiableCredential;
 import com.danubetech.verifiablecredentials.VerifiableCredentialV2;
 import com.danubetech.verifiablecredentials.VerifiablePresentation;
+import com.danubetech.verifiablecredentials.VerifiablePresentationV2;
 import com.danubetech.verifiablecredentials.jsonld.VerifiableCredentialKeywords;
 import com.nimbusds.jwt.JWTClaimsSet;
 import foundation.identity.jsonld.JsonLDUtils;
@@ -66,9 +67,7 @@ public static VerifiableCredential fromJwtVerifiableCredential(JwtVerifiableCred
             verifiableCredentialBuilder.expirationDate(expirationTime);
         }
 
-        VerifiableCredential verifiableCredential = verifiableCredentialBuilder.build();
-
-        return verifiableCredential;
+        return verifiableCredentialBuilder.build();
     }
 
     public static VerifiablePresentation fromJwtVerifiablePresentation(JwtVerifiablePresentation jwtVerifiablePresentation) {
@@ -92,9 +91,7 @@ public static VerifiablePresentation fromJwtVerifiablePresentation(JwtVerifiable
             verifiablePresentationBuilder.holder(URI.create(issuer));
         }
 
-        VerifiablePresentation verifiablePresentation = verifiablePresentationBuilder.build();
-
-        return verifiablePresentation;
+        return verifiablePresentationBuilder.build();
     }
 
     public static VerifiablePresentation fromJwtVerifiableCredentialToVerifiablePresentation(JwtVerifiableCredential jwtVerifiableCredential) {
@@ -160,4 +157,29 @@ public static VerifiableCredentialV2 fromJwtVerifiableCredentialV2(JwtVerifiable
 
         return verifiableCredentialBuilder.build();
     }
+
+    public static VerifiablePresentationV2 fromJwtVerifiablePresentationV2(JwtVerifiablePresentationV2 jwtVerifiablePresentation) {
+
+        VerifiablePresentationV2 payloadVerifiablePresentation = VerifiablePresentationV2.fromJson(jwtVerifiablePresentation.getPayloadObject().toString());
+
+        VerifiablePresentationV2.Builder<? extends VerifiablePresentationV2.Builder<?>> verifiablePresentationBuilder = VerifiablePresentationV2.builder()
+                .base(payloadVerifiablePresentation)
+                .defaultContexts(false)
+                .defaultTypes(false);
+
+        JWTClaimsSet payload = jwtVerifiablePresentation.getPayload();
+
+        String jwtId = payload.getJWTID();
+        if (jwtId != null && payloadVerifiablePresentation.getId() == null) {
+            verifiablePresentationBuilder.id(URI.create(jwtId));
+        }
+
+        String issuer = payload.getIssuer();
+        if (issuer != null && payloadVerifiablePresentation.getHolder() == null) {
+            verifiablePresentationBuilder.holder(URI.create(issuer));
+        }
+
+        return  verifiablePresentationBuilder.build();
+    }
+
 }

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

@@ -0,0 +1,36 @@
+package com.danubetech.verifiablecredentials.jwt;
+
+import com.danubetech.verifiablecredentials.VerifiablePresentation;
+import com.danubetech.verifiablecredentials.VerifiablePresentationV2;
+import com.nimbusds.jose.JWSObject;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.SignedJWT;
+
+import java.text.ParseException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class JwtVerifiablePresentationV2 extends JwtWrappingObject<VerifiablePresentationV2> {
+
+	public JwtVerifiablePresentationV2(JWTClaimsSet payload, VerifiablePresentationV2 payloadObject, JWSObject jwsObject, String compactSerialization) {
+
+		super(payload, payloadObject, jwsObject, compactSerialization);
+	}
+
+	/*
+	 * Factory methods
+	 */
+
+	public static JwtVerifiablePresentationV2 fromCompactSerialization(String compactSerialization) throws ParseException {
+
+		SignedJWT signedJWT = SignedJWT.parse(compactSerialization);
+
+		JWTClaimsSet jwtPayload = signedJWT.getJWTClaimsSet();
+		Map<String, Object> jsonObject = (Map<String, Object>) jwtPayload.getClaims().get(JwtKeywords.JWT_CLAIM_VP);
+		if (jsonObject == null) return null;
+
+		VerifiablePresentationV2 payloadVerifiablePresentation = VerifiablePresentationV2.fromJsonObject(new LinkedHashMap<>(jsonObject));
+
+		return new JwtVerifiablePresentationV2(jwtPayload, payloadVerifiablePresentation, signedJWT, compactSerialization);
+	}
+}