Skip to content
Closed
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
@@ -1,6 +1,7 @@
package com.back.domain.user.controller;

import com.back.domain.user.dto.LoginRequest;
import com.back.domain.user.dto.LoginResponse;
import com.back.domain.user.dto.UserRegisterRequest;
import com.back.domain.user.dto.UserResponse;
import com.back.domain.user.service.UserService;
Expand Down Expand Up @@ -40,11 +41,11 @@ public ResponseEntity<RsData<UserResponse>> register(

// 로그인
@PostMapping("/login")
public ResponseEntity<RsData<UserResponse>> login(
public ResponseEntity<RsData<LoginResponse>> login(
@Valid @RequestBody LoginRequest request,
HttpServletResponse response
) {
UserResponse loginResponse = userService.login(request, response);
LoginResponse loginResponse = userService.login(request, response);
return ResponseEntity
.ok(RsData.success(
"로그인에 성공했습니다.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.back.domain.user.controller;

import com.back.domain.user.dto.LoginRequest;
import com.back.domain.user.dto.LoginResponse;
import com.back.domain.user.dto.UserRegisterRequest;
import com.back.domain.user.dto.UserResponse;
import com.back.global.common.dto.RsData;
Expand Down Expand Up @@ -228,7 +229,7 @@ ResponseEntity<RsData<UserResponse>> register(
)
)
})
ResponseEntity<RsData<UserResponse>> login(
ResponseEntity<RsData<LoginResponse>> login(
@Valid @RequestBody LoginRequest request,
HttpServletResponse response
);
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/back/domain/user/dto/LoginResponse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.back.domain.user.dto;

public record LoginResponse(
String accessToken,
UserResponse user
) {}
15 changes: 8 additions & 7 deletions src/main/java/com/back/domain/user/service/UserService.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.back.domain.user.service;

import com.back.domain.user.dto.LoginRequest;
import com.back.domain.user.dto.LoginResponse;
import com.back.domain.user.dto.UserRegisterRequest;
import com.back.domain.user.dto.UserResponse;
import com.back.domain.user.entity.User;
Expand Down Expand Up @@ -87,9 +88,9 @@ public UserResponse register(UserRegisterRequest request) {
* 2. 사용자 상태 검증 (PENDING, SUSPENDED, DELETED)
* 3. Access/Refresh Token 발급
* 4. Refresh Token을 HttpOnly 쿠키로, Access Token은 헤더로 설정
* 5. UserResponse 반환
* 5. LoginResponse 반환
*/
public UserResponse login(LoginRequest request, HttpServletResponse response) {
public LoginResponse login(LoginRequest request, HttpServletResponse response) {
// 사용자 조회
User user = userRepository.findByUsername(request.username())
.orElseThrow(() -> new CustomException(ErrorCode.INVALID_CREDENTIALS));
Expand Down Expand Up @@ -127,11 +128,11 @@ public UserResponse login(LoginRequest request, HttpServletResponse response) {
"/api/auth"
);

// Access Token을 응답 헤더에 설정
response.setHeader("Authorization", "Bearer " + accessToken);

// UserResponse 반환
return UserResponse.from(user, user.getUserProfile());
// LoginResponse 반환
return new LoginResponse(
accessToken,
UserResponse.from(user, user.getUserProfile())
);
}

/**
Expand Down
Loading
Loading