diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserController.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserController.java index 4e903dde..26518d6f 100644 --- a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserController.java +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserController.java @@ -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; @@ -24,7 +25,7 @@ public class UserController implements UserControllerDocs { @Override @PostMapping("api/v1/user/login") - public ResponseEntity login( + public ResponseEntity login( @RequestParam final String authorizationCode, @RequestBody final UserLoginRequest loginRequest ) { @@ -33,7 +34,7 @@ public ResponseEntity login( @Override @GetMapping("api/v1/user/token-refresh") - public ResponseEntity refreshToken( + public ResponseEntity refreshToken( @RequestParam final String token ) { return ResponseEntity.ok().body(userService.refreshToken(token)); @@ -41,12 +42,11 @@ public ResponseEntity refreshToken( @Override @PatchMapping("api/v1/user/profile") - public ResponseEntity updateNickname ( + public ResponseEntity 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)); } } diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserControllerDocs.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserControllerDocs.java index a40d32da..dc34eb17 100644 --- a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserControllerDocs.java +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/controller/UserControllerDocs.java @@ -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; @@ -29,7 +30,7 @@ public interface UserControllerDocs { @ApiResponse(responseCode = "A40104", description = "해당 유저의 리프레시 토큰이 존재하지 않습니다.") } ) - ResponseEntity login( + ResponseEntity login( @RequestParam final String authorizationCode, @RequestBody final UserLoginRequest loginRequest ); @@ -43,7 +44,7 @@ ResponseEntity login( @ApiResponse(responseCode = "A50000", description = "서버 내부 오류입니다.") } ) - ResponseEntity refreshToken( + ResponseEntity refreshToken( @RequestParam final String refreshToken ); @@ -54,7 +55,7 @@ ResponseEntity refreshToken( @ApiResponse(responseCode = "400", description = "이미 존재하는 닉네임입니다."), } ) - ResponseEntity updateNickname ( + ResponseEntity updateNickname ( @RequestBody final UpdateNicknameRequest request, Principal principal ); diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/AccessTokenGetSuccess.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/GetAccessTokenResponse.java similarity index 50% rename from src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/AccessTokenGetSuccess.java rename to src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/GetAccessTokenResponse.java index c896d65a..7eec2370 100644 --- a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/AccessTokenGetSuccess.java +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/GetAccessTokenResponse.java @@ -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); } } \ No newline at end of file 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/LoginResponse.java similarity index 58% rename from src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/LoginSuccessResponse.java rename to src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/LoginResponse.java index 06c6b6b6..f8c170f1 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/LoginResponse.java @@ -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); } } \ No newline at end of file diff --git a/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/UpdateNicknameResponse.java b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/UpdateNicknameResponse.java new file mode 100644 index 00000000..5d9a7696 --- /dev/null +++ b/src/backend/auth_server/src/main/java/com/jootalkpia/auth_server/user/dto/response/UpdateNicknameResponse.java @@ -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); + } +} 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 b026f2c6..7a236d3d 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 @@ -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; @@ -29,7 +30,7 @@ public class UserService { private final TokenService tokenService; private final KakaoSocialService kakaoSocialService; - public LoginSuccessResponse create( + public LoginResponse create( final String authorizationCode, final UserLoginRequest loginRequest ) { @@ -37,7 +38,7 @@ public LoginSuccessResponse create( 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( @@ -89,7 +90,7 @@ public TokenDto getTokenByUserId( ); } - public AccessTokenGetSuccess refreshToken( + public GetAccessTokenResponse refreshToken( final String refreshToken ) { if (jwtTokenProvider.validateToken(refreshToken) == EXPIRED_JWT_TOKEN) { @@ -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 ) { @@ -124,6 +125,8 @@ public void updateNickname( } user.updateNickname(nickname); + + return UpdateNicknameResponse.of(user.getUserId(),user.getNickname(),user.getProfileImage()); } private TokenDto getTokenDto(