[Feat] 회원 탈퇴 기능 #17
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,7 +26,7 @@ public String getRole() { | |
| return grantedAuthority.getAuthority(); | ||
| } | ||
|
|
||
| public Long getUserId() { | ||
| Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); | ||
| UserPrincipal principal = (UserPrincipal) authentication.getPrincipal(); | ||
| return principal.getUserId(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| import com.WhoIsRoom.WhoIs_Server.domain.user.service.UserService; | ||
| import com.WhoIsRoom.WhoIs_Server.global.common.resolver.CurrentUserId; | ||
| import com.WhoIsRoom.WhoIs_Server.global.common.response.BaseResponse; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
@@ -44,4 +45,11 @@ public BaseResponse<Void> updatePassword(@CurrentUserId Long userId, | |
| userService.updateMyPassword(userId, request); | ||
| return BaseResponse.ok(null); | ||
| } | ||
|
|
||
| @PostMapping("/delete/account") | ||
| public BaseResponse<Void> deleteAccount(HttpServletRequest request, | ||
| @CurrentUserId Long userId) { | ||
| userService.deleteAccount(request, userId); | ||
| return BaseResponse.ok(null); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,10 @@ | |
|
|
||
| import com.WhoIsRoom.WhoIs_Server.domain.auth.dto.request.MailRequest; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.auth.dto.request.PasswordRequest; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.auth.exception.CustomAuthenticationException; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.auth.service.JwtService; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.auth.service.MailService; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.auth.util.JwtUtil; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.club.model.Club; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.club.repository.ClubRepository; | ||
| import com.WhoIsRoom.WhoIs_Server.domain.member.model.Member; | ||
|
|
@@ -15,12 +18,15 @@ | |
| import com.WhoIsRoom.WhoIs_Server.domain.user.repository.UserRepository; | ||
| import com.WhoIsRoom.WhoIs_Server.global.common.exception.BusinessException; | ||
| import com.WhoIsRoom.WhoIs_Server.global.common.response.ErrorCode; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.security.core.context.SecurityContextHolder; | ||
| import org.springframework.security.crypto.password.PasswordEncoder; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import java.net.http.HttpRequest; | ||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
|
|
@@ -33,6 +39,8 @@ public class UserService { | |
| private final MailService mailService; | ||
| private final MemberRepository memberRepository; | ||
| private final ClubRepository clubRepository; | ||
| private final JwtUtil jwtUtil; | ||
| private final JwtService jwtService; | ||
|
|
||
| @Transactional | ||
| public void signUp(SignupRequest request) { | ||
|
|
@@ -169,4 +177,19 @@ private void validateClubExistence(Set<Long> clubIds) { | |
| throw new BusinessException(ErrorCode.CLUB_NOT_FOUND); | ||
| } | ||
| } | ||
|
|
||
| public void deleteAccount (HttpServletRequest request, Long userId) { | ||
| User user = userRepository.findById(userId) | ||
| .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND)); | ||
|
|
||
| userRepository.delete(user); | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion | 🟠 Major 🧩 Analysis chainMember 엔티티 cascade 설정 확인이 필요합니다. User 삭제 시 연관된 Member 레코드들이 올바르게 cascade 삭제되는지 확인해주세요. 만약 cascade 설정이 없다면 foreign key 제약 위반이 발생할 수 있습니다. 다음 스크립트를 실행하여 User 엔티티의 Member 관계 cascade 설정을 확인하세요: 🏁 Script executed: #!/bin/bash
# User 엔티티에서 Member와의 관계 설정 확인
# User 엔티티 파일에서 @OneToMany 어노테이션과 cascade 설정 찾기
rg -A 5 '@OneToMany.*Member' --type java -g '**/User.java'
# Member 엔티티에서 User와의 관계 설정 확인
rg -A 3 '@ManyToOne.*User' --type java -g '**/Member.java'Length of output: 0 User 엔티티와 Member 엔티티 간 cascade 설정을 아직 확인하지 못했습니다. 전체 코드베이스에서 @onetomany와 @manytoone 어노테이션을 검색해보세요: 🏁 Script executed: #!/bin/bash
# 엔티티 관계 설정 재검증
# OneToMany 어노테이션 전체 검색
rg -C3 "@OneToMany" --type java
# ManyToOne 어노테이션 전체 검색
rg -C3 "@ManyToOne" --type javaLength of output: 1104 Member 관계에 대한 cascade 삭제 설정 추가 필요 🤖 Prompt for AI Agents |
||
|
|
||
| String accessToken = jwtUtil.extractAccessToken(request) | ||
| .orElseThrow(() -> new CustomAuthenticationException(ErrorCode.SECURITY_INVALID_ACCESS_TOKEN)); | ||
| if (accessToken != null) { | ||
| jwtService.invalidAccessToken(accessToken); // Redis에 blacklist 저장 | ||
| } | ||
|
|
||
| SecurityContextHolder.clearContext(); | ||
| } | ||
|
Comment on lines
+181
to
+194
There was a problem hiding this comment. 🛠️ Refactor suggestion | 🟠 Major 🧩 Analysis chain회원 탈퇴 로직에 트랜잭션 처리 및 순서 개선 필요 현재 구현에는 몇 가지 개선이 필요한 부분이 있습니다:
다음과 같이 개선을 권장합니다: +@Transactional
public void deleteAccount (HttpServletRequest request, Long userId) {
User user = userRepository.findById(userId)
.orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
- userRepository.delete(user);
-
String accessToken = jwtUtil.extractAccessToken(request)
.orElseThrow(() -> new CustomAuthenticationException(ErrorCode.SECURITY_INVALID_ACCESS_TOKEN));
- if (accessToken != null) {
- jwtService.invalidAccessToken(accessToken); // Redis에 blacklist 저장
- }
+ jwtService.invalidAccessToken(accessToken); // Redis에 blacklist 저장
+
+ userRepository.delete(user);
SecurityContextHolder.clearContext();
}Member 엔티티의 cascade 설정을 확인하려면 다음 스크립트를 실행하세요: 🏁 Script executed: #!/bin/bash
# Member 엔티티에서 User와의 관계 설정 확인
ast-grep --pattern $'@ManyToOne$$$
User $$$'
# User 엔티티에서 Member와의 관계 cascade 설정 확인
ast-grep --pattern $'@OneToMany$$$
cascade$$$
Member$$$'Length of output: 0 🏁 Script executed: #!/bin/bash
# User 엔티티의 @OneToMany에서 Member와 cascade 옵션 확인
rg -nP --type java '@OneToMany\s*\([^)]*cascade\s*=\s*[^)]*\)' -C2
# Member 엔티티의 @ManyToOne에서 User 참조 확인
rg -nP --type java '@ManyToOne\s*\([^)]*\)\s*private\s+User' -C2Length of output: 0 🏁 Script executed: #!/bin/bash
# 엔티티 파일 위치 확인
user_file=$(fd -e java User.java | head -n1)
member_file=$(fd -e java Member.java | head -n1)
echo ">>> User 엔티티: $user_file"
grep -n "@OneToMany" -C2 "$user_file"
echo ">>> Member 엔티티: $member_file"
grep -n "@ManyToOne" -C2 "$member_file"Length of output: 449 삭제 로직 수정: 트랜잭션·순서·null·cascade 처리
🤖 Prompt for AI Agents계정 삭제 로직에 여러 개선이 필요합니다. 다음 사항들을 검토해주세요:
다음과 같이 리팩토링을 권장합니다: +@Transactional
public void deleteAccount (HttpServletRequest request, Long userId) {
+ // 1. 토큰 검증 먼저 수행
+ String accessToken = jwtUtil.extractAccessToken(request)
+ .orElseThrow(() -> new CustomAuthenticationException(ErrorCode.SECURITY_INVALID_ACCESS_TOKEN));
+
+ // 2. 사용자 조회 및 삭제
User user = userRepository.findById(userId)
.orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
-
userRepository.delete(user);
-
- String accessToken = jwtUtil.extractAccessToken(request)
- .orElseThrow(() -> new CustomAuthenticationException(ErrorCode.SECURITY_INVALID_ACCESS_TOKEN));
- if (accessToken != null) {
- jwtService.invalidAccessToken(accessToken); // Redis에 blacklist 저장
- }
-
+
+ // 3. 토큰 무효화
+ jwtService.invalidAccessToken(accessToken);
+
+ // 4. Refresh token도 삭제 (userId로 조회하여 삭제하는 메서드 필요)
+ // jwtService.deleteRefreshTokenByUserId(userId);
+
+ // 5. Security Context 정리
SecurityContextHolder.clearContext();
}참고: Refresh token 삭제를 위해 JwtService에 userId 기반 삭제 메서드 추가가 필요할 수 있습니다. 🤖 Prompt for AI Agents |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,26 @@ | ||||||||||||||||||||||||||||||||||||||||||||||
| package com.WhoIsRoom.WhoIs_Server.global.common.redis; | ||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||
| import jakarta.annotation.PostConstruct; | ||||||||||||||||||||||||||||||||||||||||||||||
| import lombok.RequiredArgsConstructor; | ||||||||||||||||||||||||||||||||||||||||||||||
| import lombok.extern.slf4j.Slf4j; | ||||||||||||||||||||||||||||||||||||||||||||||
| import org.springframework.context.annotation.Profile; | ||||||||||||||||||||||||||||||||||||||||||||||
| import org.springframework.data.redis.core.RedisTemplate; | ||||||||||||||||||||||||||||||||||||||||||||||
| import org.springframework.stereotype.Component; | ||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||
| @Slf4j | ||||||||||||||||||||||||||||||||||||||||||||||
| @Component | ||||||||||||||||||||||||||||||||||||||||||||||
| @Profile("local") | ||||||||||||||||||||||||||||||||||||||||||||||
| @RequiredArgsConstructor | ||||||||||||||||||||||||||||||||||||||||||||||
| public class RedisInitializer { | ||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||
| private final RedisTemplate<String,String> redisTemplate; | ||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||
| @PostConstruct | ||||||||||||||||||||||||||||||||||||||||||||||
| public void clearRedis() { | ||||||||||||||||||||||||||||||||||||||||||||||
| redisTemplate.getConnectionFactory() | ||||||||||||||||||||||||||||||||||||||||||||||
| .getConnection() | ||||||||||||||||||||||||||||||||||||||||||||||
| .flushDb(); // 선택한 DB(예: database: 0)만 초기화 | ||||||||||||||||||||||||||||||||||||||||||||||
| log.info("✅ Redis DB 초기화 완료"); | ||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+18
to
+24
There was a problem hiding this comment. 연결 자원 해제를 추가해주세요.
-import jakarta.annotation.PostConstruct;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Profile;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
@@
@PostConstruct
public void clearRedis() {
- redisTemplate.getConnectionFactory()
- .getConnection()
- .flushDb(); // 선택한 DB(예: database: 0)만 초기화
+ try (RedisConnection connection = redisTemplate.getConnectionFactory().getConnection()) {
+ connection.flushDb(); // 선택한 DB(예: database: 0)만 초기화
+ }
log.info("✅ Redis DB 초기화 완료");
}📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
authToken이 null일 때 NPE 발생합니다.providerId가"localhost"가 아니면authToken은 끝까지 null이고, 곧바로authToken.getAuthorities()로깅에서NullPointerException이 터집니다. 실제 서비스(소셜 로그인 등)에서 곧바로 장애가 나니 null 가드를 추가하거나 기본 토큰을 생성하도록 수정이 필요합니다.📝 Committable suggestion
🤖 Prompt for AI Agents