diff --git a/src/main/java/io/hexlet/typoreporter/controller/AccountController.java b/src/main/java/io/hexlet/typoreporter/controller/AccountController.java index 12b2f301..f0e6c638 100644 --- a/src/main/java/io/hexlet/typoreporter/controller/AccountController.java +++ b/src/main/java/io/hexlet/typoreporter/controller/AccountController.java @@ -1,7 +1,9 @@ package io.hexlet.typoreporter.controller; import io.hexlet.typoreporter.domain.account.Account; +import io.hexlet.typoreporter.security.service.AccountDetailService; import io.hexlet.typoreporter.service.AccountService; +import io.hexlet.typoreporter.service.dto.account.CustomUserDetails; import io.hexlet.typoreporter.service.dto.account.UpdatePassword; import io.hexlet.typoreporter.service.dto.account.UpdateProfile; import io.hexlet.typoreporter.handler.exception.AccountAlreadyExistException; @@ -23,8 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; - @Slf4j @Controller @RequestMapping("/account") @@ -32,6 +32,7 @@ public class AccountController { private final AccountService accountService; + private final AccountDetailService accountDetailService; @GetMapping public String getAccountInfoPage(final Model model, final Authentication authentication) { @@ -64,8 +65,15 @@ public String putProfileUpdate(final Model model, try { final String email = authentication.getName(); Account updatedAccount = accountService.updateProfile(updateProfile, email); - final var authenticated = UsernamePasswordAuthenticationToken.authenticated(updatedAccount.getEmail(), - updatedAccount.getPassword(), List.of(() -> "ROLE_USER")); + + CustomUserDetails userDetails = (CustomUserDetails) accountDetailService + .loadUserByUsername(updatedAccount.getEmail()); + + final var authenticated = new UsernamePasswordAuthenticationToken( + userDetails, + userDetails.getPassword(), + userDetails.getAuthorities() + ); SecurityContextHolder.getContext().setAuthentication(authenticated); return "redirect:/account"; } catch (AccountAlreadyExistException e) { @@ -93,8 +101,14 @@ public String putPasswordUpdate(final Model model, try { final String email = authentication.getName(); Account updatedAccount = accountService.updatePassword(updatePassword, email); - final var authenticated = UsernamePasswordAuthenticationToken.authenticated(updatedAccount.getEmail(), - updatedAccount.getPassword(), List.of(() -> "ROLE_USER")); + CustomUserDetails userDetails = (CustomUserDetails) accountDetailService + .loadUserByUsername(updatedAccount.getEmail()); + + final var authenticated = new UsernamePasswordAuthenticationToken( + userDetails, + userDetails.getPassword(), + userDetails.getAuthorities() + ); SecurityContextHolder.getContext().setAuthentication(authenticated); return "redirect:/account"; } catch (OldPasswordWrongException | NewPasswordTheSameException e) { diff --git a/src/main/java/io/hexlet/typoreporter/controller/SignupController.java b/src/main/java/io/hexlet/typoreporter/controller/SignupController.java index fd8b406d..d1e86ec2 100644 --- a/src/main/java/io/hexlet/typoreporter/controller/SignupController.java +++ b/src/main/java/io/hexlet/typoreporter/controller/SignupController.java @@ -1,10 +1,11 @@ package io.hexlet.typoreporter.controller; -import io.hexlet.typoreporter.domain.workspace.AccountRole; +import io.hexlet.typoreporter.security.service.AccountDetailService; import io.hexlet.typoreporter.service.account.EmailAlreadyExistException; import io.hexlet.typoreporter.service.account.UsernameAlreadyExistException; import io.hexlet.typoreporter.service.account.signup.SignupAccountMapper; import io.hexlet.typoreporter.service.account.signup.SignupAccountUseCase; +import io.hexlet.typoreporter.service.dto.account.CustomUserDetails; import io.hexlet.typoreporter.service.dto.account.InfoAccount; import io.hexlet.typoreporter.web.model.SignupAccountModel; import jakarta.servlet.http.HttpServletRequest; @@ -27,8 +28,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; - @Slf4j @Controller @@ -39,6 +38,7 @@ public class SignupController { private final SignupAccountUseCase signupAccountUseCase; private final SignupAccountMapper signupAccountMapper; private final SecurityContextRepository securityContextRepository; + private final AccountDetailService accountDetailService; @GetMapping("/signup") public String getSignUpPage(final Model model) { @@ -61,8 +61,16 @@ public String createAccount(@ModelAttribute("signupAccount") @Valid SignupAccoun final InfoAccount newAccount; try { newAccount = signupAccountUseCase.signup(signupAccountMapper.toSignupAccount(signupAccountModel)); - final var authentication = UsernamePasswordAuthenticationToken. - authenticated(newAccount.email(), null, List.of(AccountRole.ROLE_GUEST::name)); + + CustomUserDetails userDetails = (CustomUserDetails) accountDetailService + .loadUserByUsername(newAccount.email()); + + final var authentication = new UsernamePasswordAuthenticationToken( + userDetails, + null, + userDetails.getAuthorities() + ); + autoLoginAfterSignup(request, response, authentication); return "redirect:/workspaces"; } catch (UsernameAlreadyExistException e) { diff --git a/src/main/java/io/hexlet/typoreporter/security/service/AccountDetailService.java b/src/main/java/io/hexlet/typoreporter/security/service/AccountDetailService.java index 4b85c257..4779886c 100644 --- a/src/main/java/io/hexlet/typoreporter/security/service/AccountDetailService.java +++ b/src/main/java/io/hexlet/typoreporter/security/service/AccountDetailService.java @@ -1,14 +1,19 @@ package io.hexlet.typoreporter.security.service; import io.hexlet.typoreporter.repository.AccountRepository; +import io.hexlet.typoreporter.service.dto.account.CustomUserDetails; import io.hexlet.typoreporter.utils.TextUtils; import lombok.RequiredArgsConstructor; -import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; + @Service @RequiredArgsConstructor public class AccountDetailService implements UserDetailsService { @@ -19,10 +24,11 @@ public class AccountDetailService implements UserDetailsService { public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { final String normalizedEmail = TextUtils.toLowerCaseData(email); return accountRepository.findAccountByEmail(normalizedEmail) - .map(acc -> User.withUsername(acc.getEmail()) - .password(acc.getPassword()) - .authorities("USER") - .build()) + .map(acc -> { + Collection authorities = + Collections.singletonList(new SimpleGrantedAuthority("USER")); + return new CustomUserDetails(acc.getEmail(), acc.getPassword(), acc.getUsername(), authorities); + }) .orElseThrow(() -> new UsernameNotFoundException("Account with email='" + email + "' not found")); } } diff --git a/src/main/java/io/hexlet/typoreporter/service/dto/account/CustomUserDetails.java b/src/main/java/io/hexlet/typoreporter/service/dto/account/CustomUserDetails.java new file mode 100644 index 00000000..05ab5ed2 --- /dev/null +++ b/src/main/java/io/hexlet/typoreporter/service/dto/account/CustomUserDetails.java @@ -0,0 +1,52 @@ +package io.hexlet.typoreporter.service.dto.account; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import java.util.Collection; +@AllArgsConstructor +public class CustomUserDetails implements UserDetails { + + private String email; + private String password; + @Getter + private final String nickname; + private Collection authorities; + + @Override + public String getUsername() { + return email; + } + + @Override + public String getPassword() { + return password; + } + + @Override + public Collection getAuthorities() { + return authorities; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } +} + diff --git a/src/main/resources/templates/fragments/panels.html b/src/main/resources/templates/fragments/panels.html index 7aa9be93..b4d9c424 100644 --- a/src/main/resources/templates/fragments/panels.html +++ b/src/main/resources/templates/fragments/panels.html @@ -30,13 +30,20 @@
-
  • - -
    • -
  • -
    - -
    +
  • + +
      + + +
      + +
      +
    • diff --git a/src/test/java/io/hexlet/typoreporter/web/AccountControllerIT.java b/src/test/java/io/hexlet/typoreporter/web/AccountControllerIT.java index 3603955c..8a070773 100644 --- a/src/test/java/io/hexlet/typoreporter/web/AccountControllerIT.java +++ b/src/test/java/io/hexlet/typoreporter/web/AccountControllerIT.java @@ -3,11 +3,13 @@ import com.github.database.rider.core.api.configuration.DBUnit; import com.github.database.rider.spring.api.DBRider; import io.hexlet.typoreporter.repository.AccountRepository; +import io.hexlet.typoreporter.service.dto.account.CustomUserDetails; import io.hexlet.typoreporter.test.DBUnitEnumPostgres; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.web.servlet.MockMvc; @@ -16,6 +18,8 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import java.util.List; + import static com.github.database.rider.core.api.configuration.Orthography.LOWERCASE; import static io.hexlet.typoreporter.test.Constraints.POSTGRES_IMAGE; import static org.assertj.core.api.Assertions.assertThat; @@ -75,7 +79,8 @@ void updateAccountWithWrongEmailDomain() throws Exception { .param("confirmPassword", password) .param("firstName", userName) .param("lastName", userName) - .with(user(correctEmailDomain)) + .with(user(new CustomUserDetails(correctEmailDomain, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(accountRepository.findAccountByEmail(wrongEmailDomain)).isEmpty(); assertThat(accountRepository.findAccountByEmail(correctEmailDomain).orElseThrow().getEmail()) @@ -105,7 +110,8 @@ void updateAccountEmailUsingDifferentCase() throws Exception { .param("lastName", username) .param("username", username) .param("email", emailUpperCase) - .with(user(emailLowerCase)) + .with(user(new CustomUserDetails(emailLowerCase, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(accountRepository.findAccountByEmail(emailUpperCase)).isEmpty(); assertThat(accountRepository.findAccountByEmail(emailLowerCase)).isNotEmpty(); diff --git a/src/test/java/io/hexlet/typoreporter/web/WorkspaceControllerIT.java b/src/test/java/io/hexlet/typoreporter/web/WorkspaceControllerIT.java index 7c90e348..2fca69d8 100644 --- a/src/test/java/io/hexlet/typoreporter/web/WorkspaceControllerIT.java +++ b/src/test/java/io/hexlet/typoreporter/web/WorkspaceControllerIT.java @@ -9,15 +9,19 @@ import io.hexlet.typoreporter.domain.typo.TypoStatus; import io.hexlet.typoreporter.domain.workspace.AccountRole; import io.hexlet.typoreporter.domain.workspace.Workspace; +import io.hexlet.typoreporter.domain.workspace.WorkspaceRole; import io.hexlet.typoreporter.domain.workspace.WorkspaceRoleId; import io.hexlet.typoreporter.domain.workspacesettings.WorkspaceSettings; import io.hexlet.typoreporter.repository.AccountRepository; import io.hexlet.typoreporter.repository.AllowedUrlRepository; import io.hexlet.typoreporter.repository.WorkspaceRepository; import io.hexlet.typoreporter.repository.WorkspaceRoleRepository; +import io.hexlet.typoreporter.service.WorkspaceRoleService; +import io.hexlet.typoreporter.service.dto.account.CustomUserDetails; import io.hexlet.typoreporter.service.dto.workspace.CreateWorkspace; import io.hexlet.typoreporter.service.mapper.WorkspaceMapper; import io.hexlet.typoreporter.test.DBUnitEnumPostgres; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -25,6 +29,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; @@ -35,18 +40,16 @@ import org.testcontainers.junit.jupiter.Testcontainers; import java.time.Instant; -import java.util.UUID; -import java.util.Set; import java.util.HashSet; +import java.util.List; import java.util.Optional; import java.util.Comparator; +import java.util.UUID; +import java.util.Set; -import org.junit.jupiter.api.Disabled; import static com.github.database.rider.core.api.configuration.Orthography.LOWERCASE; -import io.hexlet.typoreporter.domain.workspace.WorkspaceRole; -import io.hexlet.typoreporter.service.WorkspaceRoleService; import static io.hexlet.typoreporter.test.Constraints.POSTGRES_IMAGE; import static io.hexlet.typoreporter.test.factory.EntitiesFactory.ACCOUNT_102_EMAIL; @@ -127,7 +130,8 @@ void getWorkspaceInfoPageIsSuccessful(final Long wksId, MockHttpServletResponse response = mockMvc.perform( get("/workspace/{wksId}", wksId) - .with(user(email))) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(model().attributeExists("wksInfo", "wksName")) .andReturn().getResponse(); @@ -140,7 +144,8 @@ void getWorkspaceInfoPageIsNotSuccessful(final Long wksId, final String email) throws Exception { mockMvc.perform(get("/workspace/{wksId}", wksId)) .andExpect(redirectedUrl("/workspaces")); - mockMvc.perform(get("/workspace/{wksId}", wksId).with(user(email))) + mockMvc.perform(get("/workspace/{wksId}", wksId).with(user(new CustomUserDetails(email, + "password", "SampleNickname", List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(redirectedUrl("/workspaces")); } @@ -162,7 +167,8 @@ void getWorkspaceTyposPageIsSuccessful(final Long wksId, final String email) thr Workspace workspace = repository.getWorkspaceById(wksId).orElse(null); MockHttpServletResponse response = mockMvc.perform(get("/workspace/{wksId}/typos", wksId) - .with(user(email))) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(model().attributeExists("wksInfo", "wksName", "typoPage", "availableSizes", "sortProp", "sortDir", "DESC", "ASC")) .andReturn().getResponse(); @@ -187,7 +193,8 @@ void getWorkspaceTyposPageFilteredIsSuccessful(final Long wksId, final String em var request = get("/workspace/{wksId}/typos", wksId).queryParam("typoStatus", typoStatus); MockHttpServletResponse response = mockMvc.perform(request - .with(user(email))) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(model().attributeExists("wksInfo", "wksName", "typoPage", "availableSizes", "sortProp", "sortDir", "DESC", "ASC", "typoStatus")) .andReturn().getResponse(); @@ -217,7 +224,8 @@ void getWorkspaceUpdatePageIsSuccessful(final Long wksId, final String email) th Workspace workspace = repository.getWorkspaceById(wksId).orElse(null); MockHttpServletResponse response = mockMvc.perform(get("/workspace/{wksId}/update", wksId) - .with(user(email))) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(model().attributeExists("wksName", "formModified", "formModified")) .andReturn().getResponse(); assertThat(response.getContentAsString()).contains(workspace.getDescription()); @@ -240,7 +248,8 @@ void putWorkspaceUpdateIsSuccessful(final Long wksId, final String username) thr .param("name", newWksName) .param("url", "https://other.com") .param("description", "Wks description 01") - .with(user(username)) + .with(user(new CustomUserDetails(username, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())) .andExpect(redirectedUrl("/workspace/" + wksId)); @@ -269,7 +278,8 @@ void putWorkspaceUpdateWithExistingWksUpdateName(final Long wksId, final String mockMvc.perform(put("/workspace/{wksId}/update", wksId) .param("name", newWksName) .param("description", wksDescription) - .with(user(username)) + .with(user(new CustomUserDetails(username, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())) .andExpect(model().attributeExists("createWorkspace")); @@ -300,7 +310,8 @@ void putWorkspaceUpdateWithExistingWksUpdateUrl(final Long wksId, final String u .param("name", wks.getName()) .param("description", wksDescription) .param("url", newWksUrl) - .with(user(username)) + .with(user(new CustomUserDetails(username, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())) .andExpect(model().attributeExists("createWorkspace")); @@ -320,7 +331,8 @@ void deleteWorkspaceByIdIsSuccessful(final Long wksId, MockHttpServletResponse response = mockMvc.perform( delete("/workspace/{wksId}", wksId) - .with(user(username)) + .with(user(new CustomUserDetails(username, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())) .andReturn() .getResponse(); @@ -346,7 +358,8 @@ void getWorkspaceUsersPage(final Long wksId, final String email) throws Exceptio MockHttpServletResponse response = mockMvc.perform( get("/workspace/{wksId}/users", wksId) - .with(user(email))) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(status().isOk()) .andExpect(model().attributeExists("wksInfo", "wksName", "userPage", "availableSizes", "sortProp", "sortDir", "DESC", "ASC")) @@ -366,7 +379,8 @@ void delUserFromWorkspace() throws Exception { mockMvc.perform( post("/workspace/{wksId}/users", WORKSPACE_103_ID) .param("email", ACCOUNT_102_EMAIL) - .with(user(ACCOUNT_103_EMAIL)) + .with(user(new CustomUserDetails(ACCOUNT_103_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(workspaceRoleRepository.count()).isEqualTo(rolesCountBeforeAdding + 1L); Optional addedWksRoleOptional = workspaceRoleRepository @@ -376,7 +390,8 @@ void delUserFromWorkspace() throws Exception { mockMvc.perform( delete("/workspace/{wksId}/users", WORKSPACE_103_ID) .param("email", ACCOUNT_102_EMAIL) - .with(user(ACCOUNT_102_EMAIL)) + .with(user(new CustomUserDetails(ACCOUNT_102_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(workspaceRoleRepository.count()).isEqualTo(rolesCountBeforeAdding + 1L); Optional addedWksRoleStillThereOptional = workspaceRoleRepository @@ -386,7 +401,8 @@ void delUserFromWorkspace() throws Exception { mockMvc.perform( delete("/workspace/{wksId}/users", WORKSPACE_103_ID) .param("email", ACCOUNT_102_EMAIL) - .with(user(ACCOUNT_103_EMAIL)) + .with(user(new CustomUserDetails(ACCOUNT_103_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(workspaceRoleRepository.count()).isEqualTo(rolesCountBeforeAdding); Optional addedWksRoleDeletedOptional = workspaceRoleRepository @@ -399,7 +415,8 @@ void addUserNonValidEmailTest() throws Exception { var response = mockMvc.perform( post("/workspace/{wksId}/users", WORKSPACE_103_ID) .param("email", ACCOUNT_INCORRECT_EMAIL) - .with(user(ACCOUNT_103_EMAIL)) + .with(user(new CustomUserDetails(ACCOUNT_103_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())) .andReturn(); var body = response.getResponse().getContentAsString(); diff --git a/src/test/java/io/hexlet/typoreporter/web/WorkspaceSettingsControllerIT.java b/src/test/java/io/hexlet/typoreporter/web/WorkspaceSettingsControllerIT.java index 5a84838c..11c8b05d 100644 --- a/src/test/java/io/hexlet/typoreporter/web/WorkspaceSettingsControllerIT.java +++ b/src/test/java/io/hexlet/typoreporter/web/WorkspaceSettingsControllerIT.java @@ -9,6 +9,7 @@ import io.hexlet.typoreporter.repository.AllowedUrlRepository; import io.hexlet.typoreporter.repository.WorkspaceRepository; import io.hexlet.typoreporter.repository.WorkspaceSettingsRepository; +import io.hexlet.typoreporter.service.dto.account.CustomUserDetails; import io.hexlet.typoreporter.test.DBUnitEnumPostgres; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -17,6 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; @@ -30,6 +32,7 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; +import java.util.List; import static com.github.database.rider.core.api.configuration.Orthography.LOWERCASE; import static io.hexlet.typoreporter.test.Constraints.POSTGRES_IMAGE; @@ -95,7 +98,8 @@ void getWorkspaceIntegrationPageIsSuccessful(final Long wksId, final String emai .orElse(null); MockHttpServletResponse response = mockMvc.perform(get("/workspace/{wksId}/integration", wksId.toString()) - .with(user(email))) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(model().attributeExists("wksBasicToken", "wksName")) .andReturn().getResponse(); @@ -117,7 +121,8 @@ void getWorkspaceSettingsPageIsSuccessful(final Long wksId, final String usernam Set urls = new HashSet<>(urlRepository.findAll()); MockHttpServletResponse response = mockMvc.perform(get("/workspace/{wksId}/settings", wksId.toString()) - .with(user(username))) + .with(user(new CustomUserDetails(username, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER")))))) .andExpect(model().attributeExists("wksBasicToken", "wksName", "urlsPage", @@ -145,8 +150,9 @@ void patchWorkspaceTokenIsSuccessful(final Long wksId, final String email) throw .orElse(null); MockHttpServletResponse response = mockMvc.perform(patch("/workspace/{wksId}/token/regenerate", wksId) - .with(user(email)) - .with(csrf())) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) + .with(csrf())) .andReturn().getResponse(); String newWksToken = workspaceSettingsRepository.getWorkspaceSettingsByWorkspaceId(wksId) @@ -168,7 +174,8 @@ void patchWorkspaceTokenWithNoRights(final Long wksId, final String email) throw MockHttpServletResponse response = mockMvc.perform(patch("/workspace/{wksId}/token/regenerate", wksId.toString()) - .with(user(email)) + .with(user(new CustomUserDetails(email, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())) .andReturn().getResponse(); @@ -188,8 +195,9 @@ void addAllowedUrlToWorkspace() throws Exception { mockMvc.perform( post("/workspace/{wksId}/allowed-urls", WORKSPACE_101_ID) .param("url", "https://other.com") - .with(user(ACCOUNT_101_EMAIL)) - .with(csrf())); + .with(user(new CustomUserDetails(ACCOUNT_101_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) + .with(csrf())); assertThat(urlRepository.count()).isEqualTo(urlsCountBeforeAdding + 1L); var addedAllowedUrlOptional = urlRepository.findAllowedUrlByUrlAndWorkspaceId("https://other.com", WORKSPACE_101_ID); @@ -198,7 +206,8 @@ void addAllowedUrlToWorkspace() throws Exception { mockMvc.perform( post("/workspace/{wksId}/allowed-urls", WORKSPACE_101_ID) .param("url", ALLOWED_URL_101_URL) - .with(user(ACCOUNT_101_EMAIL)) + .with(user(new CustomUserDetails(ACCOUNT_101_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(urlRepository.count()).isEqualTo(urlsCountBeforeAdding + 1L); var oldAllowedUrlOptional = urlRepository.findAllowedUrlByUrlAndWorkspaceId(ALLOWED_URL_101_URL, @@ -213,7 +222,8 @@ void delAllowedUrlFromWorkspace() throws Exception { mockMvc.perform( delete("/workspace/{wksId}/allowed-urls", WORKSPACE_101_ID) .param("url", ALLOWED_URL_104_URL) - .with(user(ACCOUNT_101_EMAIL)) + .with(user(new CustomUserDetails(ACCOUNT_101_EMAIL, "password", "SampleNickname", + List.of(new SimpleGrantedAuthority("USER"))))) .with(csrf())); assertThat(urlRepository.count()).isEqualTo(urlsCountBeforeAdding - 1L); var deletedAllowedUrlOptional = urlRepository.findAllowedUrlByUrlAndWorkspaceId(ALLOWED_URL_104_URL,