From 928e7a1e303ffc24052db20ff0f3add4cbfde4af Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Tue, 5 Dec 2023 16:19:11 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=20=D0=B1=D0=B5=D0=B7=D0=BE=D0=BF=D0=B0=D1=81=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../giprolab/config/SecurityConfiguration.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gipro/giprolab/config/SecurityConfiguration.java b/src/main/java/com/gipro/giprolab/config/SecurityConfiguration.java index 7b6c08d..da6dda0 100644 --- a/src/main/java/com/gipro/giprolab/config/SecurityConfiguration.java +++ b/src/main/java/com/gipro/giprolab/config/SecurityConfiguration.java @@ -16,6 +16,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; @Configuration @EnableWebSecurity @@ -24,11 +25,16 @@ public class SecurityConfiguration { private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class); private final UserService userService; private final BCryptPasswordEncoder bCryptPasswordEncoder; + private final AuthenticationSuccessHandler authenticationSuccessHandler; + //private final LogoutSuccessHandler logoutSuccessHandler; + public SecurityConfiguration(UserService userService, - BCryptPasswordEncoder bCryptPasswordEncoder) { + BCryptPasswordEncoder bCryptPasswordEncoder, + AuthenticationSuccessHandler authenticationSuccessHandler) { this.userService = userService; this.bCryptPasswordEncoder = bCryptPasswordEncoder; + this.authenticationSuccessHandler = authenticationSuccessHandler; } @Bean @@ -39,6 +45,7 @@ public class SecurityConfiguration { //.requestMatchers(UserController.ACTIVATE_URL).permitAll() .requestMatchers(Constants.PASSWORD_RESET_REQUEST_PAGE).permitAll() .requestMatchers(Constants.PASSWORD_RESET_PAGE).permitAll() + .requestMatchers(Constants.CONTACTS_PAGE).permitAll() //.requestMatchers(UserController.URL + UserController.REGISTER_URL).permitAll() //.requestMatchers(UserController.URL + UserController.ACTIVATE_URL).permitAll() //.requestMatchers(UserController.URL + UserController.PASSWORD_RESET_REQUEST_URL).permitAll() @@ -46,8 +53,9 @@ public class SecurityConfiguration { .requestMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN) .anyRequest().authenticated()) .formLogin(fl -> fl - .loginPage("/login") - //.successHandler(authenticationSuccessHandler) + .loginPage("/logform") + .successHandler(authenticationSuccessHandler) + .defaultSuccessUrl("/", true) .permitAll()) .csrf(AbstractHttpConfigurer::disable) .logout(l -> l @@ -62,7 +70,7 @@ public class SecurityConfiguration { @Bean public WebSecurityCustomizer webSecurityCustomizer() { - return (web) -> web.ignoring().requestMatchers("/css/**", "/js/**", "/templates/**", "/webjars/**"); + return (web) -> web.ignoring().requestMatchers("/assets.js/**", "/bootstrap_theme/**", "/bootstrap/**", "/css/**", "/js/**", "/templates/**", "/webjars/**"); } @Autowired