Merge pull request #112 from Happy-HOBAK/feat/#111

[#111] 로그인 응답에 유저 이름도 포함하도록 수정

src/main/java/com/hobak/happinessql/domain/user/api/UserController.java

@@ -33,17 +33,17 @@ public class UserController {
     @NonNull
     private PasswordEncoder passwordEncoder;
     @GetMapping("/profile")
-    public DataResponseDto<Object> getUserInfo(@AuthenticationPrincipal UserDetails userDetails) {
+    public DataResponseDto<Object> getUserProfile(@AuthenticationPrincipal UserDetails userDetails) {
         User user = userFindService.findByUserDetails(userDetails);
-        UserInfoResponseDto userInfoResponseDto = UserConverter.toUserInfoResponseDto(user);
-        return DataResponseDto.of(userInfoResponseDto, "유저 프로필을 성공적으로 조회했습니다.");
+        UserProfileResponseDto userProfileResponseDto = UserConverter.toUserProfileResponseDto(user);
+        return DataResponseDto.of(userProfileResponseDto, "유저 프로필을 성공적으로 조회했습니다.");
     }
 
     @PutMapping("/profile")
-    public DataResponseDto<Object> updateUserInfo(@RequestBody @Valid UserProfileUpdateRequestDto requestDto, @AuthenticationPrincipal UserDetails userDetails) {
+    public DataResponseDto<Object> updateUserProfile(@RequestBody @Valid UserProfileUpdateRequestDto requestDto, @AuthenticationPrincipal UserDetails userDetails) {
         User user = userFindService.findByUserDetails(userDetails);
         User updatedUser = userProfileService.updateUserProfile(user, requestDto);
-        UserInfoResponseDto responseDto = UserConverter.toUserInfoResponseDto(updatedUser);
+        UserProfileResponseDto responseDto = UserConverter.toUserProfileResponseDto(updatedUser);
 
         return DataResponseDto.of(responseDto, "유저 프로필을 성공적으로 수정했습니다.");
     }

src/main/java/com/hobak/happinessql/domain/user/converter/UserConverter.java

@@ -3,13 +3,13 @@
 import com.hobak.happinessql.domain.user.domain.User;
 import com.hobak.happinessql.domain.user.dto.SignUpDto;
 import com.hobak.happinessql.domain.user.dto.UserDto;
-import com.hobak.happinessql.domain.user.dto.UserInfoResponseDto;
+import com.hobak.happinessql.domain.user.dto.UserProfileResponseDto;
 import org.springframework.security.core.userdetails.UserDetails;
 import java.util.List;
 
 public class UserConverter {
-    public static UserInfoResponseDto toUserInfoResponseDto(User user) {
-        return UserInfoResponseDto.builder()
+    public static UserProfileResponseDto toUserProfileResponseDto(User user) {
+        return UserProfileResponseDto.builder()
                 .userId(user.getUserId())
                 .name(user.getName())
                 .age(user.getAge())

src/main/java/com/hobak/happinessql/domain/user/dto/UserInfoResponseDto.java → src/main/java/com/hobak/happinessql/domain/user/dto/UserProfileResponseDto.java

@@ -9,7 +9,7 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class UserInfoResponseDto {
+public class UserProfileResponseDto {
 
     private Long userId;
 
@@ -20,7 +20,7 @@ public class UserInfoResponseDto {
     private int age;
 
     @Builder
-    public UserInfoResponseDto(Long userId, String name, Gender gender, int age) {
+    public UserProfileResponseDto(Long userId, String name, Gender gender, int age) {
         this.userId = userId;
         this.name = name;
         this.gender = gender;

src/main/java/com/hobak/happinessql/global/auth/JwtToken.java

@@ -11,4 +11,5 @@ public class JwtToken {
     private String grantType;
     private String accessToken;
     private String refreshToken;
+    private String name;
 }

src/main/java/com/hobak/happinessql/global/auth/JwtTokenProvider.java

@@ -9,6 +9,7 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 import java.security.Key;
@@ -20,10 +21,12 @@
 public class JwtTokenProvider {
     private final Key key;
     private final CustomUserDetailsService customUserDetailsService;
-    public JwtTokenProvider(@Value("${jwt.secret}")String secretKey, CustomUserDetailsService customUserDetailsService){
+    private final UserFindService userFindService;
+    public JwtTokenProvider(@Value("${jwt.secret}")String secretKey, CustomUserDetailsService customUserDetailsService, UserFindService userFindService){
         byte[] keyBytes = Decoders.BASE64.decode(secretKey);
         this.key = Keys.hmacShaKeyFor(keyBytes);
         this.customUserDetailsService = customUserDetailsService;
+        this.userFindService = userFindService;
     }
     // Member 정보를 가지고 AccessToken, RefreshToken을 생성하는 메서드
     public JwtToken generateToken(Authentication authentication) {
@@ -49,10 +52,15 @@ public JwtToken generateToken(Authentication authentication) {
                 .signWith(key, SignatureAlgorithm.HS256)
                 .compact();
 
+        // CustomUserDetails 객체에서 name 가져오기
+        User userDetails = (User) authentication.getPrincipal();
+        String name = userFindService.findByUserDetails(userDetails).getName();
+
         return JwtToken.builder()
                 .grantType("Bearer")
                 .accessToken(accessToken)
                 .refreshToken(refreshToken)
+                .name(name)
                 .build();
     }