6.2차 배포

chan0831 · web-flow · commit e46f2e629c44 · 2025-02-20T20:43:18.000+09:00
diff --git a/src/main/java/umc/codeplay/controller/OAuthController.java b/src/main/java/umc/codeplay/controller/OAuthController.java
@@ -17,15 +17,13 @@
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import umc.codeplay.apiPayLoad.ApiResponse;
 import umc.codeplay.apiPayLoad.code.status.ErrorStatus;
 import umc.codeplay.apiPayLoad.exception.handler.GeneralHandler;
 import umc.codeplay.config.properties.BaseOAuthProperties;
 import umc.codeplay.config.properties.GoogleOAuthProperties;
 import umc.codeplay.config.properties.KakaoOAuthProperties;
 import umc.codeplay.domain.Member;
 import umc.codeplay.domain.enums.SocialStatus;
-import umc.codeplay.dto.MemberResponseDTO;
 import umc.codeplay.jwt.JwtUtil;
 import umc.codeplay.service.MemberService;
 
@@ -65,7 +63,7 @@ public RedirectView redirectToOAuth(@PathVariable("provider") String provider) {
 
     @Hidden
     @GetMapping("/callback/{provider}")
-    public ApiResponse<MemberResponseDTO.LoginResultDTO> OAuthCallback(
+    public ResponseEntity<String> OAuthCallback(
             @RequestParam("code") String code, @PathVariable("provider") String provider) {
         BaseOAuthProperties properties =
                 switch (provider) {
@@ -110,13 +108,42 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> OAuthCallback(
         String serviceAccessToken = jwtUtil.generateToken(email, authorities);
         String serviceRefreshToken = jwtUtil.generateRefreshToken(email, authorities);
 
+        String html = getString(serviceAccessToken, serviceRefreshToken, email);
+
+        return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(html);
+
         // (6) 최종적으로 JWT(액세스/리프레시)를 프론트에 응답
-        return ApiResponse.onSuccess(
-                MemberResponseDTO.LoginResultDTO.builder()
-                        .email(email)
-                        .token(serviceAccessToken)
-                        .refreshToken(serviceRefreshToken)
-                        .build());
+        //        return ApiResponse.onSuccess(
+        //                MemberResponseDTO.LoginResultDTO.builder()
+        //                        .email(email)
+        //                        .token(serviceAccessToken)
+        //                        .refreshToken(serviceRefreshToken)
+        //                        .build());
+    }
+
+    String targetOrigin = "https://code-play-fe.vercel.app";
+
+    private String getString(String serviceAccessToken, String serviceRefreshToken, String email) {
+        String jsonData =
+                String.format(
+                        "{ \"accessToken\": \"%s\", \"refreshToken\": \"%s\", \"email\": \"%s\" }",
+                        serviceAccessToken, serviceRefreshToken, email);
+
+        return """
+            <!DOCTYPE html>
+            <html>
+              <body>
+                <script>
+                  (function() {
+                    var data = %s;
+                    window.opener.postMessage(data, "%s");
+                    window.close();
+                  })();
+                </script>
+              </body>
+            </html>
+            """
+                .formatted(jsonData, targetOrigin);
     }
 
     private Map<String, Object> requestOAuthToken(String code, BaseOAuthProperties properties) {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
@@ -36,6 +36,19 @@ spring:
         access-key: ${AWS_ACCESS_KEY_ID}
         secret-key: ${AWS_SECRET_ACCESS_KEY}
 
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: ${SPRING_MAIL_USERNAME}  # 이메일 계정
+    password: ${SPRING_MAIL_PASSWORD}
+    protocol: smtp
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+
 s3:
   bucket: ${S3_BUCKET}
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,14 +1,6 @@
 spring:
   application:
     name: codeplay
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: dummy-email@gmail.com  # 이메일 계정
-    password: dummy-password
-    protocol: smt
-    tls: true
-
 
   config:
     import:
@@ -36,6 +28,19 @@ spring:
         use_sql_comments: true
         default_batch_fetch_size: 1000  # 배치 크기 설정 (성능 최적화)
 
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: ${SPRING_MAIL_USERNAME}  # 이메일 계정
+    password: ${SPRING_MAIL_PASSWORD}
+    protocol: smtp
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+
   cloud:
     aws:
       region:
