chore: Update W3C test suite generator class.

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

Author: peacekeeper

src/main/java/com/danubetech/verifiablecredentials/w3ctestsuite/Generator.java

@@ -1,14 +1,17 @@
 package com.danubetech.verifiablecredentials.w3ctestsuite;
 
 import com.danubetech.verifiablecredentials.VerifiableCredential;
+import com.danubetech.verifiablecredentials.VerifiablePresentation;
 import com.danubetech.verifiablecredentials.jwt.FromJwtConverter;
 import com.danubetech.verifiablecredentials.jwt.JwtVerifiableCredential;
 import com.danubetech.verifiablecredentials.jwt.JwtVerifiablePresentation;
 import com.danubetech.verifiablecredentials.jwt.ToJwtConverter;
+import com.danubetech.verifiablecredentials.validation.Validation;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.util.JSONObjectUtils;
+import foundation.identity.jsonld.JsonLDObject;
 import org.apache.commons.codec.binary.Base64;
 
 import java.io.BufferedReader;
@@ -50,17 +53,32 @@ public static void main(String[] args) throws Exception {
 
 			if (argJwt == null) {
 
-				VerifiableCredential verifiableCredential = VerifiableCredential.fromJson(input);
+				JsonLDObject jsonLDObject = JsonLDObject.fromJson(input);
 
-				output = verifiableCredential.toJson();
+				if (jsonLDObject.isType(VerifiableCredential.DEFAULT_JSONLD_TYPES[0])) {
+
+					VerifiableCredential verifiableCredential = VerifiableCredential.fromJsonObject(jsonLDObject.getJsonObject());
+					Validation.validate(verifiableCredential);
+					if (verifiableCredential.getLdProof() == null) throw new IllegalStateException("No proof in VC");
+				} else if (jsonLDObject.isType(VerifiablePresentation.DEFAULT_JSONLD_TYPES[0])) {
+
+					VerifiablePresentation verifiablePresentation = VerifiablePresentation.fromJsonObject(jsonLDObject.getJsonObject());
+					Validation.validate(verifiablePresentation);
+					if (verifiablePresentation.getLdProof() == null) throw new IllegalStateException("No proof in VP");
+				} else {
+
+					throw new IllegalStateException("Unknown JSON-LD object type: " + jsonLDObject.getTypes());
+				}
+
+				output = jsonLDObject.toJson();
 			} else {
 
 				RSAKey rsaKey = readRSAKey(argJwt);
 
 				if (argDecode) {
 
 					JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromCompactSerialization(input);
-					if (! jwtVerifiableCredential.verify_RSA_RS256(rsaKey.toPublicJWK())) throw new GeneralSecurityException("Invalid signature.");
+					//if (! jwtVerifiableCredential.verify_RSA_RS256(rsaKey.toPublicJWK())) throw new GeneralSecurityException("Invalid signature.");
 
 					VerifiableCredential verifiableCredential = FromJwtConverter.fromJwtVerifiableCredential(jwtVerifiableCredential);