Skip to content

Commit 4010c07

Browse files
authored
[Fix/#390] OAuth2 resolver 관련 문제 해결 (#391)
* fix: 빈 생성시점에 의한 오류 수정 * fix: appFilterChain 수정
1 parent 6f5342f commit 4010c07

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

clokey-api/src/main/java/org/clokey/global/config/security/SecurityConfig.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.clokey.helper.SpringEnvironmentHelper;
1313
import org.springframework.beans.factory.annotation.Autowired;
1414
import org.springframework.beans.factory.annotation.Value;
15-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1615
import org.springframework.context.annotation.Bean;
1716
import org.springframework.context.annotation.Configuration;
1817
import org.springframework.context.annotation.Profile;
@@ -101,8 +100,7 @@ public SecurityFilterChain swaggerFilterChain(HttpSecurity http) throws Exceptio
101100
public SecurityFilterChain apiFilterChain(
102101
HttpSecurity http,
103102
JwtAuthenticationFilter jwtAuthenticationFilter,
104-
@Autowired(required = false)
105-
OAuth2AuthorizationRequestResolver authorizationRequestResolver)
103+
OAuth2AuthorizationRequestResolver authorizationRequestResolver)
106104
throws Exception {
107105
defaultFilterChain(http);
108106

@@ -159,16 +157,14 @@ public JwtAuthenticationFilter jwtAuthenticationFilter(JwtTokenService jwtTokenS
159157
}
160158

161159
@Bean
162-
@ConditionalOnBean(ClientRegistrationRepository.class)
163160
public OAuth2AuthorizationRequestResolver oauth2AuthorizationRequestResolver() {
164-
if (clientRegistrationRepository == null) {
165-
throw new IllegalStateException("ClientRegistrationRepository is required for OAuth2");
166-
}
167161
AppleAwareOAuth2AuthorizationRequestResolver resolver =
168162
new AppleAwareOAuth2AuthorizationRequestResolver(
169163
clientRegistrationRepository, "/oauth2/authorization");
164+
170165
resolver.setAuthorizationRequestCustomizer(
171166
OAuth2AuthorizationRequestCustomizers.withPkce());
167+
172168
return resolver;
173169
}
174170
}

clokey-api/src/main/resources/application-local.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ logging:
107107
level:
108108
org.hibernate.SQL: DEBUG
109109
org.hibernate.orm.jdbc.bind: TRACE
110+
org.springframework.security: DEBUG
110111

111112
firebase:
112113
credentials-path: ${FIREBASE_CREDENTIALS_PATH}

0 commit comments

Comments
 (0)