|
12 | 12 | import org.clokey.helper.SpringEnvironmentHelper; |
13 | 13 | import org.springframework.beans.factory.annotation.Autowired; |
14 | 14 | import org.springframework.beans.factory.annotation.Value; |
15 | | -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; |
16 | 15 | import org.springframework.context.annotation.Bean; |
17 | 16 | import org.springframework.context.annotation.Configuration; |
18 | 17 | import org.springframework.context.annotation.Profile; |
@@ -101,8 +100,7 @@ public SecurityFilterChain swaggerFilterChain(HttpSecurity http) throws Exceptio |
101 | 100 | public SecurityFilterChain apiFilterChain( |
102 | 101 | HttpSecurity http, |
103 | 102 | JwtAuthenticationFilter jwtAuthenticationFilter, |
104 | | - @Autowired(required = false) |
105 | | - OAuth2AuthorizationRequestResolver authorizationRequestResolver) |
| 103 | + OAuth2AuthorizationRequestResolver authorizationRequestResolver) |
106 | 104 | throws Exception { |
107 | 105 | defaultFilterChain(http); |
108 | 106 |
|
@@ -159,16 +157,14 @@ public JwtAuthenticationFilter jwtAuthenticationFilter(JwtTokenService jwtTokenS |
159 | 157 | } |
160 | 158 |
|
161 | 159 | @Bean |
162 | | - @ConditionalOnBean(ClientRegistrationRepository.class) |
163 | 160 | public OAuth2AuthorizationRequestResolver oauth2AuthorizationRequestResolver() { |
164 | | - if (clientRegistrationRepository == null) { |
165 | | - throw new IllegalStateException("ClientRegistrationRepository is required for OAuth2"); |
166 | | - } |
167 | 161 | AppleAwareOAuth2AuthorizationRequestResolver resolver = |
168 | 162 | new AppleAwareOAuth2AuthorizationRequestResolver( |
169 | 163 | clientRegistrationRepository, "/oauth2/authorization"); |
| 164 | + |
170 | 165 | resolver.setAuthorizationRequestCustomizer( |
171 | 166 | OAuth2AuthorizationRequestCustomizers.withPkce()); |
| 167 | + |
172 | 168 | return resolver; |
173 | 169 | } |
174 | 170 | } |
0 commit comments