|
1 | 1 | /* |
2 | | - * Copyright 2012-2024 the original author or authors. |
| 2 | + * Copyright 2012-2025 the original author or authors. |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
|
28 | 28 | import org.springframework.context.annotation.Import; |
29 | 29 | import org.springframework.core.annotation.Order; |
30 | 30 | import org.springframework.security.config.BeanIds; |
31 | | -import org.springframework.security.config.Customizer; |
32 | 31 | import org.springframework.security.config.annotation.web.builders.HttpSecurity; |
33 | 32 | import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; |
34 | 33 | import org.springframework.security.oauth2.core.AuthorizationGrantType; |
35 | 34 | import org.springframework.security.oauth2.core.ClientAuthenticationMethod; |
36 | 35 | import org.springframework.security.oauth2.server.authorization.client.InMemoryRegisteredClientRepository; |
37 | 36 | import org.springframework.security.oauth2.server.authorization.client.RegisteredClient; |
38 | 37 | import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository; |
39 | | -import org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.OAuth2AuthorizationServerConfigurer; |
| 38 | +import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration; |
40 | 39 | import org.springframework.security.oauth2.server.authorization.oidc.web.OidcClientRegistrationEndpointFilter; |
41 | 40 | import org.springframework.security.oauth2.server.authorization.oidc.web.OidcProviderConfigurationEndpointFilter; |
42 | 41 | import org.springframework.security.oauth2.server.authorization.oidc.web.OidcUserInfoEndpointFilter; |
@@ -164,11 +163,7 @@ static class TestSecurityFilterChainConfiguration { |
164 | 163 | @Bean |
165 | 164 | @Order(1) |
166 | 165 | SecurityFilterChain authServerSecurityFilterChain(HttpSecurity http) throws Exception { |
167 | | - OAuth2AuthorizationServerConfigurer authorizationServer = OAuth2AuthorizationServerConfigurer |
168 | | - .authorizationServer(); |
169 | | - http.securityMatcher(authorizationServer.getEndpointsMatcher()) |
170 | | - .with(authorizationServer, Customizer.withDefaults()); |
171 | | - http.authorizeHttpRequests((authorize) -> authorize.anyRequest().authenticated()); |
| 166 | + OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http); |
172 | 167 | return http.build(); |
173 | 168 | } |
174 | 169 |
|
|
0 commit comments