Skip to content

Commit

Permalink
SCRUM-105 비밀번호 암호화 matches 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
KSJ0128 committed Jul 23, 2024
1 parent ec2eda4 commit 7cfc333
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PatchMapping;
Expand All @@ -32,7 +33,7 @@ public class MemberController {
private final MemberService memberService;
private final MemberRepository memberRepository;
private final StatService statService;
private final RankingService rankingService;
private final PasswordEncoder passwordEncoder;

// 이메일 찾기 api
@PostMapping("/find-email")
Expand Down Expand Up @@ -110,7 +111,7 @@ public ResponseEntity<PostSignInRes> sign_in(@RequestBody PostSignInReq postSign
Member member = memberRepository.findMemberByEmail(postSignInReq.getEmail());

// 유효하지 않은 로그인 요청인 경우
if (member == null || memberService.equalEncodePassword(member.getPasswd(), postSignInReq.getPasswd()))
if (member == null || !passwordEncoder.matches(postSignInReq.getPasswd(), member.getPasswd())) // 순서 중요
return ResponseEntity.status(HttpStatus.OK).body(null);

MemberRes memberRes = MemberRes.builder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public MemberRes save(MemberJoinReq memberSave) {

Ranking ranking = Ranking.builder().build();

System.out.println("비밀번호 일치?");
Member member = Member.builder()
.realName(memberSave.getRealName())
.nickname(memberSave.getNickname())
Expand Down

0 comments on commit 7cfc333

Please sign in to comment.