36
36
import org .springframework .security .config .annotation .method .configuration .EnableGlobalMethodSecurity ;
37
37
import org .springframework .security .config .annotation .web .builders .HttpSecurity ;
38
38
import org .springframework .security .config .annotation .web .configuration .EnableWebSecurity ;
39
- import org .springframework .security .config . annotation . web .configuration . WebSecurityConfigurerAdapter ;
39
+ import org .springframework .security .web .SecurityFilterChain ;
40
40
import org .springframework .security .web .authentication .AnonymousAuthenticationFilter ;
41
41
import org .springframework .security .web .authentication .AuthenticationConverter ;
42
42
import retrofit2 .Retrofit ;
@@ -92,10 +92,24 @@ AuthenticationConverter defaultAuthenticationConverter() {
92
92
return new AuthenticatedRequestAuthenticationConverter ();
93
93
}
94
94
95
+ // Removing bean of WebSecurityConfigurerAdapter, as in spring security 6.0 it is no more
96
+ // required.
97
+ // https://github.com/spring-projects/spring-security/pull/11923
98
+ // https://www.baeldung.com/spring-security-migrate-5-to-6#2-websecurityconfigureradapter
95
99
@ Bean
96
- FiatWebSecurityConfigurerAdapter fiatSecurityConfig (
97
- FiatStatus fiatStatus , AuthenticationConverter authenticationConverter ) {
98
- return new FiatWebSecurityConfigurerAdapter (fiatStatus , authenticationConverter );
100
+ public SecurityFilterChain configure (
101
+ HttpSecurity http , FiatStatus fiatStatus , AuthenticationConverter authenticationConverter )
102
+ throws Exception {
103
+ return http .servletApi ()
104
+ .and ()
105
+ .exceptionHandling ()
106
+ .and ()
107
+ .anonymous ()
108
+ .and ()
109
+ .addFilterBefore (
110
+ new FiatAuthenticationFilter (fiatStatus , authenticationConverter ),
111
+ AnonymousAuthenticationFilter .class )
112
+ .build ();
99
113
}
100
114
101
115
@ Bean
@@ -104,29 +118,4 @@ FiatAccessDeniedExceptionHandler fiatAccessDeniedExceptionHandler(
104
118
ExceptionMessageDecorator exceptionMessageDecorator ) {
105
119
return new FiatAccessDeniedExceptionHandler (exceptionMessageDecorator );
106
120
}
107
-
108
- private static class FiatWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
109
- private final FiatStatus fiatStatus ;
110
- private final AuthenticationConverter authenticationConverter ;
111
-
112
- private FiatWebSecurityConfigurerAdapter (
113
- FiatStatus fiatStatus , AuthenticationConverter authenticationConverter ) {
114
- super (true );
115
- this .fiatStatus = fiatStatus ;
116
- this .authenticationConverter = authenticationConverter ;
117
- }
118
-
119
- @ Override
120
- protected void configure (HttpSecurity http ) throws Exception {
121
- http .servletApi ()
122
- .and ()
123
- .exceptionHandling ()
124
- .and ()
125
- .anonymous ()
126
- .and ()
127
- .addFilterBefore (
128
- new FiatAuthenticationFilter (fiatStatus , authenticationConverter ),
129
- AnonymousAuthenticationFilter .class );
130
- }
131
- }
132
121
}
0 commit comments