Skip to content
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.

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

비밀번호 변경 기능 추가 구현 #169

Merged
merged 4 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package freshtrash.freshtrashbackend.controller;

import freshtrash.freshtrashbackend.dto.request.ChangePasswordRequest;
import freshtrash.freshtrashbackend.dto.request.MemberRequest;
import freshtrash.freshtrashbackend.dto.response.MemberResponse;
import freshtrash.freshtrashbackend.dto.security.MemberPrincipal;
Expand All @@ -11,6 +12,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.validation.Valid;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/members")
Expand Down Expand Up @@ -42,4 +45,15 @@ public ResponseEntity<MemberResponse> updateMember(
fileService.deleteOrNotOldFile(oldFileName, memberResponse.fileName());
return ResponseEntity.ok(memberResponse);
}

/**
* 비밀번호 변경
*/
@PutMapping("/change-password")
public ResponseEntity<Void> changePassword(
@AuthenticationPrincipal MemberPrincipal memberPrincipal,
@RequestBody @Valid ChangePasswordRequest changePasswordRequest) {
memberService.changePassword(changePasswordRequest, memberPrincipal);
return ResponseEntity.ok(null);
}
}
JadeKim042386 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package freshtrash.freshtrashbackend.dto.request;

import javax.validation.constraints.Pattern;

public record ChangePasswordRequest(
@Pattern(
regexp = "(?=.*[0-9])(?=.*[a-z])(?=.*\\W)(?=\\S+$).{8,20}",
message = "비밀번호는 영문자와 숫자, 특수기호가 적어도 1개 이상 포함된 8자~20자의 비밀번호여야 합니다.")
String oldPassword,
@Pattern(
regexp = "(?=.*[0-9])(?=.*[a-z])(?=.*\\W)(?=\\S+$).{8,20}",
message = "비밀번호는 영문자와 숫자, 특수기호가 적어도 1개 이상 포함된 8자~20자의 비밀번호여야 합니다.")
String newPassword) {}
JadeKim042386 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public enum ErrorCode {
NOT_FOUND_MEMBER(HttpStatus.NOT_FOUND, "유저 정보가 존재하지 않습니다."),
ALREADY_EXISTS_EMAIL(HttpStatus.BAD_REQUEST, "이미 존재하는 이메일입니다."),
ALREADY_EXISTS_NICKNAME(HttpStatus.BAD_REQUEST, "이미 존재하는 닉네임입니다."),
UNMATCHED_PASSWORD(HttpStatus.BAD_REQUEST, "비밀번호가 일치하지 않습니다."),

// Alarm
ALARM_CONNECT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "알람을 위한 연결 시도 실패"),
JadeKim042386 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
""")
void updateFlagCount(Long memberId, int flagLimit);

@Query(nativeQuery = true, value = "update members m set m.user_role = ?2 where m.id = ?1")
void updateUserRoleById(Long targetMemberId, UserRole userRole);
@Query(nativeQuery = true, value = "update members m set m.password = ?2 where m.email = ?1")
void updatePasswordByEmail(String email, String encodedPassword);
}
JadeKim042386 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package freshtrash.freshtrashbackend.service;

import freshtrash.freshtrashbackend.dto.request.ChangePasswordRequest;
import freshtrash.freshtrashbackend.dto.request.MemberRequest;
import freshtrash.freshtrashbackend.dto.response.LoginResponse;
import freshtrash.freshtrashbackend.dto.security.MemberPrincipal;
Expand All @@ -14,13 +15,15 @@
import freshtrash.freshtrashbackend.security.TokenProvider;
import freshtrash.freshtrashbackend.utils.FileUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.Objects;

@Slf4j
@Service
@RequiredArgsConstructor
public class MemberService {
Expand Down Expand Up @@ -136,10 +139,18 @@ public FlagCountSummary updateFlagCount(Long memberId, int flagLimit) {
.orElseThrow(() -> new MemberException(ErrorCode.NOT_FOUND_MEMBER));
}

public void updatePassword(String email, String temporaryPassword) {
Member member = getMemberByEmail(email);
member.setPassword(encoder.encode(temporaryPassword));
memberRepository.save(member);
public void updatePassword(String email, String newPassword) {
memberRepository.updatePasswordByEmail(email, encoder.encode(newPassword));
}

public void changePassword(ChangePasswordRequest changePasswordRequest, MemberPrincipal memberPrincipal) {
// 이전 비밀번호 일치 여부 확인
if (!encoder.matches(changePasswordRequest.oldPassword(), memberPrincipal.password())) {
log.warn("기존 비밀번호가 일치하지 않습니다.");
throw new MemberException(ErrorCode.UNMATCHED_PASSWORD);
}
// 비밀번호 변경
updatePassword(memberPrincipal.email(), changePasswordRequest.newPassword());
}

/**
JadeKim042386 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down