From bff8ce3c03f71a0680d69058c0c4f9ab1f2b79c6 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Wed, 22 Nov 2017 14:13:22 +0100 Subject: [PATCH] Polish samples --- .../docs/security/RememberMeSecurityConfiguration.java | 6 ++---- .../src/main/java/sample/config/SecurityConfig.java | 6 ++---- .../jdbc/src/main/java/sample/config/SecurityConfig.java | 6 ++---- .../src/main/java/sample/config/SecurityConfig.java | 6 ++---- .../redis/src/main/java/sample/config/SecurityConfig.java | 6 ++---- .../src/main/java/sample/config/WebSecurityConfig.java | 6 ++---- .../hazelcast/src/main/java/sample/SecurityConfig.java | 4 +++- .../rest/src/main/java/sample/SecurityConfig.java | 8 +++----- .../security/src/main/java/sample/SecurityConfig.java | 4 +++- 9 files changed, 21 insertions(+), 31 deletions(-) diff --git a/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java b/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java index aa7e44ff..98032547 100644 --- a/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java +++ b/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java @@ -67,10 +67,8 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte @Override @Bean public InMemoryUserDetailsManager userDetailsService() { - InMemoryUserDetailsManager uds = new InMemoryUserDetailsManager(); - uds.createUser( - User.withUsername("user").password("{noop}password").roles("USER").build()); - return uds; + return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } @Bean diff --git a/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java b/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java index cc2be254..a5a7272b 100644 --- a/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java @@ -37,10 +37,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean @Override public UserDetailsService userDetailsService() { - InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); - manager.createUser(User.withUsername("user").password("{noop}password") - .roles("USER").build()); - return manager; + return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } // @formatter:off diff --git a/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java index 48a86fd9..9077e22b 100644 --- a/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java @@ -38,10 +38,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean @Override public UserDetailsService userDetailsService() { - InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); - manager.createUser(User.withUsername("user").password("{noop}password") - .roles("USER").build()); - return manager; + return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } // @formatter:off diff --git a/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java b/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java index 1e23923d..715a96e4 100644 --- a/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java @@ -37,10 +37,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean @Override public UserDetailsService userDetailsService() { - InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); - manager.createUser(User.withUsername("user").password("{noop}password") - .roles("USER").build()); - return manager; + return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } // @formatter:off diff --git a/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java b/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java index 044933cc..3f979097 100644 --- a/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java @@ -37,10 +37,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Bean @Override public UserDetailsService userDetailsService() { - InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); - manager.createUser(User.withUsername("user").password("{noop}password") - .roles("USER").build()); - return manager; + return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } // @formatter:off diff --git a/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java index 6d6eb704..2b1d4ede 100644 --- a/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java +++ b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java @@ -37,10 +37,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Bean @Override public UserDetailsService userDetailsService() { - InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); - manager.createUser(User.withUsername("user").password("{noop}password") - .roles("USER").build()); - return manager; + return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } // @formatter:off diff --git a/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java index 7fdf7fd2..6bec4e1a 100644 --- a/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java @@ -19,6 +19,7 @@ package sample; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.core.userdetails.User; /** * @author Rob Winch @@ -27,6 +28,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe public class SecurityConfig { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.inMemoryAuthentication().withUser("user").password("password").roles("USER"); + auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } } diff --git a/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java index b84489aa..14a388b1 100644 --- a/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java @@ -21,6 +21,7 @@ import org.springframework.security.config.annotation.authentication.builders.Au import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.User; import org.springframework.security.web.savedrequest.NullRequestCache; @EnableWebSecurity @@ -40,12 +41,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { } // @formatter:on - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth - .inMemoryAuthentication() - .withUser("user").password("{noop}password").roles("USER"); + auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } - // @formatter:on } diff --git a/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java index 6e7e3a60..6bec4e1a 100644 --- a/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java @@ -19,6 +19,7 @@ package sample; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.core.userdetails.User; /** * @author Rob Winch @@ -27,6 +28,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe public class SecurityConfig { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.inMemoryAuthentication().withUser("user").password("{noop}password").roles("USER"); + auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder() + .username("user").password("password").roles("USER").build()); } }