Fix VC as part of VP.

Signed-off-by: Markus Sabadello <[email protected]>

Author: peacekeeper

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

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 
 import com.danubetech.verifiablecredentials.jwt.JwtVerifiableCredential;
 import com.fasterxml.jackson.core.JsonGenerationException;
@@ -78,8 +79,8 @@ public static VerifiablePresentation fromVerifiableCredential(VerifiableCredenti
 		ArrayList<String> typeList = new ArrayList<String> ();
 		typeList.add(JSONLD_TYPE_VERIFIABLE_PRESENTATION);
 
-		ArrayList<String> verifiableCredentialList = new ArrayList<String> ();
-		verifiableCredentialList.add(verifiableCredential.toJsonString());
+		ArrayList<Object> verifiableCredentialList = new ArrayList<Object> ();
+		verifiableCredentialList.add(verifiableCredential.getJsonLdObject());
 
 		jsonLdObject = new LinkedHashMap<String, Object> ();
 		jsonLdObject.put(JsonLdConsts.CONTEXT, contextList);
@@ -120,6 +121,28 @@ public static VerifiablePresentation fromJwtVerifiableCredential(JwtVerifiableCr
 		return fromJwtVerifiableCredential(jwtVerifiableCredential, true);
 	}
 
+	public VerifiableCredential getVerifiableCredential() {
+
+		Object verifiableCredentialObject = this.getJsonLdObject().get(JSONLD_TERM_VERIFIABLE_CREDENTIAL);
+
+		LinkedHashMap<String, Object> jsonLdObject = null;
+
+		if (verifiableCredentialObject instanceof LinkedHashMap) {
+
+			jsonLdObject = (LinkedHashMap<String, Object>) verifiableCredentialObject;
+		} else if (verifiableCredentialObject instanceof List) {
+
+			List<?> verifiableCredentialList = (List<?>) verifiableCredentialObject;
+
+			if (verifiableCredentialList.size() == 1) {
+
+				jsonLdObject = (LinkedHashMap<String, Object>) verifiableCredentialList.get(0);
+			}
+		}
+
+		return jsonLdObject == null ? null : VerifiableCredential.fromJsonLdObject(jsonLdObject);
+	}
+
 	public LinkedHashMap<String, Object> getJsonLdObject() {
 
 		return this.jsonLdObject;