Debug and style ReviewPage

backend/src/main/java/org/example/backend/security/AppUser.java

@@ -1,5 +1,6 @@
 package org.example.backend.security;
 
+
 public record AppUser(String id,
                       String name,
                       String avatarUrl,

backend/src/main/java/org/example/backend/security/SecurityConfig.java

@@ -39,6 +39,7 @@ public DefaultSecurityFilterChain securityFilterChain(HttpSecurity httpSecurity)
                         .requestMatchers("/api/vocab").authenticated()
                         .requestMatchers("/api/vocab/login").permitAll()
                         .requestMatchers("/api/vocab/auth").permitAll()
+                        .requestMatchers("/api/vocab/auth/name").permitAll()
                         .requestMatchers("/api/vocab/**").authenticated()
                         .requestMatchers("/api/calendar").authenticated()
                         .anyRequest().permitAll())

backend/src/main/java/org/example/backend/security/UserController.java

@@ -2,6 +2,7 @@
 
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,14 +15,22 @@ public class UserController {
 
     private final UserRepo userRepo;
 
-
     @GetMapping
-    public AppUser getUser(@AuthenticationPrincipal OAuth2User user) {
+    public String getUserId(){
+        String userId = SecurityContextHolder
+                .getContext()
+                .getAuthentication()
+                .getName();
+        if (userId.equals("anonymousUser")) {return "";}
+        return userId;
+    }
+
+    @GetMapping("/name")
+    public AppUser getUserName(@AuthenticationPrincipal OAuth2User user) {
         if
-       ( user == null) {
+        ( user == null) {
             return new AppUser("NotFound", "", null, null);
         }
         return userRepo.findById(user.getName()).orElseThrow();
     }
-
 }

backend/src/main/java/org/example/backend/vocab/VocabService.java

@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +37,8 @@ public Vocab deactivateVocab(String id, String userName) throws IdNotFoundExcept
 
     public Vocab activateVocab(String id, String userName) throws IdNotFoundException {
         Vocab vocab = vocabRepo.findById(id).orElseThrow(() -> new IdNotFoundException("ID not found."));
-        List<LocalDate> dates = generateDates(LocalDate.now());
+        LocalDate today = ZonedDateTime.now().toLocalDate();
+        List<LocalDate> dates = generateDates(today);
         vocab.getDatesPerUser().put(userName, dates);
         return vocabRepo.save(vocab);
     }
@@ -59,7 +61,9 @@ public Vocab createVocab(VocabDTOCreate vocabDTO, String userName) throws Langua
     public Vocab createAndActivateVocab(VocabDTOCreate vocabDTO, String userName) throws LanguageNotFoundException {
         Language language = Language.getEnumByString(vocabDTO.language());
         Map<String, List<LocalDate>> datesPerUser = new HashMap<>();
-        List<LocalDate> dates = generateDates(LocalDate.now());
+        LocalDate today = ZonedDateTime.now().toLocalDate();
+        System.out.println(today.getClass().getName());
+        List<LocalDate> dates = generateDates(today);
         datesPerUser.put(userName, dates);
         Vocab newVocab = new Vocab(null, vocabDTO.word(), vocabDTO.translation(),
                 vocabDTO.info(), language, datesPerUser, userName);

backend/src/test/java/org/example/backend/security/UserControllerTest.java

@@ -9,6 +9,7 @@
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oidcLogin;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -22,12 +23,29 @@ class UserControllerTest {
     @Autowired
     private UserRepo userRepo;
 
+    @Test
+    void getUserId_shouldReturnUserId_whenCalled_ifUserIsLoggedIn() throws Exception {
+        mvc.perform(MockMvcRequestBuilders.get("/api/vocab/auth")
+                        .with(user("12345").roles("USER")))
+                .andExpect(status().isOk())
+                .andExpect(content().string("12345"));
+    }
+
+    @Test
+    void getUserId_shouldReturnEmptyString_whenCalled_ifUserIsNotLoggedIn() throws Exception {
+        mvc.perform(MockMvcRequestBuilders.get("/api/vocab/auth"))
+                .andExpect(status().isOk())
+                .andExpect(content().string(""));
+    }
+
+
+
     @DirtiesContext
     @Test
-    void getUser_shouldReturn200AndUserObject_whenCalled_ifUserIsLoggedIn() throws Exception {
+    void getUserName_shouldReturn200AndUserObject_whenCalled_ifUserIsLoggedIn() throws Exception {
         AppUser testUser = new AppUser("user", "Hans", null, null);
         userRepo.save(testUser);
-        mvc.perform(MockMvcRequestBuilders.get("/api/vocab/auth")
+        mvc.perform(MockMvcRequestBuilders.get("/api/vocab/auth/name")
                         .with(oidcLogin()
                                 .userInfoToken(token -> token.claim("login", "Hans"))))
                 .andExpect(status().isOk())
@@ -38,8 +56,8 @@ void getUser_shouldReturn200AndUserObject_whenCalled_ifUserIsLoggedIn() throws E
 
     @DirtiesContext
     @Test
-    void getUser_shouldReturn200AndDummyUserObject_whenCalled_ifUserIsNotLoggedIn() throws Exception {
-        mvc.perform(MockMvcRequestBuilders.get("/api/vocab/auth"))
+    void getUserName_shouldReturn200AndDummyUserObject_whenCalled_ifUserIsNotLoggedIn() throws Exception {
+        mvc.perform(MockMvcRequestBuilders.get("/api/vocab/auth/name"))
                 .andExpect(status().isOk())
                 .andExpect(content().json("""
                         {"id":"NotFound","name":"","avatarUrl":null,"authority":null}

frontend/src/App.css

@@ -1,7 +1,11 @@
 #app {
-    height: 100vh;
+    width: 100%;
     padding: 0;
     margin: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
 }