|
|
@@ -2,7 +2,9 @@ package com.platform2easy.genesis.security.config;
|
|
|
|
|
|
|
|
|
import com.platform2easy.genesis.domain.enums.UserRole;
|
|
|
+import com.platform2easy.genesis.domain.service.UserService;
|
|
|
import com.platform2easy.genesis.security.filter.AuthorizationFilter;
|
|
|
+import com.platform2easy.genesis.security.service.TokenService;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
@@ -13,6 +15,7 @@ import org.springframework.security.config.annotation.authentication.configurati
|
|
|
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.configurers.AbstractHttpConfigurer;
|
|
|
+import org.springframework.security.config.http.SessionCreationPolicy;
|
|
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
|
import org.springframework.security.web.SecurityFilterChain;
|
|
|
@@ -23,7 +26,13 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
|
|
|
@AllArgsConstructor
|
|
|
public class SecurityConfiguration {
|
|
|
|
|
|
- private final AuthorizationFilter authorizationFilter;
|
|
|
+ private final TokenService tokenService;
|
|
|
+ private final UserService userService;
|
|
|
+
|
|
|
+ @Bean
|
|
|
+ public AuthorizationFilter authorizationFilter() {
|
|
|
+ return new AuthorizationFilter(tokenService, userService);
|
|
|
+ }
|
|
|
|
|
|
@Bean
|
|
|
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
|
|
@@ -31,20 +40,19 @@ public class SecurityConfiguration {
|
|
|
.csrf(AbstractHttpConfigurer::disable)
|
|
|
.cors(Customizer.withDefaults())
|
|
|
.exceptionHandling(Customizer.withDefaults())
|
|
|
- //.sessionManagement(sessionManagementConfigurer -> sessionManagementConfigurer.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
|
|
|
- //.httpBasic(Customizer.withDefaults())
|
|
|
- .authorizeHttpRequests(authorizationRegistry -> authorizationRegistry
|
|
|
- .requestMatchers("/login", "/images/**", "/css/**","/error/**").permitAll()
|
|
|
+ .httpBasic(Customizer.withDefaults())
|
|
|
+ .authorizeHttpRequests(auth -> auth
|
|
|
+ .requestMatchers("/login", "/images/**", "/css/**", "/error/**").permitAll()
|
|
|
.requestMatchers(HttpMethod.POST, "/authentication/login").permitAll()
|
|
|
.requestMatchers("/api/**").authenticated()
|
|
|
.requestMatchers("/compra", "/compra/**").hasRole(UserRole.ADMIN.toString())
|
|
|
.anyRequest().authenticated())
|
|
|
- .addFilterBefore(authorizationFilter, UsernamePasswordAuthenticationFilter.class)
|
|
|
- .formLogin(httpSecurityFormLoginConfigurer -> httpSecurityFormLoginConfigurer
|
|
|
+ .addFilterBefore(authorizationFilter(), UsernamePasswordAuthenticationFilter.class)
|
|
|
+ .formLogin(form -> form
|
|
|
.loginPage("/login")
|
|
|
.defaultSuccessUrl("/", true)
|
|
|
.permitAll())
|
|
|
- .logout(httpSecurityLogoutConfigurer -> httpSecurityLogoutConfigurer
|
|
|
+ .logout(logout -> logout
|
|
|
.logoutUrl("/logout")
|
|
|
.logoutSuccessUrl("/"))
|
|
|
.build();
|
|
|
@@ -59,6 +67,4 @@ public class SecurityConfiguration {
|
|
|
public PasswordEncoder passwordEncoder() {
|
|
|
return new BCryptPasswordEncoder();
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-}
|
|
|
+}
|