Skip to content

Commit c2e0e85

Browse files
committed
Ref: 로그인 API 수정
1 parent da65d32 commit c2e0e85

File tree

6 files changed

+960
-951
lines changed

6 files changed

+960
-951
lines changed

src/main/java/com/back/domain/user/controller/AuthController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.back.domain.user.controller;
22

33
import com.back.domain.user.dto.LoginRequest;
4+
import com.back.domain.user.dto.LoginResponse;
45
import com.back.domain.user.dto.UserRegisterRequest;
56
import com.back.domain.user.dto.UserResponse;
67
import com.back.domain.user.service.UserService;
@@ -40,11 +41,11 @@ public ResponseEntity<RsData<UserResponse>> register(
4041

4142
// 로그인
4243
@PostMapping("/login")
43-
public ResponseEntity<RsData<UserResponse>> login(
44+
public ResponseEntity<RsData<LoginResponse>> login(
4445
@Valid @RequestBody LoginRequest request,
4546
HttpServletResponse response
4647
) {
47-
UserResponse loginResponse = userService.login(request, response);
48+
LoginResponse loginResponse = userService.login(request, response);
4849
return ResponseEntity
4950
.ok(RsData.success(
5051
"로그인에 성공했습니다.",

src/main/java/com/back/domain/user/controller/AuthControllerDocs.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.back.domain.user.controller;
22

33
import com.back.domain.user.dto.LoginRequest;
4+
import com.back.domain.user.dto.LoginResponse;
45
import com.back.domain.user.dto.UserRegisterRequest;
56
import com.back.domain.user.dto.UserResponse;
67
import com.back.global.common.dto.RsData;
@@ -228,7 +229,7 @@ ResponseEntity<RsData<UserResponse>> register(
228229
)
229230
)
230231
})
231-
ResponseEntity<RsData<UserResponse>> login(
232+
ResponseEntity<RsData<LoginResponse>> login(
232233
@Valid @RequestBody LoginRequest request,
233234
HttpServletResponse response
234235
);
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.back.domain.user.dto;
2+
3+
public record LoginResponse(
4+
String accessToken,
5+
UserResponse user
6+
) {}

src/main/java/com/back/domain/user/service/UserService.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.back.domain.user.service;
22

33
import com.back.domain.user.dto.LoginRequest;
4+
import com.back.domain.user.dto.LoginResponse;
45
import com.back.domain.user.dto.UserRegisterRequest;
56
import com.back.domain.user.dto.UserResponse;
67
import com.back.domain.user.entity.User;
@@ -87,9 +88,9 @@ public UserResponse register(UserRegisterRequest request) {
8788
* 2. 사용자 상태 검증 (PENDING, SUSPENDED, DELETED)
8889
* 3. Access/Refresh Token 발급
8990
* 4. Refresh Token을 HttpOnly 쿠키로, Access Token은 헤더로 설정
90-
* 5. UserResponse 반환
91+
* 5. LoginResponse 반환
9192
*/
92-
public UserResponse login(LoginRequest request, HttpServletResponse response) {
93+
public LoginResponse login(LoginRequest request, HttpServletResponse response) {
9394
// 사용자 조회
9495
User user = userRepository.findByUsername(request.username())
9596
.orElseThrow(() -> new CustomException(ErrorCode.INVALID_CREDENTIALS));
@@ -127,11 +128,11 @@ public UserResponse login(LoginRequest request, HttpServletResponse response) {
127128
"/api/auth"
128129
);
129130

130-
// Access Token을 응답 헤더에 설정
131-
response.setHeader("Authorization", "Bearer " + accessToken);
132-
133-
// UserResponse 반환
134-
return UserResponse.from(user, user.getUserProfile());
131+
// LoginResponse 반환
132+
return new LoginResponse(
133+
accessToken,
134+
UserResponse.from(user, user.getUserProfile())
135+
);
135136
}
136137

137138
/**

0 commit comments

Comments
 (0)