Merge branch 'main' of https://git.byeori.cloud/admin/ocr-java

pull merge

prd/src/main/java/site/ocr/prd/config/SecurityConfig.java

@@ -22,6 +22,7 @@ public class SecurityConfig {
                 configuration.setAllowedOrigins(List.of("http://localhost:3000"));
                 configuration.setAllowedMethods(List.of("GET","POST", "PUT","DELETE","OPTION"));
                 configuration.setAllowedHeaders(List.of("*"));
+                configuration.setAllowCredentials(true);
                 return configuration;
             };
             cors.configurationSource(configurationSource);

prd/src/main/java/site/ocr/prd/contorllers/LoginController.java

@@ -1,6 +1,9 @@
 package site.ocr.prd.contorllers;
 import java.util.Map;
+import org.slf4j.Logger;
+import java.util.HashMap;
 
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
 import org.springframework.http.ResponseEntity;
@@ -23,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 @Controller
 public class LoginController {
 
+    //Logger 선언
+    private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
+
     //service 선언
     private final LoginService loginService; 
 
@@ -34,9 +40,9 @@ public class LoginController {
      * @param redirectRespn 카카오에서 리다이렉트해준 인가코드
      */
     @GetMapping("/oauth/oauth-kakao-authorize")  //kakao에서 get으로 리다이렉트 해줌
-    public ResponseEntity kakaoLoginRequest(HttpServletRequest redirectRespn) {
+    public ResponseEntity<Map<String, String>> kakaoLoginRequest(HttpServletRequest redirectRespn) {
         String code = redirectRespn.getParameter("code");
-        System.out.println("인가코드 :: " + code);
+        logger.info("인가코드 :: " + code);
 
         /**
          * 카카오에 토큰값 요청
@@ -58,7 +64,7 @@ public class LoginController {
          * @param refresh_token 사용자 리프레시 토큰
          */
         LoginResDTO loginResult = loginService.getToken(loginRequest);
-        System.out.println("결과 :: " + loginResult.toString());
+        logger.info("토큰발급 결과 :: " + loginResult.toString());
 
         UserInfoInqyReqDTO userInfoInqyRequest = new UserInfoInqyReqDTO();
         userInfoInqyRequest.setAccess_token(loginResult.getAccess_token());
@@ -68,18 +74,19 @@ public class LoginController {
          * @param access_token 사용자정보 조회용 토큰
          */
         UserInfoInqyResDTO userInfoInqyResponse = loginService.getUserInfo(userInfoInqyRequest);
-        System.out.println("사용자정보 :: " + userInfoInqyResponse.toString());
+        logger.info("사용자정보 :: " + userInfoInqyResponse.toString());
 
-        ResponseCookie cookie = loginService.createJwtCookie(Long.parseLong(userInfoInqyResponse.getId()));
+        ResponseCookie cookie = loginService.createJwtCookie(userInfoInqyResponse.getId());
 
-        Map<String, Object> response = new java.util.HashMap<>();
-        response.put("success", true);
+        Map<String, String> response = new HashMap<>();
+        response.put("success", "true");
         response.put("userId", userInfoInqyResponse.getId());
         response.put("message", "Login successful");
-        response.put("userInfo", userInfoInqyResponse);
+        response.put("userInfo", userInfoInqyResponse.getName());
 
-        return ResponseEntity.ok()
+        return ResponseEntity.status(302)
         .header(HttpHeaders.SET_COOKIE, cookie.toString())
+        .header(HttpHeaders.LOCATION, "http://localhost:3000/pages/oauth/callback")
         .body(response);
     }
 
@@ -89,7 +96,7 @@ public class LoginController {
      * @return 로그인 결과 및 JWT 토큰
      */
     @GetMapping("/oauth/get-jwt-token")
-    public ResponseEntity<Map<String, String>> getJwtToken(@RequestParam Long userId) {
+    public ResponseEntity<Map<String, String>> getJwtToken(@RequestParam String userId) {
         ResponseCookie cookie = loginService.createJwtCookie(userId);
         Map<String, String> response = new java.util.HashMap<>();
         response.put("token", cookie.toString());

prd/src/main/java/site/ocr/prd/services/LoginService.java

@@ -2,6 +2,8 @@ package site.ocr.prd.services;
 
 import java.time.Duration;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseCookie;
@@ -20,6 +22,9 @@ import site.ocr.prd.dto.UserInfoInqyResDTO;
 @Service
 public class LoginService {
     
+    //logger 선언
+    private static final Logger logger = LoggerFactory.getLogger(LoginService.class);
+
     //webclient builder
     private final WebClient webClient;
     //JWT provider
@@ -31,7 +36,7 @@ public class LoginService {
     }
 
     public LoginResDTO getToken(LoginReqDTO request) {
-        System.out.println("kakao auth code = {}" + request.getCode());
+        logger.info("kakao auth code :: " + request.getCode());
 
         LoginResDTO result = webClient.post()
         .uri("https://kauth.kakao.com/oauth/token")
@@ -59,11 +64,11 @@ public class LoginService {
                 .block();
 
         //사용자ID
+        //jsonnode :: {"id":4438121341,"connected_at":"2025-09-09T03:53:23Z"}
+        logger.info("jsonnode :: " + root.toString());
         String id = root.path("id").asText();
         String name = root.path("name").asText();
         String email = root.path("email").asText();
-        //jsonnode :: {"id":4438121341,"connected_at":"2025-09-09T03:53:23Z"}
-        System.out.println("jsonnode :: " + root.toString());
         result.setId(id);
         result.setName(name);
         result.setEmail(email);
@@ -76,7 +81,7 @@ public class LoginService {
      * @param userId 사용자 ID
      * @return ResponseCookie JWT 토큰이 포함된 쿠키
      */
-    public ResponseCookie createJwtCookie(Long userId) {
+    public ResponseCookie createJwtCookie(String userId) {
         String jwt = jwtProvider.createJwtToken(userId);
         return ResponseCookie.from("accessToken", jwt)
         .httpOnly(true)