Skip to content

Allow retro participants to use focus endpoints #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LowBudgetMan merged 1 commit into from
Mar 21, 2026
Merged

Allow retro participants to use focus endpoints #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/nickreuter/retroapi/retro/event/RetroEventController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ public ResponseEntity<Void> stopTimer(@PathVariable UUID teamId, @PathVariable U
}

@PostMapping("/focus")
@PreAuthorize("@userMappingAuthorizationService.isUserMemberOfTeam(authentication, #teamId)")
@PreAuthorize("@retroAuthorizationService.isUserAllowedInRetro(authentication, #retroId)")
public ResponseEntity<Void> focusThought(@PathVariable UUID teamId, @PathVariable UUID retroId, @RequestBody FocusRequest request) {
retroEventService.publishFocus(retroId, request.thoughtId());
return ResponseEntity.ok().build();
}

@PostMapping("/focus-clear")
@PreAuthorize("@userMappingAuthorizationService.isUserMemberOfTeam(authentication, #teamId)")
@PreAuthorize("@retroAuthorizationService.isUserAllowedInRetro(authentication, #retroId)")
public ResponseEntity<Void> clearFocus(@PathVariable UUID teamId, @PathVariable UUID retroId) {
retroEventService.publishFocusClear(retroId);
return ResponseEntity.ok().build();
Expand Down
21 changes: 13 additions & 8 deletions src/test/java/io/nickreuter/retroapi/retro/event/RetroEventControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.nickreuter.retroapi.retro.event;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.nickreuter.retroapi.retro.RetroAuthorizationService;
import io.nickreuter.retroapi.team.usermapping.UserMappingAuthorizationService;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -28,6 +29,8 @@ class RetroEventControllerTest {
private RetroEventService retroEventService;
@MockitoBean
private UserMappingAuthorizationService userMappingAuthorizationService;
@MockitoBean
private RetroAuthorizationService retroAuthorizationService;

@Autowired
private MockMvc mockMvc;
Expand Down Expand Up @@ -110,7 +113,7 @@ void focusThought_Returns200() throws Exception {
var teamId = UUID.randomUUID();
var retroId = UUID.randomUUID();
var thoughtId = UUID.randomUUID();
when(userMappingAuthorizationService.isUserMemberOfTeam(createAuthentication(), teamId)).thenReturn(true);
when(retroAuthorizationService.isUserAllowedInRetro(createAuthentication(), retroId)).thenReturn(true);
mockMvc.perform(post((BASE_URL + "/focus").formatted(teamId, retroId))
.with(jwt())
.with(csrf())
Expand All @@ -131,10 +134,11 @@ void focusThought_WhenAnonymous_Returns401() throws Exception {
}

@Test
void focusThought_WhenNotMember_Returns403() throws Exception {
void focusThought_WhenNotAllowedInRetro_Returns403() throws Exception {
var teamId = UUID.randomUUID();
when(userMappingAuthorizationService.isUserMemberOfTeam(createAuthentication(), teamId)).thenReturn(false);
mockMvc.perform(post((BASE_URL + "/focus").formatted(teamId, UUID.randomUUID()))
var retroId = UUID.randomUUID();
when(retroAuthorizationService.isUserAllowedInRetro(createAuthentication(), retroId)).thenReturn(false);
mockMvc.perform(post((BASE_URL + "/focus").formatted(teamId, retroId))
.with(jwt())
.with(csrf())
.contentType(MediaType.APPLICATION_JSON)
Expand All @@ -147,7 +151,7 @@ void focusThought_WhenNotMember_Returns403() throws Exception {
void clearFocus_Returns200() throws Exception {
var teamId = UUID.randomUUID();
var retroId = UUID.randomUUID();
when(userMappingAuthorizationService.isUserMemberOfTeam(createAuthentication(), teamId)).thenReturn(true);
when(retroAuthorizationService.isUserAllowedInRetro(createAuthentication(), retroId)).thenReturn(true);
mockMvc.perform(post((BASE_URL + "/focus-clear").formatted(teamId, retroId))
.with(jwt())
.with(csrf()))
Expand All @@ -164,10 +168,11 @@ void clearFocus_WhenAnonymous_Returns401() throws Exception {
}

@Test
void clearFocus_WhenNotMember_Returns403() throws Exception {
void clearFocus_WhenNotAllowedInRetro_Returns403() throws Exception {
var teamId = UUID.randomUUID();
when(userMappingAuthorizationService.isUserMemberOfTeam(createAuthentication(), teamId)).thenReturn(false);
mockMvc.perform(post((BASE_URL + "/focus-clear").formatted(teamId, UUID.randomUUID()))
var retroId = UUID.randomUUID();
when(retroAuthorizationService.isUserAllowedInRetro(createAuthentication(), retroId)).thenReturn(false);
mockMvc.perform(post((BASE_URL + "/focus-clear").formatted(teamId, retroId))
.with(jwt())
.with(csrf()))
.andExpect(status().isForbidden());
Expand Down
Loading