diff --git a/clokey-api/src/main/java/org/clokey/global/config/security/SecurityConfig.java b/clokey-api/src/main/java/org/clokey/global/config/security/SecurityConfig.java index 8b1f834e..c30e5d4a 100644 --- a/clokey-api/src/main/java/org/clokey/global/config/security/SecurityConfig.java +++ b/clokey-api/src/main/java/org/clokey/global/config/security/SecurityConfig.java @@ -12,7 +12,6 @@ import org.clokey.helper.SpringEnvironmentHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -101,8 +100,7 @@ public SecurityFilterChain swaggerFilterChain(HttpSecurity http) throws Exceptio public SecurityFilterChain apiFilterChain( HttpSecurity http, JwtAuthenticationFilter jwtAuthenticationFilter, - @Autowired(required = false) - OAuth2AuthorizationRequestResolver authorizationRequestResolver) + OAuth2AuthorizationRequestResolver authorizationRequestResolver) throws Exception { defaultFilterChain(http); @@ -159,16 +157,14 @@ public JwtAuthenticationFilter jwtAuthenticationFilter(JwtTokenService jwtTokenS } @Bean - @ConditionalOnBean(ClientRegistrationRepository.class) public OAuth2AuthorizationRequestResolver oauth2AuthorizationRequestResolver() { - if (clientRegistrationRepository == null) { - throw new IllegalStateException("ClientRegistrationRepository is required for OAuth2"); - } AppleAwareOAuth2AuthorizationRequestResolver resolver = new AppleAwareOAuth2AuthorizationRequestResolver( clientRegistrationRepository, "/oauth2/authorization"); + resolver.setAuthorizationRequestCustomizer( OAuth2AuthorizationRequestCustomizers.withPkce()); + return resolver; } } diff --git a/clokey-api/src/main/resources/application-local.yml b/clokey-api/src/main/resources/application-local.yml index 38e94c4b..d6efb235 100644 --- a/clokey-api/src/main/resources/application-local.yml +++ b/clokey-api/src/main/resources/application-local.yml @@ -107,6 +107,7 @@ logging: level: org.hibernate.SQL: DEBUG org.hibernate.orm.jdbc.bind: TRACE + org.springframework.security: DEBUG firebase: credentials-path: ${FIREBASE_CREDENTIALS_PATH}