1313import org .springframework .beans .factory .annotation .Autowired ;
1414import org .springframework .beans .factory .annotation .Value ;
1515import org .springframework .boot .autoconfigure .condition .ConditionalOnBean ;
16- import org .springframework .context .ApplicationContext ;
1716import org .springframework .context .annotation .Bean ;
1817import org .springframework .context .annotation .Configuration ;
1918import org .springframework .context .annotation .Profile ;
@@ -44,7 +43,6 @@ public class SecurityConfig {
4443 private final SpringEnvironmentHelper springEnvironmentHelper ;
4544 private final CustomOAuth2UserService customOAuth2UserService ;
4645 private final OidcLoginSuccessHandler oidcLoginSuccessHandler ;
47- private final ApplicationContext applicationContext ;
4846
4947 @ Autowired (required = false )
5048 private ClientRegistrationRepository clientRegistrationRepository ;
@@ -101,7 +99,11 @@ public SecurityFilterChain swaggerFilterChain(HttpSecurity http) throws Exceptio
10199 @ Order (2 )
102100 @ Profile ({"local" , "dev" , "prod" })
103101 public SecurityFilterChain apiFilterChain (
104- HttpSecurity http , JwtAuthenticationFilter jwtAuthenticationFilter ) throws Exception {
102+ HttpSecurity http ,
103+ JwtAuthenticationFilter jwtAuthenticationFilter ,
104+ @ Autowired (required = false )
105+ OAuth2AuthorizationRequestResolver authorizationRequestResolver )
106+ throws Exception {
105107 defaultFilterChain (http );
106108
107109 http .authorizeHttpRequests (
@@ -118,18 +120,11 @@ public SecurityFilterChain apiFilterChain(
118120 userInfo .oidcUserService (
119121 customOAuth2UserService ))
120122 .successHandler (oidcLoginSuccessHandler );
121- if (clientRegistrationRepository != null ) {
122- try {
123- OAuth2AuthorizationRequestResolver resolver =
124- applicationContext .getBean (
125- OAuth2AuthorizationRequestResolver .class );
126- oauth2 .authorizationEndpoint (
127- authorization ->
128- authorization .authorizationRequestResolver (
129- resolver ));
130- } catch (Exception e ) {
131- // Resolver bean이 없으면 기본 resolver 사용
132- }
123+ if (authorizationRequestResolver != null ) {
124+ oauth2 .authorizationEndpoint (
125+ authorization ->
126+ authorization .authorizationRequestResolver (
127+ authorizationRequestResolver ));
133128 }
134129 })
135130 .addFilterBefore (
0 commit comments