Merge pull request #143 from KUIT-Space/develop

24.08.20 최종배포
KUIT-Space · Aug 20, 2024 · ea31a0e · ea31a0e
2 parents 89e558f + ef55ee4
commit ea31a0e
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/space/space_spring/controller/OAuthController.java b/src/main/java/space/space_spring/controller/OAuthController.java
@@ -15,6 +15,8 @@
 import space.space_spring.response.BaseResponse;
 import space.space_spring.service.OAuthService;
 
+import java.io.IOException;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/oauth")
@@ -36,7 +38,7 @@ public class OAuthController {
      * 유저가 카카오 로그인 동의 시 호출될 콜백 함수
      */
     @GetMapping("/callback/kakao")
-    public BaseResponse<OAuthLoginResponse> kakaoCallback(@RequestParam(name = "code") String code, HttpServletResponse response) {
+    public void kakaoCallback(@RequestParam(name = "code") String code, HttpServletResponse response) throws IOException {
 
         // TODO 1. 인가코드 받기
         // 카카오 인증 서버는 서비스 서버의 Redirect URI로 인가 코드를 전달함
@@ -71,6 +73,14 @@ public BaseResponse<OAuthLoginResponse> kakaoCallback(@RequestParam(name = "code
         response.setHeader("Authorization", "Bearer " + jwtOAuthLogin);
         log.info("jwtOAuthLogin = {}", jwtOAuthLogin);
 
-        return new BaseResponse<>(new OAuthLoginResponse(userByOAuthInfo.getUserId()));
+        // Construct the redirect URL with the JWT and userId as query parameters
+        String redirectUrl = String.format(
+                "https://kuit-space.github.io/KUIT-Space-front/login?jwt=Bearer %s&userId=%s",
+                jwtOAuthLogin,
+                userByOAuthInfo.getUserId()
+        );
+
+        // Redirect to the specified URL
+        response.sendRedirect(redirectUrl);
     }
 }