diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/LoginSuccessResponse.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/LoginSuccessResponse.java index 7d7e5698..06c6b6b6 100644 --- a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/LoginSuccessResponse.java +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/LoginSuccessResponse.java @@ -2,17 +2,14 @@ public record LoginSuccessResponse( - Long userId, - - String nickname, + UserDto user, TokenDto token ) { public static LoginSuccessResponse of( - final String nickname, - final Long userId, + final UserDto user, final TokenDto token ) { - return new LoginSuccessResponse(userId, nickname, token); + return new LoginSuccessResponse(user, token); } } \ No newline at end of file diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/TokenDto.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/TokenDto.java index 41fed5fd..be801011 100644 --- a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/TokenDto.java +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/TokenDto.java @@ -6,7 +6,6 @@ public record TokenDto( String refreshToken ) { - public static TokenDto of(String accessToken, String refreshToken) { return new TokenDto(accessToken, refreshToken); } diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/UserDto.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/UserDto.java new file mode 100644 index 00000000..e4f827bb --- /dev/null +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/UserDto.java @@ -0,0 +1,14 @@ +package com.jootalkpia.auth_server.user.dto.response; + +public record UserDto( + + Long userId, + + String nickname, + + String profileImage +) { + public static UserDto of(Long userId, String nickname, String profileImage) { + return new UserDto(userId, nickname, profileImage); + } +} diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/service/UserService.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/service/UserService.java index 437963a2..b026f2c6 100644 --- a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/service/UserService.java +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/service/UserService.java @@ -15,6 +15,7 @@ import com.jootalkpia.auth_server.user.dto.response.AccessTokenGetSuccess; import com.jootalkpia.auth_server.user.dto.response.LoginSuccessResponse; import com.jootalkpia.auth_server.user.dto.response.TokenDto; +import com.jootalkpia.auth_server.user.dto.response.UserDto; import com.jootalkpia.auth_server.user.repository.UserRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; @@ -33,10 +34,10 @@ public LoginSuccessResponse create( final UserLoginRequest loginRequest ) { User user = getUser(getUserInfoResponse(authorizationCode, loginRequest)); - + UserDto userDto = UserDto.of(user.getUserId(), user.getNickname(),user.getProfileImage()); TokenDto tokenDto = getTokenDto(user); - return LoginSuccessResponse.of(user.getNickname(), user.getUserId(), tokenDto); + return LoginSuccessResponse.of(userDto, tokenDto); } public UserInfoResponse getUserInfoResponse(