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,8 +2,9 @@

import com.jootalkpia.auth_server.client.dto.UserLoginRequest;
import com.jootalkpia.auth_server.user.dto.request.UpdateNicknameRequest;
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.GetAccessTokenResponse;
import com.jootalkpia.auth_server.user.dto.response.LoginResponse;
import com.jootalkpia.auth_server.user.dto.response.UpdateNicknameResponse;
import com.jootalkpia.auth_server.user.service.UserService;
import java.security.Principal;
import lombok.RequiredArgsConstructor;
Expand All @@ -24,7 +25,7 @@ public class UserController implements UserControllerDocs {

@Override
@PostMapping("api/v1/user/login")
public ResponseEntity<LoginSuccessResponse> login(
public ResponseEntity<LoginResponse> login(
@RequestParam final String authorizationCode,
@RequestBody final UserLoginRequest loginRequest
) {
Expand All @@ -33,20 +34,19 @@ public ResponseEntity<LoginSuccessResponse> login(

@Override
@GetMapping("api/v1/user/token-refresh")
public ResponseEntity<AccessTokenGetSuccess> refreshToken(
public ResponseEntity<GetAccessTokenResponse> refreshToken(
@RequestParam final String token
) {
return ResponseEntity.ok().body(userService.refreshToken(token));
}

@Override
@PatchMapping("api/v1/user/profile")
public ResponseEntity<String> updateNickname (
public ResponseEntity<UpdateNicknameResponse> updateNickname (
@RequestBody final UpdateNicknameRequest request,
Principal principal
) {
Long userId = Long.valueOf(principal.getName());//JootalkpiaAuthenticationContext.getUserInfo().userId();
userService.updateNickname(request.nickname(), userId);
return ResponseEntity.ok("닉네임 변경 성공");
return ResponseEntity.ok().body(userService.updateNickname(request.nickname(), userId));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

import com.jootalkpia.auth_server.client.dto.UserLoginRequest;
import com.jootalkpia.auth_server.user.dto.request.UpdateNicknameRequest;
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.GetAccessTokenResponse;
import com.jootalkpia.auth_server.user.dto.response.LoginResponse;
import com.jootalkpia.auth_server.user.dto.response.UpdateNicknameResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
Expand All @@ -29,7 +30,7 @@ public interface UserControllerDocs {
@ApiResponse(responseCode = "A40104", description = "해당 유저의 리프레시 토큰이 존재하지 않습니다.")
}
)
ResponseEntity<LoginSuccessResponse> login(
ResponseEntity<LoginResponse> login(
@RequestParam final String authorizationCode,
@RequestBody final UserLoginRequest loginRequest
);
Expand All @@ -43,7 +44,7 @@ ResponseEntity<LoginSuccessResponse> login(
@ApiResponse(responseCode = "A50000", description = "서버 내부 오류입니다.")
}
)
ResponseEntity<AccessTokenGetSuccess> refreshToken(
ResponseEntity<GetAccessTokenResponse> refreshToken(
@RequestParam final String refreshToken
);

Expand All @@ -54,7 +55,7 @@ ResponseEntity<AccessTokenGetSuccess> refreshToken(
@ApiResponse(responseCode = "400", description = "이미 존재하는 닉네임입니다."),
}
)
ResponseEntity<String> updateNickname (
ResponseEntity<UpdateNicknameResponse> updateNickname (
@RequestBody final UpdateNicknameRequest request,
Principal principal
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.jootalkpia.auth_server.user.dto.response;

public record AccessTokenGetSuccess(
public record GetAccessTokenResponse(

String accessToken
) {
public static AccessTokenGetSuccess of(
public static GetAccessTokenResponse of(
final String accessToken
) {
return new AccessTokenGetSuccess(accessToken);
return new GetAccessTokenResponse(accessToken);
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.jootalkpia.auth_server.user.dto.response;

public record LoginSuccessResponse(
public record LoginResponse(

UserDto user,

TokenDto token
) {
public static LoginSuccessResponse of(
public static LoginResponse of(
final UserDto user,
final TokenDto token
) {
return new LoginSuccessResponse(user, token);
return new LoginResponse(user, token);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.jootalkpia.auth_server.user.dto.response;

public record UpdateNicknameResponse(

Long userId,

String nickname,

String profileImage
) {
public static UpdateNicknameResponse of(Long userId, String nickname, String profileImage) {
return new UpdateNicknameResponse(userId, nickname, profileImage);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
import com.jootalkpia.auth_server.security.UserAuthentication;
import com.jootalkpia.auth_server.user.domain.Platform;
import com.jootalkpia.auth_server.user.domain.User;
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.GetAccessTokenResponse;
import com.jootalkpia.auth_server.user.dto.response.LoginResponse;
import com.jootalkpia.auth_server.user.dto.response.TokenDto;
import com.jootalkpia.auth_server.user.dto.response.UpdateNicknameResponse;
import com.jootalkpia.auth_server.user.dto.response.UserDto;
import com.jootalkpia.auth_server.user.repository.UserRepository;
import jakarta.transaction.Transactional;
Expand All @@ -29,15 +30,15 @@ public class UserService {
private final TokenService tokenService;
private final KakaoSocialService kakaoSocialService;

public LoginSuccessResponse create(
public LoginResponse create(
final String authorizationCode,
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(userDto, tokenDto);
return LoginResponse.of(userDto, tokenDto);
}

public UserInfoResponse getUserInfoResponse(
Expand Down Expand Up @@ -89,7 +90,7 @@ public TokenDto getTokenByUserId(
);
}

public AccessTokenGetSuccess refreshToken(
public GetAccessTokenResponse refreshToken(
final String refreshToken
) {
if (jwtTokenProvider.validateToken(refreshToken) == EXPIRED_JWT_TOKEN) {
Expand All @@ -107,13 +108,13 @@ public AccessTokenGetSuccess refreshToken(

UserAuthentication userAuthentication = new UserAuthentication(userId.toString(),null, null);

return AccessTokenGetSuccess.of(
return GetAccessTokenResponse.of(
jwtTokenProvider.issueAccessToken(userAuthentication)
);
}

@Transactional
public void updateNickname(
public UpdateNicknameResponse updateNickname(
String nickname,
Long userId
) {
Expand All @@ -124,6 +125,8 @@ public void updateNickname(
}

user.updateNickname(nickname);

return UpdateNicknameResponse.of(user.getUserId(),user.getNickname(),user.getProfileImage());
}

private TokenDto getTokenDto(
Expand Down