Skip to content

[DEPLOY] OAuth2 CORS 문제 해결 및 swagger 접근 정책 보완 배포 #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ssamssamukja merged 1 commit into from
Mar 3, 2026
Merged

[DEPLOY] OAuth2 CORS 문제 해결 및 swagger 접근 정책 보완 배포 #395

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 22 additions & 20 deletions clokey-api/src/main/java/org/clokey/global/config/security/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import org.clokey.global.security.AppleAwareOAuth2AuthorizationRequestResolver;
import org.clokey.global.security.JwtAuthenticationFilter;
import org.clokey.helper.SpringEnvironmentHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down Expand Up @@ -43,9 +42,6 @@ public class SecurityConfig {
private final CustomOAuth2UserService customOAuth2UserService;
private final OidcLoginSuccessHandler oidcLoginSuccessHandler;

@Autowired(required = false)
private ClientRegistrationRepository clientRegistrationRepository;

@Value("${swagger.username:default}")
private String swaggerUsername;

Expand All @@ -58,7 +54,8 @@ private void defaultFilterChain(HttpSecurity http) throws Exception {
.cors(withDefaults())
.csrf(AbstractHttpConfigurer::disable)
.sessionManagement(
session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
session ->
session.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED));
}

@Bean
Expand All @@ -85,10 +82,7 @@ public SecurityFilterChain swaggerFilterChain(HttpSecurity http) throws Exceptio

http.securityMatcher("/swagger-ui/**", "/v3/api-docs/**").httpBasic(withDefaults());

http.authorizeHttpRequests(
(springEnvironmentHelper.isDevProfile())
? authorize -> authorize.anyRequest().authenticated()
: authorize -> authorize.anyRequest().permitAll());
http.authorizeHttpRequests(authorize -> authorize.anyRequest().authenticated());

return http.build();
}
Expand All @@ -107,7 +101,11 @@ public SecurityFilterChain apiFilterChain(
http.authorizeHttpRequests(
auth ->
auth.requestMatchers(
"/public/**", "/swagger-ui/**", "/v3/api-docs/**")
"/public/**",
"/swagger-ui/**",
"/v3/api-docs/**",
"/oauth2/**",
"/login/oauth2/**")
.permitAll()
.anyRequest()
.authenticated())
Expand All @@ -118,12 +116,10 @@ public SecurityFilterChain apiFilterChain(
userInfo.oidcUserService(
customOAuth2UserService))
.successHandler(oidcLoginSuccessHandler);
if (authorizationRequestResolver != null) {
oauth2.authorizationEndpoint(
authorization ->
authorization.authorizationRequestResolver(
authorizationRequestResolver));
}
oauth2.authorizationEndpoint(
a ->
a.authorizationRequestResolver(
authorizationRequestResolver));
})
.addFilterBefore(
jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
Expand All @@ -134,19 +130,24 @@ public SecurityFilterChain apiFilterChain(
@Bean
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();

configuration.setAllowedOriginPatterns(
List.of(
"http://localhost:3000",
"https://dev.clokey.store",
"https://prod.clokey.store"));

configuration.setAllowedMethods(
List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
configuration.setAllowedHeaders(List.of("*"));
configuration.setAllowCredentials(true);

CorsConfiguration appleCallbackConfiguration = new CorsConfiguration();
appleCallbackConfiguration.setAllowedOriginPatterns(List.of("https://appleid.apple.com"));
appleCallbackConfiguration.setAllowedMethods(List.of("POST", "OPTIONS"));
appleCallbackConfiguration.setAllowedHeaders(List.of("*"));
appleCallbackConfiguration.setAllowCredentials(true);

UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/login/oauth2/code/**", appleCallbackConfiguration);
source.registerCorsConfiguration("/**", configuration);
return source;
}
Expand All @@ -157,14 +158,15 @@ public JwtAuthenticationFilter jwtAuthenticationFilter(JwtTokenService jwtTokenS
}

@Bean
public OAuth2AuthorizationRequestResolver oauth2AuthorizationRequestResolver() {
@Profile({"local", "dev", "prod"})
public OAuth2AuthorizationRequestResolver oauth2AuthorizationRequestResolver(
ClientRegistrationRepository clientRegistrationRepository) {
AppleAwareOAuth2AuthorizationRequestResolver resolver =
new AppleAwareOAuth2AuthorizationRequestResolver(
clientRegistrationRepository, "/oauth2/authorization");

resolver.setAuthorizationRequestCustomizer(
OAuth2AuthorizationRequestCustomizers.withPkce());

return resolver;
}
}
Loading