diff --git a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java index f6df516a0a..99c5f1e892 100644 --- a/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java +++ b/spring-boot-security-taglibs/src/main/java/org/baeldung/security/SecurityConfig.java @@ -25,28 +25,29 @@ import org.springframework.security.crypto.password.PasswordEncoder; public class SecurityConfig extends WebSecurityConfigurerAdapter { private static final String ROLE_PREFIX = "ROLE_"; public static final String DEFAULT_PASSWORD = "password"; + @Bean static PasswordEncoder bCryptPasswordEncoder() { return new BCryptPasswordEncoder(10); } - + @Bean UserDetailsService customUserDetailsService() { return new UserDetailsService() { - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - //authenticate and return dummy user - Set authorities = new HashSet(); - authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + username)); - return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities); - } - }; + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + // authenticate, grant ADMIN role and return dummy user + Set authorities = new HashSet(); + authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + "ADMIN")); + return new User(username, bCryptPasswordEncoder().encode(DEFAULT_PASSWORD), authorities); + } + }; } @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(customUserDetailsService()).passwordEncoder(bCryptPasswordEncoder()); + auth.userDetailsService(customUserDetailsService()) + .passwordEncoder(bCryptPasswordEncoder()); } @@ -59,11 +60,15 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http.csrf(); - http.headers().frameOptions().sameOrigin(); - - http.antMatcher("/**").userDetailsService(customUserDetailsService()) + http.headers() + .frameOptions() + .sameOrigin(); + + http.antMatcher("/**") + .userDetailsService(customUserDetailsService()) .authorizeRequests() - .antMatchers("/**").permitAll() + .antMatchers("/**") + .permitAll() .and() .httpBasic(); } diff --git a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java index dfdfda6234..995d5fa3df 100644 --- a/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java +++ b/spring-boot-security-taglibs/src/test/java/org/baeldung/security/HomeControllerTest.java @@ -19,7 +19,7 @@ public class HomeControllerTest { @Test public void home() throws Exception { - String body = this.restTemplate.withBasicAuth("ADMIN", SecurityConfig.DEFAULT_PASSWORD) + String body = this.restTemplate.withBasicAuth("testUser", SecurityConfig.DEFAULT_PASSWORD) .getForEntity("/", String.class) .getBody(); System.out.println(body); @@ -31,7 +31,7 @@ public class HomeControllerTest { assertTrue(body.contains("ADMIN ROLE")); // test - assertTrue(body.contains("principal.username: ADMIN")); + assertTrue(body.contains("principal.username: testUser")); // test assertTrue(body.contains("