Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}
}
1 change: 1 addition & 0 deletions clokey-api/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading