Browse Source

Rename userDetailsRepository to userDetailsService

pull/4904/head
Johnny Lim 8 years ago committed by Rob Winch
parent
commit
f3830eec7d
  1. 4
      config/src/main/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurity.java
  2. 2
      config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java
  3. 2
      config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationBuilder.java
  4. 2
      config/src/test/java/org/springframework/security/config/users/ReactiveAuthenticationTestConfiguration.java
  5. 10
      core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManager.java
  6. 6
      core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java
  7. 8
      docs/manual/src/docs/asciidoc/index.adoc
  8. 2
      samples/javaconfig/hellowebflux-method/src/main/java/sample/SecurityConfig.java
  9. 2
      samples/javaconfig/hellowebflux/src/main/java/sample/HelloWebfluxSecurityConfig.java
  10. 2
      samples/javaconfig/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnSecurityConfig.java
  11. 2
      samples/javaconfig/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java

4
config/src/main/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurity.java

@ -38,7 +38,7 @@ import java.lang.annotation.Target; @@ -38,7 +38,7 @@ import java.lang.annotation.Target;
* public class MyMinimalSecurityConfiguration {
*
* @Bean
* public MapReactiveUserDetailsService userDetailsRepository() {
* public MapReactiveUserDetailsService userDetailsService() {
* UserDetails user = User.withDefaultPasswordEncoder()
* .username("user")
* .password("password")
@ -66,7 +66,7 @@ import java.lang.annotation.Target; @@ -66,7 +66,7 @@ import java.lang.annotation.Target;
* }
*
* @Bean
* public MapReactiveUserDetailsService userDetailsRepository() {
* public MapReactiveUserDetailsService userDetailsService() {
* UserDetails user = User.withDefaultPasswordEncoder()
* .username("user")
* .password("password")

2
config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java

@ -212,7 +212,7 @@ public class EnableWebFluxSecurityTests { @@ -212,7 +212,7 @@ public class EnableWebFluxSecurityTests {
@EnableWebFluxSecurity
static class CustomPasswordEncoderConfig {
@Bean
public ReactiveUserDetailsService userDetailsRepository(PasswordEncoder encoder) {
public ReactiveUserDetailsService userDetailsService(PasswordEncoder encoder) {
return new MapReactiveUserDetailsService(User.withUsername("user")
.password(encoder.encode("password"))
.roles("USER")

2
config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationBuilder.java

@ -33,7 +33,7 @@ public class ServerHttpSecurityConfigurationBuilder { @@ -33,7 +33,7 @@ public class ServerHttpSecurityConfigurationBuilder {
public static ServerHttpSecurity httpWithDefaultAuthentication() {
ReactiveUserDetailsService reactiveUserDetailsService = ReactiveAuthenticationTestConfiguration
.userDetailsRepository();
.userDetailsService();
ReactiveAuthenticationManager authenticationManager = new UserDetailsRepositoryReactiveAuthenticationManager(
reactiveUserDetailsService);
return http()

2
config/src/test/java/org/springframework/security/config/users/ReactiveAuthenticationTestConfiguration.java

@ -29,7 +29,7 @@ import org.springframework.security.core.userdetails.ReactiveUserDetailsService; @@ -29,7 +29,7 @@ import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
@Configuration
public class ReactiveAuthenticationTestConfiguration {
@Bean
public static ReactiveUserDetailsService userDetailsRepository() {
public static ReactiveUserDetailsService userDetailsService() {
return new MapReactiveUserDetailsService(PasswordEncodedUser.user(), PasswordEncodedUser.admin());
}
}

10
core/src/main/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManager.java

@ -30,19 +30,19 @@ import reactor.core.scheduler.Schedulers; @@ -30,19 +30,19 @@ import reactor.core.scheduler.Schedulers;
* @since 5.0
*/
public class UserDetailsRepositoryReactiveAuthenticationManager implements ReactiveAuthenticationManager {
private final ReactiveUserDetailsService repository;
private final ReactiveUserDetailsService userDetailsService;
private PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
public UserDetailsRepositoryReactiveAuthenticationManager(ReactiveUserDetailsService reactiveUserDetailsService) {
Assert.notNull(reactiveUserDetailsService, "userDetailsRepository cannot be null");
this.repository = reactiveUserDetailsService;
public UserDetailsRepositoryReactiveAuthenticationManager(ReactiveUserDetailsService userDetailsService) {
Assert.notNull(userDetailsService, "userDetailsService cannot be null");
this.userDetailsService = userDetailsService;
}
@Override
public Mono<Authentication> authenticate(Authentication authentication) {
final String username = authentication.getName();
return this.repository.findByUsername(username)
return this.userDetailsService.findByUsername(username)
.publishOn(Schedulers.parallel())
.filter( u -> this.passwordEncoder.matches((String) authentication.getCredentials(), u.getPassword()))
.switchIfEmpty( Mono.error(new BadCredentialsException("Invalid Credentials")) )

6
core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java

@ -56,9 +56,9 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests { @@ -56,9 +56,9 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests {
}
@Test(expected = IllegalArgumentException.class)
public void constructorNullUserDetailsRepository() {
ReactiveUserDetailsService udr = null;
new UserDetailsRepositoryReactiveAuthenticationManager(udr);
public void constructorNullUserDetailsService() {
ReactiveUserDetailsService userDetailsService = null;
new UserDetailsRepositoryReactiveAuthenticationManager(userDetailsService);
}
@Test

8
docs/manual/src/docs/asciidoc/index.adoc

@ -825,7 +825,7 @@ You can find a minimal WebFlux Security configuration below: @@ -825,7 +825,7 @@ You can find a minimal WebFlux Security configuration below:
public class HelloWebfluxSecurityConfig {
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
UserDetails user = User.withDefaultPasswordEncoder()
.username("user")
.password("user")
@ -850,7 +850,7 @@ You can find an explicit version of the minimal WebFlux Security configuration b @@ -850,7 +850,7 @@ You can find an explicit version of the minimal WebFlux Security configuration b
public class HelloWebfluxSecurityConfig {
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
UserDetails user = User.withDefaultPasswordEncoder()
.username("user")
.password("user")
@ -1750,7 +1750,7 @@ Below is a minimal method security configuration when using method security in r @@ -1750,7 +1750,7 @@ Below is a minimal method security configuration when using method security in r
@EnableReactiveMethodSecurity
public class SecurityConfig {
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
User.UserBuilder userBuilder = User.withDefaultPasswordEncoder();
UserDetails rob = userBuilder.username("rob").password("rob").roles("USER").build();
UserDetails admin = userBuilder.username("admin").password("admin").roles("USER","ADMIN").build();
@ -1798,7 +1798,7 @@ public class SecurityConfig { @@ -1798,7 +1798,7 @@ public class SecurityConfig {
}
@Bean
MapReactiveUserDetailsService userDetailsRepository() {
MapReactiveUserDetailsService userDetailsService() {
User.UserBuilder userBuilder = User.withDefaultPasswordEncoder();
UserDetails rob = userBuilder.username("rob").password("rob").roles("USER").build();
UserDetails admin = userBuilder.username("admin").password("admin").roles("USER","ADMIN").build();

2
samples/javaconfig/hellowebflux-method/src/main/java/sample/SecurityConfig.java

@ -46,7 +46,7 @@ public class SecurityConfig { @@ -46,7 +46,7 @@ public class SecurityConfig {
}
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
User.UserBuilder userBuilder = User.withDefaultPasswordEncoder();
UserDetails rob = userBuilder.username("rob").password("rob").roles("USER").build();
UserDetails admin = userBuilder.username("admin").password("admin").roles("USER", "ADMIN").build();

2
samples/javaconfig/hellowebflux/src/main/java/sample/HelloWebfluxSecurityConfig.java

@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetails; @@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetails;
public class HelloWebfluxSecurityConfig {
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
UserDetails user = User.withDefaultPasswordEncoder()
.username("user")
.password("user")

2
samples/javaconfig/hellowebfluxfn/src/main/java/sample/HelloWebfluxFnSecurityConfig.java

@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetails; @@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetails;
public class HelloWebfluxFnSecurityConfig {
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
UserDetails user = User.withDefaultPasswordEncoder()
.username("user")
.password("user")

2
samples/javaconfig/webflux-form/src/main/java/sample/WebfluxFormSecurityConfig.java

@ -32,7 +32,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain; @@ -32,7 +32,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain;
public class WebfluxFormSecurityConfig {
@Bean
public MapReactiveUserDetailsService userDetailsRepository() {
public MapReactiveUserDetailsService userDetailsService() {
UserDetails user = User.withDefaultPasswordEncoder()
.username("user")
.password("password")

Loading…
Cancel
Save