Merge pull request #74 from studio-recoding/dev

[🚀feat] oauth 리다이렉션 URI 이중화

Author: JeonHaeseung

.github/workflows/prod-deploy.yml

@@ -108,4 +108,4 @@ jobs:
             sudo docker rm $(sudo docker ps -a -q)
             sudo docker rmi $(sudo docker images -q)
             docker pull jeonhaeseung/ness-server-prod:main
-            docker run -d --name backend-server -p 8080:8080 --restart unless-stopped jeonhaeseung/ness-server-prod:main
+            docker run -d --name backend-server -p 80:8080 --restart unless-stopped jeonhaeseung/ness-server-prod:main

src/main/java/Ness/Backend/domain/auth/oAuth/OAuthSuccessHandler.java

@@ -7,6 +7,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -19,6 +20,12 @@
 public class OAuthSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
     private final JwtTokenProvider jwtTokenProvider;
 
+    @Value("frontend.redirect-url")
+    private String frontRedirectUrl;
+
+    @Value("backend.server-name")
+    private String backServerName;
+
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
 
@@ -46,12 +53,12 @@ private String setRedirectUrl(String url) {
         if (url.equals("localhost")) {
             redirect_url = "http://localhost:8080/oauth/google/success";
         }
-        /* 프론트 개발 환경 */
-        if (url.equals("api.nessplanning.com")) {
-            redirect_url = "http://localhost:3000/oauth/google/success/ing";
+        /* 프론트 개발 또는 프로덕션 환경 */
+        if (url.equals(backServerName)) {
+            log.info("backServerName: " + backServerName);
+            log.info("frontRedirectUrl: " + frontRedirectUrl);
+            redirect_url = frontRedirectUrl + "/oauth/google/success/ing";
         }
-        //TODO: 프론트 프로덕션 환경만 지원하는 백엔드 구축
-        
         return redirect_url;
     }
 }

src/main/java/Ness/Backend/domain/auth/security/SecurityConfig.java

@@ -64,6 +64,7 @@ public CorsConfigurationSource corsConfigurationSource() {
         configuration.addAllowedOriginPattern("https://*.nessplanning.com");
         configuration.addAllowedOriginPattern("https://*.nessplanning.com:8080");
         configuration.addAllowedOriginPattern("https://*.nessplanning.com:3000");
+        configuration.addAllowedOriginPattern("https://www.nessplanning.com");
         configuration.addAllowedOriginPattern("https://api.nessplanning.com:8080");
         configuration.addAllowedMethod("*"); //모든 Method 허용(POST, GET, ...)
         configuration.addAllowedHeader("*"); //모든 Header 허용

src/main/java/Ness/Backend/domain/chat/ChatService.java

@@ -100,6 +100,9 @@ public PostFastApiAiChatDto postNewAiChat(Long id, String text, ChatType chatTyp
         if (personaType == PersonaType.HARDNESS){
             persona = "hard";
         }
+        if (personaType == PersonaType.CLAMNESS){
+            persona = "easy";
+        }
 
         //TODO: member_id 전달하는 로직 만들어야 하지 않을까?(RAG를 위해)
         PostFastApiUserChatDto userDto = PostFastApiUserChatDto.builder()