Skip to content
Merged
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ out/
.vscode/

### Application Files ###
application.properties
application.properties

.DS_Store
15 changes: 7 additions & 8 deletions src/main/java/com/example/prdoit/controller/UserController.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,17 @@ public ResponseEntity<Object> checkNickname(@PathVariable String userNickname){
return ResponseEntity.badRequest().body(e.getMessage());
}
}
/*

@PostMapping("/login")
public ResponseEntity<Object> login(@RequestBody LoginDto loginDto){
log.info("[login] 로그인 로직 시작");
public ResponseEntity<Object> login(@RequestBody LoginDto loginDto) {
log.info("[login] 로그인 시도 - ID: {}", loginDto.getUserId());

try{
userService.signIn(loginDto.getUserId(), loginDto.getPassword());
return ResponseEntity.ok().body("로그인 성공");
try {
userService.login(loginDto.getUserId(), loginDto.getPassword());
return ResponseEntity.ok("로그인 성공");
} catch (CustomException e) {
log.error("[login] 로그인 실패");
log.error("[login] 로그인 실패 - 이유: {}", e.getMessage());
return ResponseEntity.badRequest().body(e.getMessage());
}
}
*/
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public interface UserService {

void checkNickname(String nickname);

void signIn(String userId, String password);
void login(String userId, String password);

}
23 changes: 16 additions & 7 deletions src/main/java/com/example/prdoit/service/user/UserServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,24 @@ public void checkNickname(String nickname) {
}

@Override
public void signIn(String userId, String password){
log.info("[signIn] 로그인 로직 시작");
public void login(String userId, String password) {
log.info("[login] 로그인 시도 - ID: {}", userId);

IdTable findUser = idTableRepository.findById(userId).orElseThrow(() -> new CustomException("존재하지 않는 아이디입니다."));
Optional<IdTable> findUser = idTableRepository.findById(userId);

if(!passwordEncoder.matches(password, findUser.getPassword())){
log.info("[signIn] 비밀번호 불일치");
throw new CustomException("비밀번호가 일치하지 않습니다.");
if (findUser.isEmpty()) {
log.info("[login] 아이디 없음");
throw new CustomException("아이디 또는 비밀번호가 잘못되었습니다.");
}
}

IdTable user = findUser.get();

// 비밀번호 맞나 안맞나
if (!passwordEncoder.matches(password, user.getPassword())) {
log.info("[login] 비밀번호 불일치");
throw new CustomException("아이디 또는 비밀번호가 잘못되었습니다.");
}

log.info("[login] 로그인 성공 - ID: {}", userId);
}
}