Skip to content

[DEPLOY] v1.0.7 #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sengjun0624 merged 1 commit into from
Jun 5, 2025
Merged

[DEPLOY] v1.0.7 #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
140 changes: 71 additions & 69 deletions src/main/java/dev/admin/admin/controller/AdminAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import dev.admin.global.apiPayload.ApiResponse;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;

import org.springframework.http.ResponseCookie;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand All @@ -18,73 +19,74 @@
@RequiredArgsConstructor
public class AdminAuthController {

private final AdminAuthCommandService authCommandService;
private final JwtUtil jwtUtil;

@PostMapping("/login")
public ApiResponse<JwtDto> login(@RequestBody LoginRequestDto requestDto, HttpServletResponse response) {
JwtDto tokenDto = authCommandService.login(requestDto);

ResponseCookie accessTokenCookie = ResponseCookie.from("accessToken", tokenDto.getAccessToken())
.httpOnly(true)
.secure(false)
.path("/")
.sameSite("Lax")
.maxAge(60 * 60)
.build();

ResponseCookie refreshTokenCookie = ResponseCookie.from("refreshToken", tokenDto.getRefreshToken())
.httpOnly(true)
.secure(false)
.path("/")
.sameSite("Lax")
.maxAge(7 * 24 * 60 * 60)
.build();

response.addHeader("Set-Cookie", accessTokenCookie.toString());
response.addHeader("Set-Cookie", refreshTokenCookie.toString());

return ApiResponse.onSuccess(tokenDto);
}

@PostMapping("/logout")
public ApiResponse<Void> logout(@CookieValue("refreshToken") String refreshToken,
HttpServletResponse response) {
authCommandService.logout(refreshToken);

ResponseCookie clearAccessToken = ResponseCookie.from("accessToken", "")
.httpOnly(true)
.secure(false)
.path("/")
.maxAge(0)
.sameSite("Lax")
.build();

ResponseCookie clearRefreshToken = ResponseCookie.from("refreshToken", "")
.httpOnly(true)
.secure(false)
.path("/")
.maxAge(0)
.sameSite("Lax")
.build();

response.addHeader("Set-Cookie", clearAccessToken.toString());
response.addHeader("Set-Cookie", clearRefreshToken.toString());

return ApiResponse.onSuccess(null);
}

@GetMapping("/me")
public ApiResponse<AdminInfoResponse> me(@CookieValue("accessToken") String accessToken) {
JwtPayload payload = jwtUtil.parseToken(accessToken);

AdminInfoResponse info = new AdminInfoResponse(
payload.getSub(),
payload.getEmail(),
payload.getName(),
payload.getRole()
);

return ApiResponse.onSuccess(info);
}
private final AdminAuthCommandService authCommandService;
private final JwtUtil jwtUtil;

@PostMapping("/login")
public ApiResponse<JwtDto> login(@RequestBody LoginRequestDto requestDto, HttpServletResponse response) {
JwtDto tokenDto = authCommandService.login(requestDto);

ResponseCookie accessTokenCookie = ResponseCookie.from("accessToken", tokenDto.getAccessToken())
.httpOnly(true)
.secure(true)
.path("/")
.sameSite("None")
.maxAge(60 * 60)
.build();

ResponseCookie refreshTokenCookie = ResponseCookie.from("refreshToken", tokenDto.getRefreshToken())
.httpOnly(true)
.secure(true)
.path("/")
.sameSite("None")
.maxAge(7 * 24 * 60 * 60)
.build();

response.addHeader("Set-Cookie", accessTokenCookie.toString());
response.addHeader("Set-Cookie", refreshTokenCookie.toString());

return ApiResponse.onSuccess(tokenDto);
}

@PostMapping("/logout")
public ApiResponse<Void> logout(@CookieValue("refreshToken") String refreshToken,
HttpServletResponse response) {
authCommandService.logout(refreshToken);

ResponseCookie clearAccessToken = ResponseCookie.from("accessToken", "")
.httpOnly(true)
.secure(true)
.path("/")
.sameSite("None")
.maxAge(0)
.build();

ResponseCookie clearRefreshToken = ResponseCookie.from("refreshToken", "")
.httpOnly(true)
.secure(true)
.path("/")
.sameSite("None")
.maxAge(0)
.build();


response.addHeader("Set-Cookie", clearAccessToken.toString());
response.addHeader("Set-Cookie", clearRefreshToken.toString());

return ApiResponse.onSuccess(null);
}

@GetMapping("/me")
public ApiResponse<AdminInfoResponse> me(@CookieValue("accessToken") String accessToken) {
JwtPayload payload = jwtUtil.parseToken(accessToken);

AdminInfoResponse info = new AdminInfoResponse(
payload.getSub(),
payload.getEmail(),
payload.getName(),
payload.getRole()
);

return ApiResponse.onSuccess(info);
}
}