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 5577af306438c6b9ff3bd963cbb575b3d975a408..65749306d4ad2006852d68573d805c8ebbea9ddd 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 14fc05b92468625f866aed7ac081b21e3213d58e..b66db9fed4d97cecab526a94e505ca0f05c95e99 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 bd96f34f7c68f7c9f9595e0d584eb977508201b6..17dab7cf52207adb91288c7dc0c0c6fa7bcc8fef 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 a6701bdb5684ff513155523db1deb89f5f0c4f99..80c4c2035b39a12d5d4b85c5b25f495fc76f93e5 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 24d523d76942bef96ec20648f0dcffc5dd569848..a4010579a6115101669afa459d38e9e1341a6d59 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 188308b9f9a9777dd8b23a4b506ec7c9ea2a776e..18d753b28f8b151dac244b71655443287466742b 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 870af44442d65b4815c19c0c76d588da609ffc58..9759c0b75bb32c3eb1ed78469d30f2daa930c24b 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 1880a4e3ff792acdd8d845e39b59e764208f9e37..1188c311f75ca4a2a41de87dfb50bd9597a05d58 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("해당하는 유저를 찾을 수 없습니다.")); }