Merge branch 'dev1' of https://github.com/SportsEcho/EchoProject-BE i…

…nto test/performance
SportsEcho · Jan 31, 2024 · 5754f9e · 5754f9e
2 parents 01305bf + 07639d3
commit 5754f9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/sportsecho/common/configuration/CorsConfig.java b/src/main/java/com/sportsecho/common/configuration/CorsConfig.java
@@ -10,7 +10,7 @@ public class CorsConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-            .allowedOriginPatterns("http://localhost:3000", "http://sportsecho.life:3000")
+            .allowedOriginPatterns("http://localhost:3000", "http://sportsecho.life:3000", "https://sportsecho.life")
             .exposedHeaders(JwtUtil.AUTHORIZATION_HEADER, JwtUtil.REFRESH_AUTHORIZATION_HEADER)
             .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
             .allowedHeaders("*")

diff --git a/src/main/java/com/sportsecho/common/oauth/OAuthUtil.java b/src/main/java/com/sportsecho/common/oauth/OAuthUtil.java
@@ -135,7 +135,7 @@ private MultiValueMap<String, String> generateBody(SocialType socialType, String
         if(SocialType.KAKAO.equals(socialType)) {
             body.add("grant_type", "authorization_code");
             body.add("client_id", kakaoApiKey);
-            body.add("redirect_uri", "http://sportsecho.life:3000/redirect/kakao");
+            body.add("redirect_uri", "https://sportsecho.life/redirect/kakao");
             body.add("code", code);
         }
         if(SocialType.NAVER.equals(socialType)) {