diff --git a/2023-01/spring-25-SS-auth/classwork/src/main/java/ru/otus/spring/security/SecurityConfiguration.java b/2023-01/spring-25-SS-auth/classwork/src/main/java/ru/otus/spring/security/SecurityConfiguration.java index 78b724ae..9c1c8b76 100644 --- a/2023-01/spring-25-SS-auth/classwork/src/main/java/ru/otus/spring/security/SecurityConfiguration.java +++ b/2023-01/spring-25-SS-auth/classwork/src/main/java/ru/otus/spring/security/SecurityConfiguration.java @@ -8,10 +8,15 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.NoOpPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; +import java.util.ArrayList; + @EnableWebSecurity public class SecurityConfiguration { @@ -37,9 +42,14 @@ public class SecurityConfiguration { return NoOpPasswordEncoder.getInstance(); } - @Autowired - public void configure( AuthenticationManagerBuilder auth ) throws Exception { - auth.inMemoryAuthentication() - .withUser( "admin" ).password( "password" ).roles( "ADMIN" ); + @Bean + public InMemoryUserDetailsManager userDetailsService() { + var users = new ArrayList(); + users.add( User + .builder().username( "admin" ).password( "password" ).roles( "ADMIN" ) + .build() ); + + return new InMemoryUserDetailsManager( users ); + } } diff --git a/2023-01/spring-25-SS-auth/solution4/src/main/java/ru/otus/spring/security/SecurityConfiguration.java b/2023-01/spring-25-SS-auth/solution4/src/main/java/ru/otus/spring/security/SecurityConfiguration.java index 492d6146..11f714c2 100644 --- a/2023-01/spring-25-SS-auth/solution4/src/main/java/ru/otus/spring/security/SecurityConfiguration.java +++ b/2023-01/spring-25-SS-auth/solution4/src/main/java/ru/otus/spring/security/SecurityConfiguration.java @@ -8,10 +8,15 @@ import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.NoOpPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; +import java.util.ArrayList; + @EnableWebSecurity public class SecurityConfiguration { @@ -45,9 +50,14 @@ public class SecurityConfiguration { return NoOpPasswordEncoder.getInstance(); } - @Autowired - public void configure( AuthenticationManagerBuilder auth ) throws Exception { - auth.inMemoryAuthentication() - .withUser( "admin" ).password( "password" ).roles( "ADMIN" ); + @Bean + public InMemoryUserDetailsManager userDetailsService() { + var users = new ArrayList(); + users.add( User + .builder().username( "admin" ).password( "password" ).roles( "ADMIN" ) + .build() ); + + return new InMemoryUserDetailsManager( users ); + } }