Skip to content

Commit da613f6

Browse files
committed
Merge branch 'release/v1.0.6'
2 parents 8e87a6b + 39ee5f6 commit da613f6

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

api/src/main/resources/local/application-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ spring:
99
kakao:
1010
authorize-url: https://kauth.kakao.com/oauth/authorize?response_type=code&client_id={0}&redirect_uri={1}
1111
app-key: ENC(la2O8hAJw/5PQXn8KxMXPDaAdnyXKBCGLZeI1uRkka+m2hbbtz+FmdQg3RE/B/aE)
12-
redirect-url: http://localhost:8080/api/kakao/login
12+
redirect-url: https://mbtips.kr/kakao-login

api/src/main/resources/prod/application-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ spring:
99
kakao:
1010
authorize-url: https://kauth.kakao.com/oauth/authorize?response_type=code&client_id={0}&redirect_uri={1}
1111
app-key: ENC(la2O8hAJw/5PQXn8KxMXPDaAdnyXKBCGLZeI1uRkka+m2hbbtz+FmdQg3RE/B/aE)
12-
redirect-url: http://34.47.114.108:8080/api/kakao/login
12+
redirect-url: https://mbtips.kr/kakao-login

core/src/main/java/com/mbtips/common/configuration/SecurityConfiguration.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
1313
import org.springframework.security.web.SecurityFilterChain;
1414
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
15+
import org.springframework.web.cors.CorsConfiguration;
16+
import org.springframework.web.cors.CorsConfigurationSource;
17+
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
18+
19+
import java.util.List;
1520

1621
import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
1722

@@ -37,4 +42,20 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
3742
.authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll())
3843
.build();
3944
}
45+
46+
@Bean
47+
public CorsConfigurationSource corsConfiguration() {
48+
CorsConfiguration corsConfiguration = new CorsConfiguration();
49+
corsConfiguration.setAllowedOrigins(List.of(
50+
"*",
51+
"http://34.47.114.108:3000",
52+
"https://mbitips.kr"
53+
));
54+
corsConfiguration.setAllowCredentials(true);
55+
corsConfiguration.setAllowedHeaders(List.of("*"));
56+
corsConfiguration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH"));
57+
UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
58+
urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
59+
return urlBasedCorsConfigurationSource;
60+
}
4061
}

0 commit comments

Comments
 (0)