Upgraded spring boot & bugfix JWK

Author: oharsta

pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.5</version>
+        <version>3.5.9</version>
         <relativePath/>
         <!-- lookup parent from repository -->
     </parent>

server/src/main/java/access/api/StatisticsController.java

@@ -22,7 +22,7 @@ public StatisticsController(Statistics statistics) {
     }
 
     //Used for retrieval of all logins for one SP
-    @GetMapping("loginTimeFrame")
+    @GetMapping("/loginTimeFrame")
     public List<Object> loginTimeFrame(User user,
                                        @RequestParam("from") long from,
                                        @RequestParam("to") long to,
@@ -33,7 +33,7 @@ public List<Object> loginTimeFrame(User user,
     }
 
     //Used for retrieval of all logins for all SPs
-    @GetMapping("loginAggregated")
+    @GetMapping("/loginAggregated")
     public List<Object> loginAggregated(User user,
                                         @RequestParam("period") String period,
                                         @RequestParam(value = "spEntityId", required = false) String spEntityId) {

server/src/main/java/access/api/UserController.java

@@ -78,7 +78,7 @@ public ResponseEntity<Config> config(User user) {
         return ResponseEntity.ok(result);
     }
 
-    @GetMapping("login")
+    @GetMapping("/login")
     public View login() {
         LOG.debug("/login");
         return new RedirectView(config.getClientUrl(), false);

server/src/main/java/access/json/CloningJsonSerializer.java

@@ -4,7 +4,7 @@
 import io.hypersistence.utils.hibernate.type.util.JsonSerializer;
 
 public class CloningJsonSerializer implements JsonSerializer {
-    
+
     private final ObjectMapper objectMapper;
 
     public CloningJsonSerializer(ObjectMapper objectMapper) {

server/src/test/java/access/AbstractTest.java

@@ -272,7 +272,7 @@ protected AccessCookieFilter openIDConnectFlow(String path,
 
         String keyId = String.format("key_%s", new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss_SSS").format(new Date()));
         RSAKey rsaKey = generateRsaKey(keyId);
-        String publicKeysJson = new JWKSet(rsaKey.toPublicJWK()).toJSONObject().toString();
+        String publicKeysJson = new JWKSet(rsaKey.toPublicJWK()).toString();
         stubFor(get(urlPathMatching("/jwk-set")).willReturn(aResponse()
                 .withHeader("Content-Type", "application/json")
                 .withBody(publicKeysJson)));