From 01b9281c231dd3edd992a3c04e4e901adeef80a1 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 30 Sep 2026 16:17:16 +0000 Subject: [PATCH] COG-1154: map user enable/disable to POST and update AdminPortal caller Co-Authored-By: patrick.bradley --- AdminPortal/src/app/user.service.ts | 13 +++- .../com/userFront/resource/UserResource.java | 5 +- .../userFront/resource/UserResourceTest.java | 63 +++++++++++++++++++ 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 UserFront/src/test/java/com/userFront/resource/UserResourceTest.java diff --git a/AdminPortal/src/app/user.service.ts b/AdminPortal/src/app/user.service.ts index bde10a38..624cb725 100644 --- a/AdminPortal/src/app/user.service.ts +++ b/AdminPortal/src/app/user.service.ts @@ -24,12 +24,21 @@ export class UserService { enableUser (username: string) { let url = "http://localhost:8080/api/user/"+username+"/enable"; - return this.http.get(url, { withCredentials: true }); + return this.http.post(url, null, { headers: this.xsrfHeaders(), withCredentials: true }); } disableUser (username: string) { let url = "http://localhost:8080/api/user/"+username+"/disable"; - return this.http.get(url, { withCredentials: true }); + return this.http.post(url, null, { headers: this.xsrfHeaders(), withCredentials: true }); + } + + private xsrfHeaders(): Headers { + const headers = new Headers(); + const match = document.cookie.match(/(?:^|;\s*)XSRF-TOKEN=([^;]*)/); + if (match) { + headers.append('X-XSRF-TOKEN', decodeURIComponent(match[1])); + } + return headers; } } diff --git a/UserFront/src/main/java/com/userFront/resource/UserResource.java b/UserFront/src/main/java/com/userFront/resource/UserResource.java index d43c01b9..b8a48391 100644 --- a/UserFront/src/main/java/com/userFront/resource/UserResource.java +++ b/UserFront/src/main/java/com/userFront/resource/UserResource.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -42,12 +43,12 @@ public List getSavingsTransactionList(@RequestParam("usernam return transactionService.findSavingsTransactionList(username); } - @RequestMapping("/user/{username}/enable") + @PostMapping("/user/{username}/enable") public void enableUser(@PathVariable("username") String username) { userService.enableUser(username); } - @RequestMapping("/user/{username}/disable") + @PostMapping("/user/{username}/disable") public void diableUser(@PathVariable("username") String username) { userService.disableUser(username); } diff --git a/UserFront/src/test/java/com/userFront/resource/UserResourceTest.java b/UserFront/src/test/java/com/userFront/resource/UserResourceTest.java new file mode 100644 index 00000000..5e70c6d4 --- /dev/null +++ b/UserFront/src/test/java/com/userFront/resource/UserResourceTest.java @@ -0,0 +1,63 @@ +package com.userFront.resource; + +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import com.userFront.service.TransactionService; +import com.userFront.service.UserService; + +@RunWith(MockitoJUnitRunner.class) +public class UserResourceTest { + + @Mock + private UserService userService; + + @Mock + private TransactionService transactionService; + + @InjectMocks + private UserResource userResource; + + private MockMvc mockMvc; + + @Before + public void setUp() { + mockMvc = MockMvcBuilders.standaloneSetup(userResource).build(); + } + + @Test + public void postEnableEnablesUser() throws Exception { + mockMvc.perform(post("/api/user/alice/enable")).andExpect(status().isOk()); + verify(userService).enableUser("alice"); + } + + @Test + public void postDisableDisablesUser() throws Exception { + mockMvc.perform(post("/api/user/alice/disable")).andExpect(status().isOk()); + verify(userService).disableUser("alice"); + } + + @Test + public void getEnableIsMethodNotAllowed() throws Exception { + mockMvc.perform(get("/api/user/alice/enable")).andExpect(status().isMethodNotAllowed()); + verify(userService, never()).enableUser("alice"); + } + + @Test + public void getDisableIsMethodNotAllowed() throws Exception { + mockMvc.perform(get("/api/user/alice/disable")).andExpect(status().isMethodNotAllowed()); + verify(userService, never()).disableUser("alice"); + } +}