Merge pull request #32 from 9roomMoa/feat/#31

fix: google 로그인 리디렉트 버그 수정

Author: EveryPine

aether-security

@@ -9,11 +9,19 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.util.UriComponentsBuilder;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -32,21 +40,27 @@ public class AuthController {
      * @return 로그인 성공 응답과 JWT access token
      */
     @GetMapping("/success")
-    public ResponseEntity<CommonResponse> loginSuccess(HttpSession session) {
+    public ResponseEntity<Void> loginSuccess(HttpSession session) throws IOException {
         // 세션에서 데이터 읽기
         String accessToken = (String) session.getAttribute("accessToken");
         Member member = (Member) session.getAttribute("member");
 
-        // 소셜 로그인 성공 응답 객체 생성
-        Map<String, Object> result = new HashMap<>();
-        result.put("id", member.getId());
-        result.put("username", member.getName());
-        result.put("email", member.getEmail());
-        result.put("accessToken", accessToken);
+        // 프론트엔드 엔드포인트로 리다이렉트
+        String baseFrontendUrl = "https://localhost:5173";
+        String encodedUsername = Base64.getEncoder().encodeToString(member.getName().getBytes(StandardCharsets.UTF_8));
 
-        CommonResponse response = new CommonResponse(
-                HttpStatus.OK, "소셜 로그인에 성공했습니다.", result);
-        return ResponseEntity.ok(response);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setLocation(URI.create(baseFrontendUrl + "/sign-up"));
+
+        // 쿠키로 사용자 데이터 전달
+        headers.add(HttpHeaders.SET_COOKIE, "accessToken=" + accessToken + "; Secure; SameSite=None; Path=/; Max-Age=3600");
+        headers.add(HttpHeaders.SET_COOKIE, "id=" + member.getId() + "; Secure; SameSite=None; Path=/; Max-Age=3600");
+        headers.add(HttpHeaders.SET_COOKIE, "username=" + encodedUsername + "; Secure; SameSite=None; Path=/; Max-Age=3600");
+        headers.add(HttpHeaders.SET_COOKIE, "email=" + member.getEmail() + "; Secure; SameSite=None; Path=/; Max-Age=3600");
+
+        return ResponseEntity.status(HttpStatus.MOVED_PERMANENTLY)
+                .headers(headers)
+                .body(null);
     }
 
     /**

src/main/java/com/groommoa/aether_back_spring/global/auth/controller/AuthController.java

@@ -14,6 +14,8 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * OAuth2 인증 성공 후 실행되는 핸들러

src/main/java/com/groommoa/aether_back_spring/global/auth/handler/OAuth2SuccessHandler.java

@@ -4,4 +4,5 @@ public final class HttpStatus {
 
     public static final int OK = 200;
     public static final int UNAUTHORIZED = 401;
+    public static final int MOVED_PERMANENTLY = 301;
 }

src/main/java/com/groommoa/aether_back_spring/global/common/constants/HttpStatus.java

@@ -20,6 +20,11 @@
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Spring Security의 보안 설정을 담당하는 Spring Configuration
@@ -50,6 +55,25 @@ public WebSecurityCustomizer webSecurityCustomizer() {
                 .requestMatchers("/error", "/favicon.ico"); // 에러 페이지 및 파비콘 요청 제외
     }
 
+    /**
+     * CORS 설정을 위한 CorsConfigurationSource를 정의
+     * <P></P>
+     * CORS 요청에 대해 허용할 설정 지정
+     */
+    CorsConfigurationSource corsConfigurationSource() {
+        return request -> {
+            CorsConfiguration config = new CorsConfiguration();
+            config.setAllowedHeaders(Collections.singletonList("*"));
+            config.setAllowedMethods(Collections.singletonList("*"));
+            config.setAllowedOriginPatterns(List.of(
+                    "http://localhost:5173",
+                    "https://localhost:5173"
+            ));
+            config.setAllowCredentials(true);
+            return config;
+        };
+    }
+
     /**
      * Spring Security의 보안 설정을 정의하는 SecurityFilterChain 생성
      * @param http HttpSecurity 객체
@@ -62,6 +86,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 // CSRF 보호 비활성화 (JWT 사용 시 필요)
                 .csrf(AbstractHttpConfigurer::disable)
 
+                // CORS 설정 적용
+                .cors(corsConfigurer -> corsConfigurer.configurationSource(corsConfigurationSource()))
+
                 // HTTP 기본 인증 비활성화 (JWT 사용)
                 .httpBasic(AbstractHttpConfigurer::disable)