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 @@ -17,9 +17,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import site.campingon.campingon.common.jwt.JwtToken;
import site.campingon.campingon.common.jwt.JwtTokenProvider;
import site.campingon.campingon.common.util.CookieUtil;
import site.campingon.campingon.user.dto.UserSignInRequestDto;
import site.campingon.campingon.user.dto.UserTokenResponseDto;
import site.campingon.campingon.user.service.UserAuthService;

@Slf4j
Expand All @@ -28,27 +28,26 @@
@RequestMapping("/api")
public class UserAuthController {

private final JwtTokenProvider jwtTokenProvider;
@Value("${jwt.refresh-expired}")
private Long refreshTokenExpired;

private final UserAuthService userAuthService;

// 로그인 처리
@PostMapping("/login")
public ResponseEntity<JwtToken> login(@RequestBody UserSignInRequestDto userSignInRequestDto,
public ResponseEntity<UserTokenResponseDto> login(@RequestBody UserSignInRequestDto userSignInRequestDto,
HttpServletResponse response) throws IOException {

JwtToken jwtToken = userAuthService.login(userSignInRequestDto);
CookieUtil.setCookie(response, "refreshToken", jwtToken.getRefreshToken(),refreshTokenExpired);

return ResponseEntity.ok(jwtToken);
return ResponseEntity.ok(new UserTokenResponseDto(jwtToken.getAccessToken()));
}


// 토큰 재발급
@GetMapping("/token/refresh")
public ResponseEntity<JwtToken> refreshAccessToken(
public ResponseEntity<UserTokenResponseDto> refreshAccessToken(
@CookieValue(name = "refreshToken", required = false) String refreshToken,
HttpServletResponse response
) throws IOException {
Expand All @@ -61,7 +60,7 @@ public ResponseEntity<JwtToken> refreshAccessToken(
CookieUtil.setCookie(response, "refreshToken", jwtToken.getRefreshToken(), refreshTokenExpired);

// JWT 토큰 정보 반환
return ResponseEntity.ok(jwtToken);
return ResponseEntity.ok(new UserTokenResponseDto(jwtToken.getAccessToken()));
}

// 로그아웃 API
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package site.campingon.campingon.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;

@AllArgsConstructor
@Getter
public class UserTokenResponseDto {
private String accessToken;
}
Loading