Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UserDetailsRepository->ReactiveUserDetailsService

Browse Source 
Issue gh-4615
This commit is contained in:
Rob Winch
2017-10-10 09:46:15 -05:00
parent f1bc82dcef
commit 4681697581
16 changed files with 74 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,9 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.config.web.server.HttpSecurity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.MapUserDetailsRepository;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetailsRepository;
import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.test.web.reactive.server.WebTestClientBuilder;
@@ -138,8 +138,8 @@ public class EnableWebFluxSecurityTests {
@EnableWebFluxSecurity
static class Config {
@Bean
public UserDetailsRepository userDetailsRepository() {
return new MapUserDetailsRepository(User.withUsername("user")
public ReactiveUserDetailsService userDetailsRepository() {
return new MapReactiveUserDetailsService(User.withUsername("user")
.password("password")
.roles("USER")
.build()
@@ -178,8 +178,8 @@ public class EnableWebFluxSecurityTests {
@EnableWebFluxSecurity
static class Config {
@Bean
public UserDetailsRepository userDetailsRepository(PasswordEncoder encoder) {
return new MapUserDetailsRepository(User.withUsername("user")
public ReactiveUserDetailsService userDetailsRepository(PasswordEncoder encoder) {
return new MapReactiveUserDetailsService(User.withUsername("user")
.password(encoder.encode("password"))
.roles("USER")
.build()
@@ -226,8 +226,8 @@ public class EnableWebFluxSecurityTests {
@EnableWebFluxSecurity
static class Config {
@Bean
public UserDetailsRepository userDetailsRepository() {
return new MapUserDetailsRepository(User.withUsername("user")
public ReactiveUserDetailsService userDetailsRepository() {
return new MapReactiveUserDetailsService(User.withUsername("user")
.password("password")
.roles("USER")
.build()
@@ -275,8 +275,8 @@ public class EnableWebFluxSecurityTests {
}
@Bean
public UserDetailsRepository userDetailsRepository() {
return new MapUserDetailsRepository(User.withUsername("user")
public ReactiveUserDetailsService userDetailsRepository() {
return new MapReactiveUserDetailsService(User.withUsername("user")
.password("password")
.roles("USER")
.build()

11
config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanPropertiesResourceITests.java → config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java
View File

@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.userdetails.UserDetailsRepository;
import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
import org.springframework.security.util.InMemoryResource;
import org.springframework.test.context.junit4.SpringRunner;
@@ -33,9 +33,8 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
* @since 5.0
*/
@RunWith(SpringRunner.class)
public class UserDetailsRepositoryResourceFactoryBeanPropertiesResourceITests {
@Autowired
UserDetailsRepository users;
public class ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests {
@Autowired ReactiveUserDetailsService users;
@Test
public void loadUserByUsernameWhenUserFoundThenNotNull() {
@@ -45,8 +44,8 @@ public class UserDetailsRepositoryResourceFactoryBeanPropertiesResourceITests {
@Configuration
static class Config {
@Bean
public UserDetailsRepositoryResourceFactoryBean userDetailsService() {
return UserDetailsRepositoryResourceFactoryBean.fromResource(new InMemoryResource("user=password,ROLE_USER"));
public ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() {
return ReactiveUserDetailsServiceResourceFactoryBean.fromResource(new InMemoryResource("user=password,ROLE_USER"));
}
}
}

12
config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanStringITests.java → config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java
View File

@@ -22,8 +22,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.userdetails.UserDetailsRepository;
import org.springframework.security.util.InMemoryResource;
import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -33,9 +32,8 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
* @since 5.0
*/
@RunWith(SpringRunner.class)
public class UserDetailsRepositoryResourceFactoryBeanStringITests {
@Autowired
UserDetailsRepository users;
public class ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests {
@Autowired ReactiveUserDetailsService users;
@Test
public void loadUserByUsernameWhenUserFoundThenNotNull() {
@@ -45,8 +43,8 @@ public class UserDetailsRepositoryResourceFactoryBeanStringITests {
@Configuration
static class Config {
@Bean
public UserDetailsRepositoryResourceFactoryBean userDetailsService() {
return UserDetailsRepositoryResourceFactoryBean.fromString("user=password,ROLE_USER");
public ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() {
return ReactiveUserDetailsServiceResourceFactoryBean.fromResourceLocation("classpath:users.properties");
}
}
}

11
config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsRepositoryResourceFactoryBeanPropertiesResourceLocationITests.java → config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java
View File

@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.userdetails.UserDetailsRepository;
import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -32,9 +32,8 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
* @since 5.0
*/
@RunWith(SpringRunner.class)
public class UserDetailsRepositoryResourceFactoryBeanPropertiesResourceLocationITests {
@Autowired
UserDetailsRepository users;
public class ReactiveUserDetailsServiceResourceFactoryBeanStringITests {
@Autowired ReactiveUserDetailsService users;
@Test
public void loadUserByUsernameWhenUserFoundThenNotNull() {
@@ -44,8 +43,8 @@ public class UserDetailsRepositoryResourceFactoryBeanPropertiesResourceLocationI
@Configuration
static class Config {
@Bean
public UserDetailsRepositoryResourceFactoryBean userDetailsService() {
return UserDetailsRepositoryResourceFactoryBean.fromResourceLocation("classpath:users.properties");
public ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() {
return ReactiveUserDetailsServiceResourceFactoryBean.fromString("user=password,ROLE_USER");
}
}
}

4
config/src/test/java/org/springframework/security/config/web/server/FormLoginTests.java
View File

@@ -23,7 +23,7 @@ import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.PageFactory;
import org.springframework.security.authentication.ReactiveAuthenticationManager;
import org.springframework.security.authentication.UserDetailsRepositoryAuthenticationManager;
import org.springframework.security.core.userdetails.MapUserDetailsRepository;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.htmlunit.server.WebTestClientHtmlUnitDriverBuilder;
@@ -45,7 +45,7 @@ public class FormLoginTests {
private UserDetails user = User.withUsername("user").password("password").roles("USER").build();
private HttpSecurity http = HttpSecurity.http();
ReactiveAuthenticationManager manager = new UserDetailsRepositoryAuthenticationManager(new MapUserDetailsRepository(this.user));
ReactiveAuthenticationManager manager = new UserDetailsRepositoryAuthenticationManager(new MapReactiveUserDetailsService(this.user));
@Test
public void defaultLoginPage() {

4
config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java
View File

@@ -20,7 +20,7 @@ import org.junit.Test;
import org.openqa.selenium.WebDriver;
import org.springframework.security.authentication.ReactiveAuthenticationManager;
import org.springframework.security.authentication.UserDetailsRepositoryAuthenticationManager;
import org.springframework.security.core.userdetails.MapUserDetailsRepository;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.htmlunit.server.WebTestClientHtmlUnitDriverBuilder;
@@ -37,7 +37,7 @@ public class LogoutBuilderTests {
private UserDetails user = User.withUsername("user").password("password").roles("USER").build();
private HttpSecurity http = HttpSecurity.http();
ReactiveAuthenticationManager manager = new UserDetailsRepositoryAuthenticationManager(new MapUserDetailsRepository(this.user));
ReactiveAuthenticationManager manager = new UserDetailsRepositoryAuthenticationManager(new MapReactiveUserDetailsService(this.user));
@Test
public void defaultLogout() {