From be38d07147bebe92b6daa1bc2d4ad2f9cd702595 Mon Sep 17 00:00:00 2001
From: kkj6235 <kkj6235@ajou.ac.kr>
Date: Wed, 22 Nov 2023 19:20:34 +0900
Subject: [PATCH] feat: Added userid and username fields to userInfoDto
---
src/main/java/umc/spring/post/controller/AuthController.java | 5 -----
src/main/java/umc/spring/post/data/dto/UserInfoDto.java | 2 ++
src/main/java/umc/spring/post/service/AuthServiceImpl.java | 5 +++++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/umc/spring/post/controller/AuthController.java b/src/main/java/umc/spring/post/controller/AuthController.java
index b66db9f..0882508 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 17dab7c..ee38d4e 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 1188c31..cb5c1f4 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;
}
--
GitLab