diff --git a/src/main/java/umc/spring/post/controller/AuthController.java b/src/main/java/umc/spring/post/controller/AuthController.java index b66db9fed4d97cecab526a94e505ca0f05c95e99..08825081e16dc3e5f03e1af023c8d1fe7200663e 100644 --- a/src/main/java/umc/spring/post/controller/AuthController.java +++ b/src/main/java/umc/spring/post/controller/AuthController.java @@ -24,11 +24,6 @@ public class AuthController { public TokenInfo login(@RequestBody UserLoginDto userLoginDto) { 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 17dab7cf52207adb91288c7dc0c0c6fa7bcc8fef..ee38d4eb83673e76a75fd3a2f869aafa6ed3c2b3 100644 --- a/src/main/java/umc/spring/post/data/dto/UserInfoDto.java +++ b/src/main/java/umc/spring/post/data/dto/UserInfoDto.java @@ -8,6 +8,8 @@ import lombok.*; @ToString @Builder public class UserInfoDto { + private Long id; + private String userName; private String loginId; private String memberRole; diff --git a/src/main/java/umc/spring/post/service/AuthServiceImpl.java b/src/main/java/umc/spring/post/service/AuthServiceImpl.java index 1188c311f75ca4a2a41de87dfb50bd9597a05d58..cb5c1f42bd3cea725e3bbe4239326abdffcf8ea7 100644 --- a/src/main/java/umc/spring/post/service/AuthServiceImpl.java +++ b/src/main/java/umc/spring/post/service/AuthServiceImpl.java @@ -23,6 +23,8 @@ import umc.spring.post.data.dto.UserJoinDto; import umc.spring.post.data.dto.UserLoginDto; import umc.spring.post.repository.UserRepository; +import java.util.Optional; + @Service public class AuthServiceImpl implements AuthService, UserDetailsService { @@ -70,6 +72,9 @@ public class AuthServiceImpl implements AuthService, UserDetailsService { @Override public UserInfoDto info() { UserInfoDto userInfoDto = SecurityUtil.getCurrentMemberId(); + User user = userRepository.findByLoginId(userInfoDto.getLoginId()).orElseThrow(); + userInfoDto.setUserName(user.getUsername()); + userInfoDto.setId(user.getId()); return userInfoDto; }