Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ public record TokenDto(

String refreshToken
) {

public static TokenDto of(String accessToken, String refreshToken) {
return new TokenDto(accessToken, refreshToken);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(
Expand Down
Loading