From 50da388807179be8378d3139fa4e1e8470188f61 Mon Sep 17 00:00:00 2001 From: Bae Hyeonseo Date: Sun, 10 Dec 2023 23:44:59 +0900 Subject: [PATCH] [fix] --- .../com/Nunbody/domain/member/service/MemberService.java | 5 +++-- .../global/config/auth/ExceptionHandlerFilter.java | 9 +++++++-- src/main/java/com/Nunbody/global/error/ErrorCode.java | 1 + src/main/java/com/Nunbody/jwt/ExceptionHandleFilter.java | 6 +++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/Nunbody/domain/member/service/MemberService.java b/src/main/java/com/Nunbody/domain/member/service/MemberService.java index 8c9248c..fe060ea 100644 --- a/src/main/java/com/Nunbody/domain/member/service/MemberService.java +++ b/src/main/java/com/Nunbody/domain/member/service/MemberService.java @@ -88,10 +88,11 @@ public void register(MemberRegisterRequestDto resource) { @Transactional public SignInResponseDto signIn (String account, String password){ - Member member = memberRepository.findByAccount(account).orElseThrow(() -> new InvalidEmailException("회원정보가 존재하지 않습니다.")); + Member member = memberRepository.findByAccount(account).orElseThrow(() -> new BusinessException + (NAME_ERROR)); if (!passwordEncoder.matches(password, member.getPassword())) { - throw new InvalidPasswordException("잘못된 비밀번호입니다."); + throw new BusinessException(NAME_ERROR); } TokenInfo tokenInfo = oAuthService.issueAccessTokenAndRefreshToken(member); member.updateRefreshToken(tokenInfo.getRefreshToken()); diff --git a/src/main/java/com/Nunbody/global/config/auth/ExceptionHandlerFilter.java b/src/main/java/com/Nunbody/global/config/auth/ExceptionHandlerFilter.java index cd50a6c..4a474ff 100644 --- a/src/main/java/com/Nunbody/global/config/auth/ExceptionHandlerFilter.java +++ b/src/main/java/com/Nunbody/global/config/auth/ExceptionHandlerFilter.java @@ -60,8 +60,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse ErrorCode.NAME_EXISTS_ERROR, request, response, "닉네임 중복.", "DEFAULT-ERROR-01" ); - } - handleException(response); + }else if(errorMessage.contains("잘못")){setErrorResponse( + HttpStatus.INTERNAL_SERVER_ERROR, + ErrorCode.NAME_ERROR, + request, response, "잘못.", "DEFAULT-ERROR-01" + );} + else{ + handleException(response);} } } diff --git a/src/main/java/com/Nunbody/global/error/ErrorCode.java b/src/main/java/com/Nunbody/global/error/ErrorCode.java index 1c1d338..6797c4a 100644 --- a/src/main/java/com/Nunbody/global/error/ErrorCode.java +++ b/src/main/java/com/Nunbody/global/error/ErrorCode.java @@ -20,6 +20,7 @@ public enum ErrorCode { EMAIL_EXISTS_ERROR(HttpStatus.BAD_REQUEST, "이미 존재하는 이메일입니다."), ACCOUNT_EXISTS_ERROR(HttpStatus.PRECONDITION_FAILED, "이미 존재하는 아이디입니다."), NAME_EXISTS_ERROR(HttpStatus.PAYLOAD_TOO_LARGE, "이미 존재하는 닉네임입니다."), + NAME_ERROR(HttpStatus.PAYLOAD_TOO_LARGE, "잘못"), INVALID_EMAIL_ERROR(HttpStatus.GONE, "존재하지 않는 이메일 정보입니다."), INVALID_PASSWORD_ERROR(HttpStatus.BAD_REQUEST, "비밀번호를 확인해주세요. 카카오 계정이라면 카카오 로그인으로 시도해주세요."), INVALID_ACCESS_TOKEN_ERROR(HttpStatus.BAD_REQUEST, "AccessToken 정보를 찾을 수 없습니다."), diff --git a/src/main/java/com/Nunbody/jwt/ExceptionHandleFilter.java b/src/main/java/com/Nunbody/jwt/ExceptionHandleFilter.java index 00f0a83..d1e42c2 100644 --- a/src/main/java/com/Nunbody/jwt/ExceptionHandleFilter.java +++ b/src/main/java/com/Nunbody/jwt/ExceptionHandleFilter.java @@ -71,7 +71,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse ErrorCode.NAME_EXISTS_ERROR, request, response, "닉네임 중복.", "DEFAULT-ERROR-01" ); - } + }else if(errorMessage.contains("잘못")){setErrorResponse( + HttpStatus.INTERNAL_SERVER_ERROR, + ErrorCode.NAME_ERROR, + request, response, "잘못.", "DEFAULT-ERROR-01" + );} } }