fix: Allow JWT-based Verifiable Credentials when validating

Author: peacekeeper

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

@@ -153,7 +153,7 @@ public String getJwtVerifiableCredentialString() {
 		} else if (verifiableCredentialObject instanceof String) {
 			return (String) verifiableCredentialObject;
 		}
-		return null;
+		throw new IllegalArgumentException("Cannot get JWT verifiable credential: " + verifiableCredentialObject);
 	}
 
 	public DataIntegrityProof getDataIntegrityProof() {

src/main/java/com/danubetech/verifiablecredentials/validation/Validation.java

@@ -33,6 +33,32 @@ private static void validateRun(Runnable runnable, String message) throws Illega
         }
     }
 
+    private static void validateAllRuns(List<Runnable> runnables, String message) throws IllegalStateException {
+        boolean exception = false;
+        for (Runnable runnable : runnables) {
+            try {
+                runnable.run();
+            } catch (Exception ex) {
+                exception = true;
+                if (ex.getMessage() != null && ! ex.getMessage().isEmpty()) message = message + " (" + ex.getMessage().trim() + ")";
+            }
+        }
+        if (exception) throw new IllegalStateException(message);
+    }
+
+    private static void validateOneOfRuns(List<Runnable> runnables, String message) throws IllegalStateException {
+        boolean exception = true;
+        for (Runnable runnable : runnables) {
+            try {
+                runnable.run();
+                exception = false;
+            } catch (Exception ex) {
+                if (ex.getMessage() != null && ! ex.getMessage().isEmpty()) message = message + " (" + ex.getMessage().trim() + ")";
+            }
+        }
+        if (exception) throw new IllegalStateException(message);
+    }
+
     public static void validate(VerifiableCredential verifiableCredential) throws IllegalStateException {
 
         foundation.identity.jsonld.validation.Validation.validate(verifiableCredential);
@@ -65,7 +91,7 @@ public static void validate(VerifiablePresentation verifiablePresentation) throw
 
         validateRun(() -> validateTrue(! verifiablePresentation.getTypes().isEmpty()), "Bad or missing 'type'.");
         validateRun(() -> validateTrue(verifiablePresentation.getTypes().contains(VerifiablePresentation.DEFAULT_JSONLD_TYPES[0])), "type must contain VerifiablePresentation: " + verifiablePresentation.getTypes());
-        validateRun(() -> validateTrue(verifiablePresentation.getVerifiableCredential() != null || verifiablePresentation.getJwtVerifiableCredentialString() != null), "Bad or missing 'verifiableCredential'.");
+        validateOneOfRuns(List.of(() -> validateTrue(verifiablePresentation.getVerifiableCredential() != null), () -> validateTrue(verifiablePresentation.getJwtVerifiableCredentialString() != null)), "Bad or missing 'verifiableCredential'.");
     }
 
     public static void validate(VerifiableCredentialV2 verifiableCredential) throws IllegalStateException {