Skip to content

Commit 79304d6

Browse files
jgrandjajgrandja
committed
Add @configuration with @EnableWebSecurity
Closes gh-935
1 parent 1d514c1 commit 79304d6

File tree

15 files changed

+33
-5
lines changed

15 files changed

+33
-5
lines changed

‎docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.springframework.security.web.SecurityFilterChain;
5151
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
5252

53-
@Configuration
53+
@Configuration(proxyBeanMethods = false)
5454
public class EnableUserInfoSecurityConfig {
5555

5656
@Bean // <1>

‎docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
5858
import org.springframework.security.web.util.matcher.RequestMatcher;
5959

60-
@Configuration
60+
@Configuration(proxyBeanMethods = false)
6161
public class JwtUserInfoMapperSecurityConfig {
6262

6363
@Bean // <1>

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
import org.springframework.beans.factory.annotation.Autowired;
4747
import org.springframework.context.annotation.Bean;
48+
import org.springframework.context.annotation.Configuration;
4849
import org.springframework.context.annotation.Import;
4950
import org.springframework.http.HttpHeaders;
5051
import org.springframework.http.HttpStatus;
@@ -834,6 +835,7 @@ static class ParametersMapper extends JdbcOAuth2AuthorizationService.OAuth2Autho
834835
}
835836

836837
@EnableWebSecurity
838+
@Configuration(proxyBeanMethods = false)
837839
static class AuthorizationServerConfigurationWithSecurityContextRepository extends AuthorizationServerConfiguration {
838840
// @formatter:off
839841
@Bean
@@ -893,6 +895,7 @@ AuthorizationServerSettings authorizationServerSettings() {
893895
}
894896

895897
@EnableWebSecurity
898+
@Configuration(proxyBeanMethods = false)
896899
static class AuthorizationServerConfigurationCustomConsentPage extends AuthorizationServerConfiguration {
897900
// @formatter:off
898901
@Bean
@@ -917,6 +920,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
917920
}
918921

919922
@EnableWebSecurity
923+
@Configuration(proxyBeanMethods = false)
920924
static class AuthorizationServerConfigurationCustomConsentRequest extends AuthorizationServerConfiguration {
921925
@Autowired
922926
private RegisteredClientRepository registeredClientRepository;
@@ -1011,6 +1015,7 @@ private static Set<String> authorities(String param) {
10111015
}
10121016

10131017
@EnableWebSecurity
1018+
@Configuration(proxyBeanMethods = false)
10141019
static class AuthorizationServerConfigurationCustomAuthorizationEndpoint extends AuthorizationServerConfiguration {
10151020
// @formatter:off
10161021
@Bean

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ AuthorizationServerSettings authorizationServerSettings() {
159159
}
160160
}
161161

162-
@Configuration
163162
@EnableWebSecurity
163+
@Configuration(proxyBeanMethods = false)
164164
static class AuthorizationServerConfigurationWithMetadataCustomizer extends AuthorizationServerConfiguration {
165165

166166
// @formatter:off

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
import org.springframework.beans.factory.annotation.Autowired;
4343
import org.springframework.context.annotation.Bean;
44+
import org.springframework.context.annotation.Configuration;
4445
import org.springframework.context.annotation.Import;
4546
import org.springframework.http.HttpHeaders;
4647
import org.springframework.jdbc.core.JdbcOperations;
@@ -397,6 +398,7 @@ static class ParametersMapper extends JdbcOAuth2AuthorizationService.OAuth2Autho
397398
}
398399

399400
@EnableWebSecurity
401+
@Configuration(proxyBeanMethods = false)
400402
static class AuthorizationServerConfigurationCustomTokenEndpoint extends AuthorizationServerConfiguration {
401403
// @formatter:off
402404
@Bean
@@ -427,6 +429,7 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
427429
}
428430

429431
@EnableWebSecurity
432+
@Configuration(proxyBeanMethods = false)
430433
static class AuthorizationServerConfigurationCustomClientAuthentication extends AuthorizationServerConfiguration {
431434
// @formatter:off
432435
@Bean

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
import org.springframework.beans.factory.annotation.Autowired;
3838
import org.springframework.context.annotation.Bean;
39+
import org.springframework.context.annotation.Configuration;
3940
import org.springframework.context.annotation.Import;
4041
import org.springframework.http.HttpHeaders;
4142
import org.springframework.http.HttpStatus;
@@ -500,6 +501,7 @@ static class ParametersMapper extends JdbcOAuth2AuthorizationService.OAuth2Autho
500501
}
501502

502503
@EnableWebSecurity
504+
@Configuration(proxyBeanMethods = false)
503505
static class AuthorizationServerConfigurationCustomTokenIntrospectionEndpoint extends AuthorizationServerConfiguration {
504506

505507
// @formatter:off

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import org.springframework.beans.factory.annotation.Autowired;
3535
import org.springframework.context.annotation.Bean;
36+
import org.springframework.context.annotation.Configuration;
3637
import org.springframework.context.annotation.Import;
3738
import org.springframework.http.HttpHeaders;
3839
import org.springframework.jdbc.core.JdbcOperations;
@@ -320,6 +321,7 @@ static class ParametersMapper extends JdbcOAuth2AuthorizationService.OAuth2Autho
320321
}
321322

322323
@EnableWebSecurity
324+
@Configuration(proxyBeanMethods = false)
323325
static class AuthorizationServerConfigurationCustomTokenRevocationEndpoint extends AuthorizationServerConfiguration {
324326

325327
// @formatter:off

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import org.springframework.beans.factory.annotation.Autowired;
3535
import org.springframework.context.annotation.Bean;
36+
import org.springframework.context.annotation.Configuration;
3637
import org.springframework.http.HttpHeaders;
3738
import org.springframework.http.HttpStatus;
3839
import org.springframework.http.MediaType;
@@ -353,6 +354,7 @@ private static OidcClientRegistration readClientRegistrationResponse(MockHttpSer
353354
}
354355

355356
@EnableWebSecurity
357+
@Configuration(proxyBeanMethods = false)
356358
static class AuthorizationServerConfiguration {
357359

358360
// @formatter:off

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ AuthorizationServerSettings authorizationServerSettings() {
215215

216216
}
217217

218-
@Configuration
219218
@EnableWebSecurity
219+
@Configuration(proxyBeanMethods = false)
220220
static class AuthorizationServerConfigurationWithProviderConfigurationCustomizer extends AuthorizationServerConfiguration {
221221

222222
// @formatter:off
@@ -252,8 +252,8 @@ private Consumer<OidcProviderConfiguration.Builder> providerConfigurationCustomi
252252

253253
}
254254

255-
@Configuration
256255
@EnableWebSecurity
256+
@Configuration(proxyBeanMethods = false)
257257
static class AuthorizationServerConfigurationWithClientRegistrationEnabled extends AuthorizationServerConfiguration {
258258

259259
// @formatter:off

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import org.springframework.beans.factory.annotation.Autowired;
3535
import org.springframework.context.annotation.Bean;
36+
import org.springframework.context.annotation.Configuration;
3637
import org.springframework.http.HttpHeaders;
3738
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3839
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -260,6 +261,7 @@ private static OidcUserInfo createUserInfo() {
260261
}
261262

262263
@EnableWebSecurity
264+
@Configuration(proxyBeanMethods = false)
263265
static class CustomUserInfoConfiguration extends AuthorizationServerConfiguration {
264266

265267
@Bean
@@ -299,6 +301,7 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
299301
}
300302

301303
@EnableWebSecurity
304+
@Configuration(proxyBeanMethods = false)
302305
static class AuthorizationServerConfigurationWithSecurityContextRepository extends AuthorizationServerConfiguration {
303306

304307
@Bean
@@ -327,6 +330,7 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
327330
}
328331

329332
@EnableWebSecurity
333+
@Configuration(proxyBeanMethods = false)
330334
static class AuthorizationServerConfiguration {
331335

332336
@Bean

0 commit comments

Comments
 (0)