Skip to content
Merged
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,10 +1,8 @@
package com.example.skillboost.auth.handler;

import com.example.skillboost.auth.JwtProvider;
import com.example.skillboost.auth.service.TokenService;
import com.example.skillboost.domain.User;
import com.example.skillboost.repository.UserRepository;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
Expand All @@ -16,7 +14,6 @@
import org.springframework.web.util.UriComponentsBuilder;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

@Slf4j
Expand All @@ -27,7 +24,11 @@ public class OAuth2SuccessHandler implements AuthenticationSuccessHandler {
private final JwtProvider jwtProvider;
private final UserRepository userRepository;
private final TokenService tokenService;
private final ObjectMapper objectMapper = new ObjectMapper();

private static final String FRONTEND_REDIRECT_BASE_URL = "https://www.skill-boost.store";
private static final String FRONTEND_TOKEN_HANDLER_PATH = "/oauth2/redirect";


@Override
public void onAuthenticationSuccess(HttpServletRequest request,
HttpServletResponse response,
Expand All @@ -37,10 +38,11 @@ public void onAuthenticationSuccess(HttpServletRequest request,

OAuth2User oAuth2User = (OAuth2User) authentication.getPrincipal();
Map<String, Object> attributes = oAuth2User.getAttributes();

String email = (String) attributes.get("email");
String githubId = String.valueOf(attributes.get("id"));

if (email == null || email.isEmpty()) {
String githubId = String.valueOf(attributes.get("id"));
email = githubId + "@github.temp";
log.warn("이메일 비공개 사용자 - 임시 이메일 사용: {}", email);
}
Expand All @@ -60,13 +62,12 @@ public void onAuthenticationSuccess(HttpServletRequest request,

log.info("JWT 토큰 생성 및 Redis 저장 완료: {}", user.getEmail());

// JSON 응답 대신 리다이렉트를 수행하는 로직

String frontendRedirectBaseUrl = "https://www.skill-boost.store";
String frontendTokenHandlerPath = "/oauth2/redirect";
String targetUrl = UriComponentsBuilder.fromUriString(frontendRedirectBaseUrl + frontendTokenHandlerPath)
String targetUrl = UriComponentsBuilder
.fromUriString(FRONTEND_REDIRECT_BASE_URL + FRONTEND_TOKEN_HANDLER_PATH)
.queryParam("accessToken", accessToken)
.queryParam("refreshToken", refreshToken)
.queryParam("email", user.getEmail())
.queryParam("username", user.getUsername())
.build().toUriString();

response.sendRedirect(targetUrl);
Expand Down