Skip to content
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

Add user id to login response #169

Merged
merged 1 commit into from
Sep 26, 2024
Merged

Add user id to login response #169

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/main/java/com/dnd/spaced/global/security/dto/response/LoginResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dnd.spaced.global.security.dto.response;

public record LoginResponse(String accessToken, boolean isSignUp, String role) {
public record LoginResponse(String accessToken, boolean isSignUp, String role, Long id) {
}
7 changes: 4 additions & 3 deletions src/main/java/com/dnd/spaced/global/security/handler/OAuth2SuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ private void login(HttpServletResponse response, Account account, boolean isSign
String accessToken = tokenEncoder.encode(LocalDateTime.now(), TokenType.ACCESS, claims);
String refreshToken = tokenEncoder.encode(LocalDateTime.now(), TokenType.REFRESH, claims);

writeResponse(response, accessToken, isSignUp, account.getRole().name());
writeResponse(response, accessToken, isSignUp, account.getRole().name(), account.getId());
createRefreshTokenCookie(response, refreshToken);
}

private void writeResponse(HttpServletResponse response, String accessToken, boolean isSignUp, String role) {
private void writeResponse(HttpServletResponse response, String accessToken, boolean isSignUp, String role, Long id) {
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding(StandardCharsets.UTF_8.name());

Expand All @@ -92,12 +92,13 @@ private void writeResponse(HttpServletResponse response, String accessToken, boo
.queryParam("accessToken", accessToken)
.queryParam("isSignUp", isSignUp)
.queryParam("role", role)
.queryParam("id", id)
.build().toUriString();

response.sendRedirect(redirectUrl);
PrintWriter writer = response.getWriter();

writer.println(objectMapper.writeValueAsString(new LoginResponse(accessToken, isSignUp, role)));
writer.println(objectMapper.writeValueAsString(new LoginResponse(accessToken, isSignUp, role, id)));
writer.flush();
} catch (IOException e) {
throw new InvalidResponseWriteException();
Expand Down
Loading