Skip to content

TT-471 삭제 유저 처리 #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dduqqo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

TT-471 삭제 유저 처리 #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/twentythree/peech/security/exception/LoginExceptionCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ public enum LoginExceptionCode{
LOGIN_EXCEPTION_CODE(HttpStatus.UNAUTHORIZED, "유효하지않은 토큰입니다."),
SIGNUP_FINISHED_NOT_YET(HttpStatus.LENGTH_REQUIRED, "아직 가입이 완료되지 않았습니다."),
ACCESS_TOKEN_EXPIRED(HttpStatus.GONE, "access 토큰이 만료되었습니다. refresh 토큰으로 로그인 해주세요."),
REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "refresh 토큰이 만료되었습니다. 다시 로그인 해주세요.");
REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "refresh 토큰이 만료되었습니다. 다시 로그인 해주세요."),
NOT_EXIST_USER(HttpStatus.NOT_FOUND, "존재하지 않는 유저입니다.");


private final HttpStatus status;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/twentythree/peech/security/jwt/JWTUserDetailsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.twentythree.peech.user.entity.UserEntity;
import com.twentythree.peech.user.repository.UserRepository;
import com.twentythree.peech.user.value.SignUpFinished;
import com.twentythree.peech.user.value.UserStatus;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetailsService;
Expand Down Expand Up @@ -35,6 +36,10 @@ public JWTUserDetails loadUserByUsername(String username) throws UsernameNotFoun
String httpMethod = request.getMethod();
String uri = request.getRequestURI();

if (userEntity.getUserStatus() == UserStatus.DELETE) {
throw new JWTAuthenticationException(LoginExceptionCode.NOT_EXIST_USER);
}

// User가 Pending이면 에러 발생 단, 요청 request가 PATCH /api/v1/users/{userId} 일 경우에는 에러 발생하지 않음
if (userEntity.getSignUpFinished() == SignUpFinished.PENDING
&& !httpMethod.equals("PATCH") && !uri.contains("/api/v1/users/" + userId)) {
Expand Down