Removed deprecated passwordEncoder

codecentric · Nov 25, 2022 · 6abbf3c · 6abbf3c
1 parent 3b70df6
commit 6abbf3c
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...ot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java b/...ot-admin-sample-servlet/src/main/java/de/codecentric/boot/admin/SecuritySecureConfig.java
@@ -29,6 +29,8 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
@@ -63,7 +65,7 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 				.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/actuator/info"))).permitAll()
 				.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/actuator/health"))).permitAll()
 				.requestMatchers(new AntPathRequestMatcher(this.adminServer.path("/login"))).permitAll()
-				.dispatcherTypeMatchers(DispatcherType.ASYNC).permitAll()
+				.dispatcherTypeMatchers(DispatcherType.ASYNC).permitAll() //
 				.anyRequest().authenticated() // <2>
 		).formLogin(
 				(formLogin) -> formLogin.loginPage(this.adminServer.path("/login")).successHandler(successHandler).and() // <3>
@@ -83,12 +85,15 @@ protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
 	// Required to provide UserDetailsService for "remember functionality"
 	@Bean
-	public InMemoryUserDetailsManager userDetailsService() {
-		User.UserBuilder users = User.withDefaultPasswordEncoder();
-		UserDetails user = users.username(security.getUser().getName()).password(security.getUser().getPassword())
-				.roles("USER").build();
+	public InMemoryUserDetailsManager userDetailsService(PasswordEncoder passwordEncoder) {
+		UserDetails user = User.withUsername("user").password(passwordEncoder.encode("password")).roles("USER").build();
 		return new InMemoryUserDetailsManager(user);
 	}
 
+	@Bean
+	public PasswordEncoder passwordEncoder() {
+		return new BCryptPasswordEncoder();
+	}
+
 }
 // end::configuration-spring-security[]