Skip to content

Commit 4effba2

Browse files
committed
fix: CredentialStatus validation
1 parent ec2507d commit 4effba2

File tree

1 file changed

+2
-3
lines changed
  • src/main/java/com/danubetech/verifiablecredentials/validation

1 file changed

+2
-3
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,13 @@ private static void validateIssuer(VerifiableCredentialV2 verifiableCredential)
105105

106106
validateRun(() -> validateTrue(verifiableCredential.getIssuer() != null), "Bad or missing 'issuer'.");
107107
if(verifiableCredential.getIssuer() instanceof String )validateRun(() -> validateUrl(URI.create(verifiableCredential.getIssuer().toString())), "'issuer' must be a valid URI.");
108-
else if(verifiableCredential.getIssuer() instanceof Map<?,?>) validateRun(()-> validateUrl(URI.create(((Map<String,Object>)verifiableCredential.getIssuer()).get("id").toString())), "'issuer' must be a valid URI.");
108+
else if(verifiableCredential.getIssuer() instanceof Map<?,?>) validateRun(()-> validateUrl(URI.create(((Map<String,Object>)verifiableCredential.getIssuer()).get("id").toString())), "'issuer' must contain be a valid 'id'.");
109109
else validateRun(()-> validateTrue(false),"'issuer' must be a valid URI or object containing an 'id' property.");
110110
}
111111

112112
private static void validateStatus(VerifiableCredentialV2 verifiableCredential) throws IllegalStateException {
113113
if(verifiableCredential.getCredentialStatus() == null) return;
114-
if(verifiableCredential.getCredentialStatus() instanceof CredentialStatus) validateCredentialStatus((CredentialStatus) verifiableCredential.getCredentialStatus());
115-
else if (verifiableCredential.getCredentialStatus() instanceof List<?>) ((List<CredentialStatus>)verifiableCredential.getCredentialStatus()).forEach(Validation::validateCredentialStatus);
114+
verifiableCredential.getCredentialStatusAsList().forEach(Validation::validateCredentialStatus);
116115
}
117116

118117
private static void validateCredentialStatus(CredentialStatus credentialStatus) throws IllegalStateException {

0 commit comments

Comments
 (0)