fix: Rt 값 쿠키에 넣도록 수정, 랜덤 비밀번호 삭제, 로그인 비밀번호 검증 추가, 사용하지 않는 import문 삭제 #23

Author: zizi0308

src/main/java/org/dfbf/soundlink/domain/user/controller/AuthController.java

@@ -41,7 +41,7 @@ public ResponseResult reissueToken(HttpServletRequest request, HttpServletRespon
     // 카카오 로그인 (인가 코드 받아서 회원가입 또는 로그인 진행)
     @Operation(summary = "카카오 로그인", description = "카카오 로그인 후 JWT 발급")
     @GetMapping("/login/kakao")
-    public ResponseResult kakaoCallback(@RequestParam String code) {
-        return kakaoAuthService.kakaoLogin(code);
+    public ResponseResult kakaoCallback(@RequestParam String code, HttpServletResponse response) {
+        return kakaoAuthService.kakaoLogin(code, response);
     }
 }

src/main/java/org/dfbf/soundlink/domain/user/service/KakaoAuthService.java

@@ -1,5 +1,6 @@
 package org.dfbf.soundlink.domain.user.service;
 
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dfbf.soundlink.domain.user.dto.response.KakaoTokenResponseDTO;
 import org.dfbf.soundlink.domain.user.dto.response.KakaoUserDTO;
@@ -11,11 +12,13 @@
 import org.dfbf.soundlink.global.comm.enums.SocialType;
 import org.dfbf.soundlink.global.exception.ResponseResult;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseCookie;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -28,21 +31,21 @@ public class KakaoAuthService {
     private final UserRepository userRepository;
     private final JwtProvider jwtProvider;
     private final BCryptPasswordEncoder passwordEncoder;
-    private final TokenService tokenService;
+    private static final String domain = "";
 
     @Value("${kakao.client-id}")
     private String clientId;
 
     @Value("${kakao.redirect-uri}")
     private String redirectUri;
 
-    @Value("${kakao.password}")
-    private String kakaoPassword;
+    @Value("${REFRESH_TOKEN_EXPIRATION_TIME}")
+    private int REFRESH_TOKEN_EXPIRATION_TIME;
 
     /**
      *  카카오 로그인 및 JWT 발급
      */
-    public ResponseResult kakaoLogin(String code) {
+    public ResponseResult kakaoLogin(String code, HttpServletResponse response) {
         // 요청 파라미터 설정 (JSONObject 대신 하나의 Key와 하나 이상의 value로 이루어진 리스트를 쌍으로 받기 위해 LinkedMultiValueMap 사용)
         MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
         params.add("grant_type", "authorization_code");
@@ -63,7 +66,7 @@ public ResponseResult kakaoLogin(String code) {
 
         if (existingUser.isPresent()) {
             // 기존 사용자가 존재 시, 로그인 처리
-            return generateTokenResponse(existingUser.get());
+            return generateTokenResponse(existingUser.get(), response);
         } else {
             // 신규 가입은 닉네임 중복 확인 필요
             if (userRepository.existsByNickname(kakaoNickname)) {
@@ -72,25 +75,26 @@ public ResponseResult kakaoLogin(String code) {
             }
             // 회원가입
             User newUser = registerNewKakaoUser(kakaoUser, kakaoNickname);
-            return generateTokenResponse(newUser);
+            return generateTokenResponse(newUser, response);
         }
     }
 
     /**
      *  JWT 토큰 생성
      */
-    private ResponseResult generateTokenResponse(User user) {
+    private ResponseResult generateTokenResponse(User user, HttpServletResponse response) {
         String jwtAccessToken = jwtProvider.createAccessToken(user.getUserId());
         String jwtRefreshToken = jwtProvider.createRefreshToken(user.getUserId());
 
-        tokenService.updateRefreshToken(user.getUserId(), jwtRefreshToken);
+        //refreshToken - 쿠키
+        ResponseCookie refreshCookie = getRefreshToken(jwtRefreshToken);
+        response.setHeader("Set-Cookie", refreshCookie.toString());
 
-        Map<String, String> authResponse = Map.of(
-                "accessToken", jwtAccessToken,
-                "refreshToken", jwtRefreshToken
-        );
+        //accessToken - 바디
+        Map<String, String> responseBody = new HashMap<>();
+        responseBody.put("accessToken", jwtAccessToken);
 
-        return new ResponseResult(authResponse);
+        return new ResponseResult(responseBody);
     }
 
     /**
@@ -102,7 +106,7 @@ private User registerNewKakaoUser(KakaoUserDTO kakaoUser, String nickname) {
                 .socialId(Long.valueOf(kakaoUser.id()))
                 .socialType(SocialType.KAKAO)
                 .loginId("kakao_" + kakaoUser.id()) // 카카오 ID 기반 로그인 ID 생성
-                .password(passwordEncoder.encode(kakaoPassword))
+                .password(passwordEncoder.encode(null))
                 .email(kakaoUser.kakao_account().email())
                 .build();
         return userRepository.save(newUser);
@@ -123,4 +127,16 @@ private String generateUniqueNickname(String baseNickname) {
         }
         return newNickname;
     }
+
+    // RefreshToken을 쿠키로 설정
+    private ResponseCookie getRefreshToken(String refreshToken) {
+        return ResponseCookie
+                .from("REFRESHTOKEN", refreshToken)
+                .domain(domain)
+                .path("/")
+                .httpOnly(true)
+                .secure(false)
+                .maxAge(REFRESH_TOKEN_EXPIRATION_TIME/1000) // 만료시간 설정(밀리초 -> 초로 변경)
+                .build();
+    }
 }

src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java

@@ -20,20 +20,16 @@
 import org.dfbf.soundlink.domain.user.repository.ProfileMusicRepository;
 import org.dfbf.soundlink.domain.user.repository.UserRepository;
 import org.dfbf.soundlink.global.auth.JwtProvider;
-import org.dfbf.soundlink.global.auth.TokenProperties;
 import org.dfbf.soundlink.global.exception.ErrorCode;
 import org.dfbf.soundlink.global.exception.ResponseResult;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.ResponseCookie;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.naming.AuthenticationException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 @Slf4j
 @Service
@@ -49,9 +45,6 @@ public class UserService {
     private final RedisService redisService;
 
     private final JwtProvider jwtProvider;
-    private final TokenProperties tokenProperties;
-
-    private RedisTemplate<String, String> redisTemplate;
     private final TokenService tokenService;
 
     private static final String domain = "";
@@ -233,7 +226,8 @@ public ResponseResult login(LoginReqDto loginReqDto, HttpServletResponse respons
                 return new ResponseResult(ErrorCode.FAIL_TO_FIND_USER, "계정을 찾을 수 없습니다.");
             }
             // 비밀번호 검증(암호화 된 비밀번호 비교)
-            if(!passwordEncoder.matches(loginReqDto.password(), userRepository.findPasswordByLoginId(loginReqDto.loginId()))){
+            if( loginReqDto.password() == null || loginReqDto.password().isEmpty() ||
+                    !passwordEncoder.matches(loginReqDto.password(), userRepository.findPasswordByLoginId(loginReqDto.loginId()))){
                 return new ResponseResult( ErrorCode.NOT_EQUALS_PASSWORD,"잘못된 비밀번호 입니다.");
             }