Light refactorinh aaa tests

nkonev · Nov 3, 2023 · fc26a2f · fc26a2f
1 parent 3235c57
commit fc26a2f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/aaa/src/test/java/com/github/nkonev/aaa/AbstractUtTestRunner.java b/aaa/src/test/java/com/github/nkonev/aaa/AbstractUtTestRunner.java
@@ -43,7 +43,7 @@ public abstract class AbstractUtTestRunner extends AbstractTestRunner {
      * @return
      * @throws Exception
      */
-    protected String getSession(String xsrf, String username, String password) throws Exception {
+    protected String getSession(String username, String password) throws Exception {
         MvcResult mvcResult = mockMvc.perform(
                 post(SecurityConfig.API_LOGIN_URL)
                         .contentType(MediaType.APPLICATION_FORM_URLENCODED)

diff --git a/aaa/src/test/java/com/github/nkonev/aaa/TestConstants.java b/aaa/src/test/java/com/github/nkonev/aaa/TestConstants.java
@@ -22,4 +22,6 @@ public class TestConstants {
     public static final String SQL_QUERY = "select * from fake_users;";
     public static final String USER_DETAILS = "/user-details-vuln";
 
+    public static final String XSRF_TOKEN_VALUE = "xsrf";
+
 }
diff --git a/aaa/src/test/java/com/github/nkonev/aaa/controllers/UserProfileControllerTest.java b/aaa/src/test/java/com/github/nkonev/aaa/controllers/UserProfileControllerTest.java
@@ -38,6 +38,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static com.github.nkonev.aaa.TestConstants.XSRF_TOKEN_VALUE;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -268,9 +269,8 @@ public void fullyAuthenticatedUserCannotTakeForeignEmail() throws Exception {
 
     @org.junit.jupiter.api.Test
     public void userCanSeeTheirOwnEmail() throws Exception {
-        String xsrf = "xsrf";
-        String session = getSession(xsrf, TestConstants.USER_ADMIN, password);
-        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, xsrf), new HttpCookie(getAuthCookieName(), session));
+        String session = getSession(TestConstants.USER_ADMIN, password);
+        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, XSRF_TOKEN_VALUE), new HttpCookie(getAuthCookieName(), session));
 
         UserAccount foreignUserAccount = getUserFromBd(TestConstants.USER_ADMIN);
         RequestEntity requestEntity = RequestEntity
@@ -324,9 +324,8 @@ public void testGetManyUsers() throws Exception {
 
     @org.junit.jupiter.api.Test
     public void userCanSeeOnlyOwnProfileEmail() throws Exception {
-        String xsrf = "xsrf";
-        String session = getSession(xsrf, TestConstants.USER_ALICE, TestConstants.USER_ALICE_PASSWORD);
-        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, xsrf), new HttpCookie(getAuthCookieName(), session));
+        String session = getSession(TestConstants.USER_ALICE, TestConstants.USER_ALICE_PASSWORD);
+        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, XSRF_TOKEN_VALUE), new HttpCookie(getAuthCookieName(), session));
 
         UserAccount foreignUserAccount = getUserFromBd(TestConstants.USER_BOB);
         RequestEntity requestEntity = RequestEntity
@@ -340,11 +339,9 @@ public void userCanSeeOnlyOwnProfileEmail() throws Exception {
 
     @org.junit.jupiter.api.Test
     public void userCannotManageSessions() throws Exception {
-        String xsrf = "xsrf";
+        String session = getSession(TestConstants.USER_ALICE, TestConstants.USER_ALICE_PASSWORD);
 
-        String session = getSession(xsrf, TestConstants.USER_ALICE, TestConstants.USER_ALICE_PASSWORD);
-
-        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, xsrf), new HttpCookie(getAuthCookieName(), session));
+        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, XSRF_TOKEN_VALUE), new HttpCookie(getAuthCookieName(), session));
 
         RequestEntity requestEntity = RequestEntity
                 .get(new URI(urlWithContextPath() + Constants.Urls.PUBLIC_API + Constants.Urls.SESSIONS + "?userId=1"))
@@ -361,10 +358,9 @@ public void userCannotManageSessions() throws Exception {
 
     @org.junit.jupiter.api.Test
     public void adminCanManageSessions() throws Exception {
-        String xsrf = "xsrf";
-        String session = getSession(xsrf, username, password);
+        String session = getSession(username, password);
 
-        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, xsrf), new HttpCookie(getAuthCookieName(), session));
+        String headerValue = buildCookieHeader(new HttpCookie(TestConstants.HEADER_XSRF_TOKEN, XSRF_TOKEN_VALUE), new HttpCookie(getAuthCookieName(), session));
 
         RequestEntity requestEntity = RequestEntity
                 .get(new URI(urlWithContextPath() + Constants.Urls.PUBLIC_API + Constants.Urls.SESSIONS + "?userId=1"))
@@ -544,8 +540,7 @@ public void userCannotDeleteUser() throws Exception {
 
     @Test
     public void testMySessions() throws Exception {
-        String xsrf = "xsrf";
-        String session = getSession(xsrf, "admin", "admin");
+        String session = getSession("admin", "admin");
 
         mockMvc.perform(
                         get(Constants.Urls.PUBLIC_API +Constants.Urls.SESSIONS+"/my")
@@ -559,9 +554,8 @@ public void testMySessions() throws Exception {
 
     @Test
     public void ldapLoginTest() throws Exception {
-        String xsrf = "xsrf";
         // https://spring.io/guides/gs/authenticating-ldap/
-        String session = getSession(xsrf, "bob", "bobspassword");
+        getSession("bob", "bobspassword");
         Optional<UserAccount> bob = userAccountRepository.findByUsername("bob");
         Assertions.assertTrue(bob.isPresent());
         Map<String, Session> bobRedisSessions = aaaUserDetailsService.getSessions("bob");