refactor: 코드 정리

Author: 40food

src/main/java/com/ureca/unity/domain/auth/controller/LogoutController.java

@@ -31,12 +31,10 @@ public void logout(
     ) {
         logoutService.logout(refreshToken);
 
-        // 1. 현재 표준 쿠기 (Path=/) 삭제
         response.addCookie(
                 CookieUtils.deleteRefreshTokenCookie(cookieSecure)
         );
 
-        // 2. 레거시 쿠키(Path=/api/auth)도 삭제 (과거 잔재 청소)
         response.addCookie(CookieUtils.deleteRefreshTokenCookie(cookieSecure, "/api/auth", "Lax"));
         response.addCookie(CookieUtils.deleteRefreshTokenCookie(cookieSecure, "/api/auth", "Strict"));
     }

src/main/java/com/ureca/unity/domain/auth/controller/OAuthController.java

@@ -39,11 +39,9 @@ public OAuthLoginResponse login(
     ) {
         OAuthLoginResult result = oAuthService.login(OAuthProvider.from(provider), code);
 
-        // 1. 레거시(/api/auth) 쿠키 제거 (예전 SameSite가 Strict였다면 Strict로 한 번 더)
         response.addCookie(CookieUtils.deleteRefreshTokenCookie(cookieSecure, "/api/auth", "Strict"));
         response.addCookie(CookieUtils.deleteRefreshTokenCookie(cookieSecure, "/api/auth", "Lax"));
 
-        // 2. 정상(/) 쿠키 설정
         response.addCookie(
             CookieUtils.createRefreshTokenCookie(
                     result.refreshToken(),

src/main/java/com/ureca/unity/domain/auth/dto/OAuthUserInfo.java

@@ -9,8 +9,8 @@
 @Builder
 public class OAuthUserInfo {
 
-    private final String provider;     // google / naver / kakao
-    private final String providerId;   // OAuth 제공자 고유 ID
-    private final String email;        // nullable 가능
+    private final String provider;
+    private final String providerId;
+    private final String email;
     private final String name;
 }

src/main/java/com/ureca/unity/domain/auth/model/OAuthToken.java

@@ -10,8 +10,8 @@
 public class OAuthToken {
     private Long id;
     private Long userId;
-    private String provider;      // google / naver / kakao
+    private String provider;
     private String accessToken;
-    private String refreshToken;  // nullable
-    private LocalDateTime expiresAt;    // nullable
+    private String refreshToken;
+    private LocalDateTime expiresAt;
 }

src/main/java/com/ureca/unity/domain/auth/service/AuthSessionServiceImpl.java

@@ -29,30 +29,25 @@ public class AuthSessionServiceImpl implements AuthSessionService {
     public MeResponse getMe(HttpServletRequest request) {
         String refreshToken = extractRefreshToken(request);
 
-        // (1) refresh JWT 서명 + type 검증
         Long jwtUserId;
         try {
             jwtUserId = jwtProvider.getUserId(refreshToken, "refresh");
         } catch (JwtException | IllegalArgumentException | CustomException e) {
             throw new CustomException(ErrorCode.REFRESH_TOKEN_INVALID);
         }
 
-        // (2) DB에 저장된 토큰인지 확인
         RefreshToken saved = refreshTokenMapper.findByToken(refreshToken)
                 .orElseThrow(() -> new CustomException(ErrorCode.REFRESH_TOKEN_INVALID));
 
-        // (3) 만료 체크
         if (saved.getExpiresAt() == null || saved.getExpiresAt().isBefore(Instant.now())) {
             refreshTokenMapper.deleteByToken(refreshToken);
             throw new CustomException(ErrorCode.REFRESH_TOKEN_EXPIRED);
         }
 
-        // (4) 토큰의 userId 일치 체크
         if (!saved.getUserId().equals(jwtUserId)) {
             throw new CustomException(ErrorCode.REFRESH_TOKEN_INVALID);
         }
 
-        // (5) 유저 조회
         User user = userMapper.findById(saved.getUserId())
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
 

src/main/java/com/ureca/unity/domain/auth/service/LogoutServiceImpl.java

@@ -18,7 +18,6 @@ public class LogoutServiceImpl implements LogoutService {
     @Override
     public void logout(String refreshToken) {
 
-// refreshToken 없어도 로그아웃은 성공
         if (refreshToken == null || refreshToken.isBlank()) {
             log.info("Logout: no refreshToken provided");
             return;

src/main/java/com/ureca/unity/domain/auth/service/OAuthServiceImpl.java

@@ -56,7 +56,6 @@ public OAuthLoginResult login(OAuthProvider provider, String authorizationCode)
                                         );
                                     }
 
-                                    // 재가입이면 true, 기존이면 false
                                     return createLoginResult(anyUser.getId(), wasDeleted, provider.value(), tokenInfo);
                                 })
                                 .orElseGet(() -> {

src/main/java/com/ureca/unity/domain/auth/service/RefreshTokenServiceImpl.java

@@ -53,19 +53,15 @@ public void saveRefreshToken(Long userId, String refreshToken) {
     @Override
     public TokenResponse refreshAccessToken(HttpServletRequest request,
                                             HttpServletResponse response) {
-
-        // 1. Cookie에서 refreshToken 추출
         String refreshToken = extractRefreshToken(request);
 
-        // 1-1. JWT 서명 검증 (DB 조회 전)
         Long jwtUserId;
         try {
             jwtUserId = jwtProvider.getUserId(refreshToken, "refresh");
         } catch (JwtException | IllegalArgumentException | CustomException e) {
             throw new CustomException(ErrorCode.REFRESH_TOKEN_INVALID);
         }
 
-        // 2. DB 조회
         RefreshToken savedToken = refreshTokenMapper.findByToken(refreshToken)
                 .orElseThrow(() ->
                         new CustomException(ErrorCode.REFRESH_TOKEN_INVALID)
@@ -75,10 +71,8 @@ public TokenResponse refreshAccessToken(HttpServletRequest request,
             throw new CustomException(ErrorCode.REFRESH_TOKEN_INVALID);
         }
 
-        // 3. 만료 체크
         if (savedToken.getExpiresAt().isBefore(Instant.now())) {
-            // 만료된 토큰은 즉시 삭제 후 예외 반환 (rotation 로직 미진입)
-            refreshTokenMapper.deleteByToken(refreshToken); // 만료 토큰 정리
+            refreshTokenMapper.deleteByToken(refreshToken);
             throw new CustomException(ErrorCode.REFRESH_TOKEN_EXPIRED);
         }
 
@@ -88,30 +82,21 @@ public TokenResponse refreshAccessToken(HttpServletRequest request,
             throw new CustomException(ErrorCode.REFRESH_TOKEN_INVALID);
         }
 
-        // 4. 기존 refreshToken 폐기 (Rotation 로직 진입)
         int deletedCount = refreshTokenMapper.deleteByToken(refreshToken);
         if (deletedCount == 0) {
             throw new CustomException(ErrorCode.REFRESH_TOKEN_INVALID);
         }
 
-        // 5. 새 Access + Refresh 발급
         TokenResponse accessToken = jwtIssuer.issueAccessToken(userId);
-        
-        // 6. 새 refreshToken 발급
         String newRefreshToken = jwtIssuer.issueRefreshToken(userId);
-
-        // 7. DB 저장
         saveRefreshToken(userId, newRefreshToken);
-
-        // 8. 새 refreshToken 쿠키 설정
         response.addCookie(CookieUtils.createRefreshTokenCookie(
                 newRefreshToken,
                 jwtProperties.refreshExpirationSeconds(),
                 cookieSecure
                 )
         );
 
-        // 9. accessToken만 반환
         return accessToken;
     }
 

src/main/java/com/ureca/unity/domain/auth/service/oauth/GoogleOAuthClient.java

@@ -38,7 +38,7 @@ public class GoogleOAuthClient implements OAuthClient {
 
     @Override
     public OAuthAuthResult authenticate(String authorizationCode) {
-        Map<String, Object> token = getTokenResponse(authorizationCode); // access/refresh/expires_in
+        Map<String, Object> token = getTokenResponse(authorizationCode);
 
         String accessToken = token.get("access_token").toString();
         String refreshToken = token.get("refresh_token") != null ? String.valueOf(token.get("refresh_token")) : null;
@@ -48,7 +48,6 @@ public OAuthAuthResult authenticate(String authorizationCode) {
                 expiresIn = Long.valueOf(String.valueOf(token.get("expires_in")));
             } catch (NumberFormatException e) {
                 log.warn("Google token response has non-numeric expires_in: {}", token.get("expires_in"));
-                // expires_in 파싱 실패 시 null로 처리
             }
         }
 

src/main/java/com/ureca/unity/domain/call/service/RecordingServiceImpl.java

@@ -40,7 +40,6 @@ public class RecordingServiceImpl implements RecordingService {
     private final CounselingResultMapper sttMapper;
     private final SummaryMapper summaryMapper;
 
-    //@Value 주입이 완료된 후, 호출 시점에 WebClient 빌드
     private WebClient getWebClient() {
         String authStr = customerId + ":" + customerSecret;
         String auth = Base64.getEncoder().encodeToString(authStr.getBytes());
@@ -55,7 +54,6 @@ private WebClient getWebClient() {
     @Override
     public String acquire(String channelName, String uid) {
         log.info("[Agora] Acquire 요청 시작 - channel: {}, uid: {}", channelName, uid);
-        // 전체 Body
         Map<String, Object> body = Map.of(
                 "cname",channelName,
                 "uid", uid,
@@ -165,10 +163,10 @@ public void stop(String resourceId, String sid, String channelName, String uid,
                 throw new CustomException(ErrorCode.INTERNAL_SERVER_ERROR);
             }
 
-            //s3의 파일->wav로 변경->stt
+            //s3 파일->wav로 변경->stt
             CompletableFuture.runAsync(() -> {
                 try {
-                    Thread.sleep(10000); //TODO:차후 lambda로 호출되면 동작하도록 개선
+                    Thread.sleep(10000); //차후 lambda로 호출되면 동작하도록 개선
                     String m3u8Url = String.format("https://%s.s3.ap-northeast-2.amazonaws.com/recordings/%s/%s_%s.m3u8",
                             s3Bucket, channelName, sid, channelName);
                     log.info("변환 시작: {}", m3u8Url);