Merge pull request #16 from eu-digital-green-certificates/fix/missing…

…fields refactoring
eu-digital-green-certificates · Sep 22, 2021 · 13da374 · 13da374
2 parents aa14ef5 + 708cf3b
commit 13da374
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/validation/decorator/controller/RejectController.java b/src/main/java/eu/europa/ec/dgc/validation/decorator/controller/RejectController.java
@@ -53,7 +53,7 @@ public class RejectController {
         @ApiResponse(responseCode = "401", description = "Unauthorized, if no access token are provided"),
         @ApiResponse(responseCode = "500", description = "Internal Server Error"),
     })
-    @GetMapping(value = "/reject")
+    @GetMapping(value = PATH)
     public ResponseEntity reject(@RequestHeader("Authorization") final String token) {
         log.debug("Incoming GET request to '{}' with token '{}'", PATH, token);
 

diff --git a/src/main/java/eu/europa/ec/dgc/validation/decorator/service/DccTokenService.java b/src/main/java/eu/europa/ec/dgc/validation/decorator/service/DccTokenService.java
@@ -75,30 +75,18 @@ public AccessTokenPayload getAccessTockenForValidationService(
         }
 
         final String nonce = buildNonce();
-        ValidationServiceInitializeResponse initialize;
-        try {
-            initialize = this.validationServiceRepository.initialize(service, dccToken, subject, nonce);
-        } catch (HttpClientErrorException e) {
-            log.error(e.getMessage(), e);
-            throw new RepositoryException("Validation service http client error", e);
-        }
-
-        final ServiceTokenContentResponse tokenContent;
-        try {
-            tokenContent = this.backendRepository.tokenContent(subject, service);
-        } catch (HttpClientErrorException e) {
-            log.error(e.getMessage(), e);
-            throw new RepositoryException("Backend service http client error", e);
-        }
+        final ValidationServiceInitializeResponse initialize = this.getValidationServiceInitialize(
+                dccToken, subject, service, nonce);
 
+        final ServiceTokenContentResponse tokenContent = this.getBackendServiceTokenContent(subject, service);
         if (tokenContent.getSubjects() == null || tokenContent.getSubjects().isEmpty()) {
             throw new NotFoundException("Subject not found in token");
         }
         final SubjectResponse subjectResponse = tokenContent.getSubjects().get(0);
         final OccurrenceInfoResponse occurrenceInfo = tokenContent.getOccurrenceInfo();
 
-        final AccessTokenPayload accessToken = this.buildAccessToken(subject, initialize, subjectResponse,
-                occurrenceInfo);
+        final AccessTokenPayload accessToken = this.buildAccessToken(
+                subject, initialize, subjectResponse, occurrenceInfo);
         accessToken.setNonce(nonce);
         return accessToken;
     }
@@ -145,4 +133,24 @@ private AccessTokenPayload buildAccessToken(
         accessTokenPayload.setVersion("1.0");
         return accessTokenPayload;
     }
+
+    private ValidationServiceInitializeResponse getValidationServiceInitialize(final DccTokenRequest dccToken,
+            final String subject, final ServiceProperties service, final String nonce) {
+        try {
+            return this.validationServiceRepository.initialize(service, dccToken, subject, nonce);
+        } catch (HttpClientErrorException e) {
+            log.error(e.getMessage(), e);
+            throw new RepositoryException("Validation service http client error", e);
+        }
+    }
+
+    private ServiceTokenContentResponse getBackendServiceTokenContent(final String subject,
+            final ServiceProperties service) {
+        try {
+            return this.backendRepository.tokenContent(subject, service);
+        } catch (HttpClientErrorException e) {
+            log.error(e.getMessage(), e);
+            throw new RepositoryException("Backend service http client error", e);
+        }
+    }
 }