Merge branch 'master' into stage

DDH-RD · May 29, 2024 · 42647c4 · 42647c4
2 parents 89ad316 + 6212991
commit 42647c4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/paladins-webservice/src/main/java/dev/luzifer/spring/controller/CsrfController.java b/paladins-webservice/src/main/java/dev/luzifer/spring/controller/CsrfController.java
@@ -0,0 +1,14 @@
+package dev.luzifer.spring.controller;
+
+import org.springframework.security.web.csrf.CsrfToken;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class CsrfController {
+
+  @GetMapping("/csrf")
+  public String getCsrfToken(CsrfToken token) {
+    return token.getToken();
+  }
+}
diff --git a/paladins-webservice/src/main/java/dev/luzifer/spring/controller/MatchController.java b/paladins-webservice/src/main/java/dev/luzifer/spring/controller/MatchController.java
@@ -63,6 +63,7 @@ public CompletableFuture<ResponseEntity<?>> pushMatches(@RequestBody GameDto[] g
   @GetMapping("${api.match.count}")
   public CompletableFuture<ResponseEntity<Long>> countGameInfos() {
     long count = matchService.countMatches();
+    log.info("Counted {} game information", count);
     return CompletableFuture.completedFuture(ResponseEntity.ok(count));
   }
 

diff --git a/paladins-webservice/src/main/resources/application.properties b/paladins-webservice/src/main/resources/application.properties
@@ -15,6 +15,8 @@ spring.jpa.hibernate.ddl-auto=update
 # Caching
 spring.data.redis.host=localhost
 spring.data.redis.port=6379
+# Hurensohn
+spring.main.allow-circular-references=true
 # API-Requests
 api.key=THV6aSBpc3QgZWluIFPDvMOfaQ==
 api.key.header=API-KEY