From d80f1f3913b286c264c20219e65816a78c10cbab Mon Sep 17 00:00:00 2001
From: kkj6235 <kkj6235@ajou.ac.kr>
Date: Wed, 22 Nov 2023 13:00:25 +0900
Subject: [PATCH] refactor: Update field names in User entity and related DTOs
---
.../umc/spring/post/config/security/SecurityUtil.java | 2 +-
.../umc/spring/post/controller/AuthController.java | 4 ++++
.../java/umc/spring/post/data/dto/UserInfoDto.java | 2 +-
.../java/umc/spring/post/data/dto/UserJoinDto.java | 2 +-
.../java/umc/spring/post/data/dto/UserLoginDto.java | 2 +-
src/main/java/umc/spring/post/data/entity/User.java | 2 +-
.../umc/spring/post/repository/UserRepository.java | 2 +-
.../java/umc/spring/post/service/AuthServiceImpl.java | 10 +++++-----
8 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/umc/spring/post/config/security/SecurityUtil.java b/src/main/java/umc/spring/post/config/security/SecurityUtil.java
index 5577af3..6574930 100644
--- a/src/main/java/umc/spring/post/config/security/SecurityUtil.java
+++ b/src/main/java/umc/spring/post/config/security/SecurityUtil.java
@@ -14,7 +14,7 @@ public class SecurityUtil {
}
UserInfoDto userInfoDto = new UserInfoDto();
- userInfoDto.setUserId(authentication.getName());
+ userInfoDto.setLoginId(authentication.getName());
userInfoDto.setMemberRole(authentication.getAuthorities().stream().toList().get(0).toString().replaceAll("ROLE_", ""));
return userInfoDto;
diff --git a/src/main/java/umc/spring/post/controller/AuthController.java b/src/main/java/umc/spring/post/controller/AuthController.java
index 14fc05b..b66db9f 100644
--- a/src/main/java/umc/spring/post/controller/AuthController.java
+++ b/src/main/java/umc/spring/post/controller/AuthController.java
@@ -25,6 +25,10 @@ public class AuthController {
return authService.login(userLoginDto);
}
+ @PostMapping("/logout")
+ public TokenInfo logout(){
+ return null;
+ }
@PostMapping("/register")
public void register(@RequestBody UserJoinDto userJoinDto) {
authService.join(userJoinDto);
diff --git a/src/main/java/umc/spring/post/data/dto/UserInfoDto.java b/src/main/java/umc/spring/post/data/dto/UserInfoDto.java
index bd96f34..17dab7c 100644
--- a/src/main/java/umc/spring/post/data/dto/UserInfoDto.java
+++ b/src/main/java/umc/spring/post/data/dto/UserInfoDto.java
@@ -8,7 +8,7 @@ import lombok.*;
@ToString
@Builder
public class UserInfoDto {
- private String userId;
+ private String loginId;
private String memberRole;
}
\ No newline at end of file
diff --git a/src/main/java/umc/spring/post/data/dto/UserJoinDto.java b/src/main/java/umc/spring/post/data/dto/UserJoinDto.java
index a6701bd..80c4c20 100644
--- a/src/main/java/umc/spring/post/data/dto/UserJoinDto.java
+++ b/src/main/java/umc/spring/post/data/dto/UserJoinDto.java
@@ -4,7 +4,7 @@ import lombok.Data;
@Data
public class UserJoinDto {
- private String userId;
+ private String loginId;
private String password;
private String userName;
}
\ No newline at end of file
diff --git a/src/main/java/umc/spring/post/data/dto/UserLoginDto.java b/src/main/java/umc/spring/post/data/dto/UserLoginDto.java
index 24d523d..a401057 100644
--- a/src/main/java/umc/spring/post/data/dto/UserLoginDto.java
+++ b/src/main/java/umc/spring/post/data/dto/UserLoginDto.java
@@ -4,6 +4,6 @@ import lombok.Data;
@Data
public class UserLoginDto {
- String userId;
+ String loginId;
String password;
}
diff --git a/src/main/java/umc/spring/post/data/entity/User.java b/src/main/java/umc/spring/post/data/entity/User.java
index 188308b..18d753b 100644
--- a/src/main/java/umc/spring/post/data/entity/User.java
+++ b/src/main/java/umc/spring/post/data/entity/User.java
@@ -26,7 +26,7 @@ public class User implements UserDetails {
private Long id;
@Column(nullable = false)
- private String userId;
+ private String loginId;
@Column(nullable = false)
private String password;
diff --git a/src/main/java/umc/spring/post/repository/UserRepository.java b/src/main/java/umc/spring/post/repository/UserRepository.java
index 870af44..9759c0b 100644
--- a/src/main/java/umc/spring/post/repository/UserRepository.java
+++ b/src/main/java/umc/spring/post/repository/UserRepository.java
@@ -6,5 +6,5 @@ import umc.spring.post.data.entity.User;
import java.util.Optional;
public interface UserRepository extends JpaRepository<User, Long> {
- Optional<User> findByUserId(String userId);
+ Optional<User> findByLoginId(String loginId);
}
diff --git a/src/main/java/umc/spring/post/service/AuthServiceImpl.java b/src/main/java/umc/spring/post/service/AuthServiceImpl.java
index 1880a4e..1188c31 100644
--- a/src/main/java/umc/spring/post/service/AuthServiceImpl.java
+++ b/src/main/java/umc/spring/post/service/AuthServiceImpl.java
@@ -44,15 +44,15 @@ public class AuthServiceImpl implements AuthService, UserDetailsService {
@Override
public TokenInfo login(UserLoginDto userLoginDto) {
- User user = userRepository.findByUserId(userLoginDto.getUserId()).orElseThrow(() -> new UsernameNotFoundException("아이디 혹은 비밀번호를 확인하세요."));
+ User user = userRepository.findByLoginId(userLoginDto.getLoginId()).orElseThrow(() -> new UsernameNotFoundException("아이디 혹은 비밀번호를 확인하세요."));
boolean matches = passwordEncoder.matches(userLoginDto.getPassword(), user.getPassword());
if (!matches) throw new BadCredentialsException("아이디 혹은 비밀번호를 확인하세요.");
- Authentication authentication = new UsernamePasswordAuthenticationToken(user.getUserId(), user.getPassword(), user.getAuthorities());
+ Authentication authentication = new UsernamePasswordAuthenticationToken(user.getLoginId(), user.getPassword(), user.getAuthorities());
TokenInfo tokenInfo = jwtTokenProvider.generateToken(authentication);
- tokenInfo.setEmail(user.getUserId());
+ tokenInfo.setEmail(user.getLoginId());
tokenInfo.setMemberRole(user.getRole().toString());
return tokenInfo;
@@ -61,7 +61,7 @@ public class AuthServiceImpl implements AuthService, UserDetailsService {
@Override
public void join(UserJoinDto userJoinDto) {
User user = new User();
- user.setUserId(userJoinDto.getUserId());
+ user.setLoginId(userJoinDto.getLoginId());
user.setPassword(passwordEncoder.encode(userJoinDto.getPassword()));
user.setUserName(userJoinDto.getUserName());
userRepository.save(user);
@@ -75,7 +75,7 @@ public class AuthServiceImpl implements AuthService, UserDetailsService {
@Override
public UserDetails loadUserByUsername(String userId) throws UsernameNotFoundException {
- return userRepository.findByUserId(userId)
+ return userRepository.findByLoginId(userId)
.map(this::createUserDetails)
.orElseThrow(() -> new UsernameNotFoundException("해당하는 유저를 찾을 수 없습니다."));
}
--
GitLab