diff --git a/k8s/helm-value.yaml b/k8s/helm-value.yaml index 543caac..b8b8d13 100644 --- a/k8s/helm-value.yaml +++ b/k8s/helm-value.yaml @@ -1,5 +1,5 @@ image: - tag: v0.1.9 + tag: v0.1.10 env: JWT_ACCESS_TOKEN_EXPIRATION: "1800000" JWT_REFRESH_TOKEN_EXPIRATION: "1209600000" \ No newline at end of file diff --git a/src/main/java/com/earseo/member/common/exception/MemberErrorCode.java b/src/main/java/com/earseo/member/common/exception/MemberErrorCode.java index af111cc..68d83cd 100644 --- a/src/main/java/com/earseo/member/common/exception/MemberErrorCode.java +++ b/src/main/java/com/earseo/member/common/exception/MemberErrorCode.java @@ -20,7 +20,8 @@ public enum MemberErrorCode implements ErrorCodeInterface { EMAIL_SEND_FAILED("MEM010", "이메일 발송에 실패했습니다.", HttpStatus.INTERNAL_SERVER_ERROR), INVALID_VERIFICATION_CODE("MEM011", "유효하지 않은 인증코드입니다.", HttpStatus.BAD_REQUEST), VERIFICATION_CODE_EXPIRED("MEM012", "인증코드가 만료되었습니다.", HttpStatus.BAD_REQUEST), - EMAIL_NOT_VERIFIED("MEM013", "이메일 인증이 완료되지 않았습니다.", HttpStatus.BAD_REQUEST); + EMAIL_NOT_VERIFIED("MEM013", "이메일 인증이 완료되지 않았습니다.", HttpStatus.BAD_REQUEST), + SAME_AS_CURRENT_PASSWORD( "MEM014", "기존 비밀번호와 동일한 비밀번호는 사용할 수 없습니다.", HttpStatus.BAD_REQUEST); private final String status; private final String message; diff --git a/src/main/java/com/earseo/member/service/AuthService.java b/src/main/java/com/earseo/member/service/AuthService.java index db84c72..59fa5c9 100644 --- a/src/main/java/com/earseo/member/service/AuthService.java +++ b/src/main/java/com/earseo/member/service/AuthService.java @@ -324,6 +324,10 @@ public void resetPassword(PasswordResetRequestDto request) { Member member = memberRepository.findByEmailAndProvider(request.email(), Provider.LOCAL) .orElseThrow(() -> new BaseException(MemberErrorCode.MEMBER_NOT_FOUND)); + if (passwordEncoder.matches(request.newPassword(), member.getPassword())) { + throw new BaseException(MemberErrorCode.SAME_AS_CURRENT_PASSWORD); + } + member.updatePassword(passwordEncoder.encode(request.newPassword())); memberRepository.save(member);