1
0
mirror of synced 2026-08-05 17:57:15 +00:00

Add noformat blocks around User.withUsername

Find `User.withUsername` calls and protect them against formatting.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-23 13:05:15 -07:00
committed by Rob Winch
parent 63b5998fad
commit 6979125ccf
8 changed files with 26 additions and 3 deletions
@@ -76,10 +76,12 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests {
@Test
public void authenticateWhenPasswordNotEqualThenBadCredentials() {
// @formatter:off
UserDetails user = PasswordEncodedUser.withUsername(this.username)
.password(this.password)
.roles("USER")
.build();
// @formatter:on
when(repository.findByUsername(user.getUsername())).thenReturn(Mono.just(user));
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, this.password + "INVALID");
@@ -93,10 +95,12 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests {
@Test
public void authenticateWhenSuccessThenSuccess() {
// @formatter:off
UserDetails user = PasswordEncodedUser.withUsername(this.username)
.password(this.password)
.roles("USER")
.build();
// @formatter:on
when(repository.findByUsername(user.getUsername())).thenReturn(Mono.just(user));
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(username, password);
@@ -59,10 +59,12 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
@Mock
private UserDetailsChecker postAuthenticationChecks;
// @formatter:off
private UserDetails user = User.withUsername("user")
.password("password")
.roles("USER")
.build();
// @formatter:on
private UserDetailsRepositoryReactiveAuthenticationManager manager;
@@ -176,12 +178,13 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
@Test(expected = AccountExpiredException.class)
public void authenticateWhenAccountExpiredThenException() {
this.manager.setPasswordEncoder(this.encoder);
// @formatter:off
UserDetails expiredUser = User.withUsername("user")
.password("password")
.roles("USER")
.accountExpired(true)
.build();
// @formatter:on
when(this.userDetailsService.findByUsername(any())).thenReturn(Mono.just(expiredUser));
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
@@ -193,12 +196,13 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
@Test(expected = LockedException.class)
public void authenticateWhenAccountLockedThenException() {
this.manager.setPasswordEncoder(this.encoder);
// @formatter:off
UserDetails lockedUser = User.withUsername("user")
.password("password")
.roles("USER")
.accountLocked(true)
.build();
// @formatter:on
when(this.userDetailsService.findByUsername(any())).thenReturn(Mono.just(lockedUser));
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
@@ -211,11 +215,13 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
public void authenticateWhenAccountDisabledThenException() {
this.manager.setPasswordEncoder(this.encoder);
// @formatter:off
UserDetails disabledUser = User.withUsername("user")
.password("password")
.roles("USER")
.disabled(true)
.build();
// @formatter:on
when(this.userDetailsService.findByUsername(any())).thenReturn(Mono.just(disabledUser));
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
@@ -27,10 +27,12 @@ import org.junit.Test;
import reactor.core.publisher.Mono;
public class MapReactiveUserDetailsServiceTests {
// @formatter:off
private static final UserDetails USER_DETAILS = User.withUsername("user")
.password("password")
.roles("USER")
.build();
// @formatter:on
private MapReactiveUserDetailsService users = new MapReactiveUserDetailsService(Arrays.asList(USER_DETAILS));
@@ -203,11 +203,13 @@ public class UserTests {
@Test
public void withUsernameWhenPasswordAndPasswordEncoderThenEncodes() {
// @formatter:off
UserDetails withEncodedPassword = User.withUsername("user")
.passwordEncoder(p -> p + "encoded")
.password("password")
.roles("USER")
.build();
// @formatter:on
assertThat(withEncodedPassword.getPassword()).isEqualTo("passwordencoded");
}
@@ -215,12 +217,14 @@ public class UserTests {
@Test
public void withUsernameWhenPasswordAndPasswordEncoderTwiceThenEncodesOnce() {
Function<String, String> encoder = p -> p + "encoded";
// @formatter:off
UserDetails withEncodedPassword = User.withUsername("user")
.passwordEncoder(encoder)
.password("password")
.passwordEncoder(encoder)
.roles("USER")
.build();
// @formatter:on
assertThat(withEncodedPassword.getPassword()).isEqualTo("passwordencoded");
}