Fix flagged SCA issues

jultty · Apr 2, 2024 · 0e6287c · 0e6287c
1 parent e91a053
commit 0e6287c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/src/main/java/mirante/api/meta/MetaController.java b/src/main/java/mirante/api/meta/MetaController.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
@@ -15,7 +15,7 @@ public static final class MetaData {
 
   MetaData metadata = new MetaData();
 
-  @RequestMapping("/version")
+  @GetMapping("/version")
   @ResponseBody
   public MetaData version() {
     return this.metadata;

diff --git a/src/main/java/mirante/api/security/SecUtils.java b/src/main/java/mirante/api/security/SecUtils.java
@@ -4,7 +4,7 @@
 
 public class SecUtils {
 
-  public static Argon2PasswordEncoder encoder =
+  public static final Argon2PasswordEncoder encoder =
     Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8();
 
 }
diff --git a/src/test/java/mirante/api/security/AuthenticationTest.java b/src/test/java/mirante/api/security/AuthenticationTest.java
@@ -9,7 +9,7 @@
 import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class AuthenticationTest {
+class AuthenticationTest {
 
   @Value("${server.port:8889}")
   private String port;
@@ -100,4 +100,4 @@ void tokenEndpointReturnsOkWithAuthentication() {
     authenticatedClient.get().uri("/auth/token/health").exchange()
         .expectStatus().isOk();
   }
-}
+}
diff --git a/src/web/js/main.js b/src/web/js/main.js
@@ -40,25 +40,22 @@ exerciseSetDropdown.addEventListener('input', function () {
 
       printCorrectOptions(selectedOptions, setOptions);
       sendResponseEvent(selectedOptions);
-      sendResponseResult(selectedOptions);
+      sendResponseResult(selectedOptions, selectedSet);
     });
 
   }
 });
 
-function sendResponseResult(selection) {
+function sendResponseResult(selection, set) {
 
   const xhr = new XMLHttpRequest();
   xhr.open('POST', 'http://localhost:8888/result');
   xhr.setRequestHeader('Content-Type', 'application/json');
 
   const result = {
     time: new Date().getTime(),
-    set: {
-      id: exercise_set_id,
-      name: exercise_set_name,
-      access: exercise_set_access,
-    }
+    set: set.id,
+    selection: selection,
   };
 
   xhr.send(JSON.stringify(result));
@@ -88,7 +85,7 @@ function printCorrectOptions(selection, setOptions) {
 
   selection.forEach(selectedOption => {
     const option = setOptions.find(option => option.id === selectedOption);
-    if (option && option.correct) {
+    if (option?.correct) {
       correctCount++;
     } else {
       incorrectCount++;
@@ -170,19 +167,15 @@ function populateExerciseContainer(exercises) {
 
 function filterOptionsByExerciseSet(fullOptions, targetExerciseSetId) {
   return fullOptions.filter(option => {
-    return (
-      option.exercise_id &&
-        option.exercise_id.set_id &&
-        option.exercise_id.set_id.id === targetExerciseSetId
-    );
+    return (option.exercise_id?.set_id?.id === targetExerciseSetId);
   });
 }
 
 function extractExerciseSets(data) {
   const uniqueExerciseSets = new Set();
 
   data.forEach(option => {
-    if (option.exercise_id && option.exercise_id.set_id) {
+    if (option.exercise_id?.set_id) {
       const setId = option.exercise_id.set_id.id;
       const setName = option.exercise_id.set_id.name;