Merge pull request #29 from eu-digital-green-certificates/fix/identity

Fix/Workaround: remove unsupported VerificationMethod

src/main/java/eu/europa/ec/dgc/validation/decorator/entity/ValidationServiceIdentityResponse.java

@@ -20,38 +20,40 @@
 
 package eu.europa.ec.dgc.validation.decorator.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
 
 @Data
 public class ValidationServiceIdentityResponse {
-    
+
     private String id;
-    
+
     private List<VerificationMethod> verificationMethod = new ArrayList<>();
-    
+
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class VerificationMethod {
-        
+
         private String id;
-        
+
         private String type;
-        
+
         private String controller;
-        
+
         private PublicKeyJwk publicKeyJwk;
     }
-    
+
     @Data
     public static final class PublicKeyJwk {
-        
+
         private String x5c;
-        
+
         private String kid;
-        
+
         private String alg;
-        
+
         private String use;
     }
 }

src/main/java/eu/europa/ec/dgc/validation/decorator/repository/ValidationServiceRepository.java

@@ -64,7 +64,14 @@ public ValidationServiceIdentityResponse identity(final ServiceProperties servic
         log.debug("REST Call to '{}' starting", url);
         final ResponseEntity<ValidationServiceIdentityResponse> response = restTpl
                 .getForEntity(url, ValidationServiceIdentityResponse.class);
-        return response.getBody();
+
+        // Workaround: remove unsupported VerificationMethod
+        final ValidationServiceIdentityResponse resBody = response.getBody();
+        if (resBody.getVerificationMethod() != null) {
+            resBody.getVerificationMethod().removeIf(method -> method.getPublicKeyJwk() == null);    
+        }
+
+        return resBody;
     }
 
     /**