Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-02-23 23:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename userDetailsRepository to userDetailsService

Browse Source
This commit is contained in:
Johnny Lim 2018-01-09 01:34:11 +09:00 committed by Rob Winch
parent a4701bcd52
commit f3830eec7d
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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