Merge pull request #261 from CodIN-INU/fix/login-redirect-issue

fix: redirect 요청 세분화

Author: doma17

src/main/java/inu/codin/codin/common/security/controller/AuthController.java

@@ -32,8 +32,11 @@ public class AuthController {
     @GetMapping("/google")
     public ResponseEntity<SingleResponse<?>> googleLogin(
             HttpServletResponse response,
-            @RequestParam(required = false, value = "redirect_url") String redirect_url) throws IOException {
-        authSessionService.setSession(redirect_url);
+            @RequestParam(required = false, value = "redirect_host") String redirect_host,
+            @RequestParam(required = false, value = "redirect_path") String redirect_path
+    ) throws IOException {
+        authSessionService.setSession(redirect_host);
+        authSessionService.setSession(redirect_path);
         response.sendRedirect("/api/oauth2/authorization/google");
         return ResponseEntity.ok()
                 .body(new SingleResponse<>(200, "google OAuth2 Login Redirect",null));

src/main/java/inu/codin/codin/common/security/util/OAuth2LoginSuccessHandler.java

@@ -55,29 +55,42 @@ private void handleLoginResult(HttpServletRequest request, HttpServletResponse r
         response.setContentType("application/json;charset=UTF-8");
         PrintWriter writer = response.getWriter();
 
-        String redirectUrl = (String) request.getSession().getAttribute("redirect_url");
-        if (Objects.equals(redirectUrl, null)) redirectUrl = BASEURL;
-        request.getSession().removeAttribute("redirect_url");
+        String redirectHost = (String) request.getSession().getAttribute("redirect_host");
+        String redirectPath = (String) request.getSession().getAttribute("redirect_path");
+
+        boolean isPathExists = true;
+        if (Objects.isNull(redirectHost)) {
+            redirectHost = BASEURL;
+        }
+        if (Objects.isNull(redirectPath)) {
+            isPathExists = false;
+        }
+        request.getSession().removeAttribute("redirect_host");
+        request.getSession().removeAttribute("redirect_path");
 
         switch (result) {
             case LOGIN_SUCCESS -> {
-                getRedirectStrategy().sendRedirect(request, response, redirectUrl);
+                if (isPathExists) {
+                    getRedirectStrategy().sendRedirect(request, response, redirectHost + redirectPath);
+                } else {
+                    getRedirectStrategy().sendRedirect(request, response, redirectHost + "/main");
+                }
                 log.info("{\"code\":200, \"message\":\"정상 로그인 완료: {}\"}", email);
             }
             case NEW_USER_REGISTERED -> {
-                getRedirectStrategy().sendRedirect(request, response, redirectUrl + "/auth/profile?email=" + email);
+                getRedirectStrategy().sendRedirect(request, response, redirectHost + "/auth/profile?email=" + email);
                 log.info("{\"code\":201, \"message\":\"신규 회원 등록 완료: {}\"}", email);
             }
             case PROFILE_INCOMPLETE -> {
-                getRedirectStrategy().sendRedirect(request, response, redirectUrl + "/auth/profile?email=" + email);
+                getRedirectStrategy().sendRedirect(request, response, redirectHost + "/auth/profile?email=" + email);
                 log.info("{\"code\":200, \"message\":\"회원 프로필 설정 미완료: {}\"}", email);
             }
             case SUSPENDED_USER -> {
-                getRedirectStrategy().sendRedirect(request, response, redirectUrl + "/api/suspends");
+                getRedirectStrategy().sendRedirect(request, response, redirectHost + "/api/suspends");
                 log.info("{\"code\":200, \"message\":\"정지된 회원: {}\"}", email);
             }
             default -> {
-                getRedirectStrategy().sendRedirect(request, response, redirectUrl + "/login");
+                getRedirectStrategy().sendRedirect(request, response, redirectHost + "/login");
                 log.info("{\"code\":500, \"message\":\"알 수 없는 오류 발생: {}\"}", email);
             }
         }