Issue #111: refactoring of routingInfo

MORE-Platform · Apr 12, 2024 · 46edaad · 46edaad
1 parent bf78a6f
commit 46edaad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 28 deletions.
diff --git a/src/main/java/io/redlink/more/data/controller/ExternalDataApiV1Controller.java b/src/main/java/io/redlink/more/data/controller/ExternalDataApiV1Controller.java
@@ -29,9 +29,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Base64;
 import java.util.List;
-import java.util.Optional;
 
 @RestController
 @RequestMapping(value = "/api/v1", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -49,7 +47,7 @@ public ExternalDataApiV1Controller(ExternalService externalService, ElasticServi
     @Override
     public ResponseEntity<List<ParticipantDTO>> listParticipants(String moreApiToken) {
         try {
-            ApiRoutingInfo apiRoutingInfo = getRoutingInfo(moreApiToken);
+            ApiRoutingInfo apiRoutingInfo = externalService.getRoutingInfo(moreApiToken);
             return ResponseEntity.ok(
                     externalService.listParticipants(apiRoutingInfo.studyId(), apiRoutingInfo.studyGroupId())
                             .stream()
@@ -64,7 +62,7 @@ public ResponseEntity<List<ParticipantDTO>> listParticipants(String moreApiToken
     @Override
     public ResponseEntity<Void> storeExternalBulk(String moreApiToken, EndpointDataBulkDTO endpointDataBulkDTO) {
         try {
-            ApiRoutingInfo apiRoutingInfo = getRoutingInfo(moreApiToken);
+            ApiRoutingInfo apiRoutingInfo = externalService.getRoutingInfo(moreApiToken);
             Integer participantId = Integer.valueOf(endpointDataBulkDTO.getParticipantId());
             Interval interval = externalService.getIntervalForObservation(apiRoutingInfo.studyId(), apiRoutingInfo.observationId(), participantId);
 
@@ -96,24 +94,4 @@ public ResponseEntity<Void> storeExternalBulk(String moreApiToken, EndpointDataB
             throw new AccessDeniedException("Invalid Token");
         }
     }
-
-    private ApiRoutingInfo getRoutingInfo(String moreApiToken) {
-        String[] split = moreApiToken.split("\\.");
-        String[] primaryKey = new String(Base64.getDecoder().decode(split[0])).split("-");
-
-        Long studyId = Long.valueOf(primaryKey[0]);
-        Integer observationId = Integer.valueOf(primaryKey[1]);
-        Integer tokenId = Integer.valueOf(primaryKey[2]);
-        String secret = new String(Base64.getDecoder().decode(split[1]));
-
-        final Optional<ApiRoutingInfo> apiRoutingInfo = externalService.getRoutingInfo(
-                studyId,
-                observationId,
-                tokenId,
-                secret);
-        if (apiRoutingInfo.isEmpty()) {
-            throw new AccessDeniedException("Invalid token");
-        }
-        return apiRoutingInfo.get();
-    }
 }
diff --git a/src/main/java/io/redlink/more/data/service/ExternalService.java b/src/main/java/io/redlink/more/data/service/ExternalService.java
@@ -18,9 +18,11 @@
 import io.redlink.more.data.model.scheduler.RelativeEvent;
 import io.redlink.more.data.repository.StudyRepository;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -34,13 +36,26 @@ public ExternalService(StudyRepository repository, PasswordEncoder passwordEncod
         this.repository = repository;
         this.passwordEncoder = passwordEncoder;
     }
-    public Optional<ApiRoutingInfo> getRoutingInfo(
-            Long studyId, Integer observationId, Integer tokenId, String apiSecret
+    public ApiRoutingInfo getRoutingInfo(
+            String moreApiToken
     ) {
-        return repository.getApiRoutingInfo(studyId, observationId, tokenId)
+        String[] split = moreApiToken.split("\\.");
+        String[] primaryKey = new String(Base64.getDecoder().decode(split[0])).split("-");
+
+        Long studyId = Long.valueOf(primaryKey[0]);
+        Integer observationId = Integer.valueOf(primaryKey[1]);
+        Integer tokenId = Integer.valueOf(primaryKey[2]);
+        String secret = new String(Base64.getDecoder().decode(split[1]));
+
+
+        final Optional<ApiRoutingInfo> apiRoutingInfo = repository.getApiRoutingInfo(studyId, observationId, tokenId)
                 .stream().filter(route ->
-                        passwordEncoder.matches(apiSecret, route.secret()))
+                        passwordEncoder.matches(secret, route.secret()))
                 .findFirst();
+        if (apiRoutingInfo.isEmpty()) {
+            throw new AccessDeniedException("Invalid token");
+        }
+        return apiRoutingInfo.get();
     }
 
     public ApiRoutingInfo validateRoutingInfo(ApiRoutingInfo routingInfo, Integer participantId) {