Skip to content

Commit 5c1215b

Browse files
committed
feat/OPS-324 : 해결
1 parent c3ae1f8 commit 5c1215b

File tree

4 files changed

+7
-42
lines changed

4 files changed

+7
-42
lines changed

src/main/java/org/tuna/zoopzoop/backend/domain/auth/global/CustomOAuth2AuthorizationRequestResolver.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ private OAuth2AuthorizationRequest customize(OAuth2AuthorizationRequest req, Htt
3434
if ("extension".equals(source)) {
3535
// state에 source 정보를 안전하게 포함
3636
builder.state("source:extension;" + req.getState());
37-
38-
// 필요하다면 redirectUri도 동적으로 변경 가능
39-
// builder.redirectUri("https://api.test.zoopzoop.kro.kr/login/oauth2/code/kakao");
4037
}
41-
4238
return builder.build();
4339
}
4440
}

src/main/java/org/tuna/zoopzoop/backend/domain/auth/global/OAuth2LoginSourceFilter.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import jakarta.servlet.http.HttpServletRequest;
44
import jakarta.servlet.http.HttpServletResponse;
55
import lombok.RequiredArgsConstructor;
6+
import lombok.extern.slf4j.Slf4j;
67
import org.springframework.beans.factory.annotation.Value;
78
import org.springframework.http.HttpHeaders;
89
import org.springframework.http.ResponseCookie;
@@ -22,6 +23,7 @@
2223

2324
@Component
2425
@RequiredArgsConstructor
26+
@Slf4j
2527
public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
2628
private final JwtUtil jwtUtil;
2729
private final JwtProperties jwtProperties;
@@ -60,9 +62,11 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
6062
String accessToken = jwtUtil.generateToken(member);
6163
String refreshToken = jwtUtil.generateRefreshToken(member);
6264

63-
String source = (String) request.getSession().getAttribute("loginSource");
64-
boolean isExtension = "extension".equals(source);
65-
65+
String source = request.getParameter("source");
66+
String state = request.getParameter("state");
67+
log.info("[OAuth2SuccessHandler] Source: {}", source);
68+
log.info("[OAuth2SuccessHandler] State: {}", state);
69+
boolean isExtension = state != null && state.contains("source:extension");
6670

6771
// 확장 프로그램에서 로그인 했을 경우.
6872
if(isExtension){

src/main/java/org/tuna/zoopzoop/backend/global/security/SecurityConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
import org.springframework.context.annotation.Configuration;
66
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
77
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
8-
import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter;
98
import org.springframework.security.web.SecurityFilterChain;
109
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
1110
import org.tuna.zoopzoop.backend.domain.auth.global.CustomOAuth2AuthorizationRequestResolver;
12-
import org.tuna.zoopzoop.backend.domain.auth.global.OAuth2LoginSourceFilter;
1311
import org.tuna.zoopzoop.backend.domain.auth.handler.OAuth2SuccessHandler;
1412
import org.tuna.zoopzoop.backend.domain.auth.service.CustomOAuth2UserService;
1513
import org.tuna.zoopzoop.backend.global.security.jwt.CustomAuthenticationEntryPoint;
@@ -23,7 +21,6 @@ public class SecurityConfig {
2321
private final CustomOAuth2UserService customOAuth2UserService;
2422
private final OAuth2SuccessHandler oAuth2SuccessHandler;
2523
private final ClientRegistrationRepository clientRegistrationRepository;
26-
private final OAuth2LoginSourceFilter oauth2LoginSourceFilter;
2724

2825
@Bean
2926
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
@@ -49,7 +46,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
4946
).permitAll()
5047
.anyRequest().authenticated()
5148
)
52-
.addFilterBefore(oauth2LoginSourceFilter, OAuth2AuthorizationRequestRedirectFilter.class)
5349
.oauth2Login(oauth2 -> oauth2
5450
.authorizationEndpoint(authorization -> authorization
5551
.authorizationRequestResolver(

0 commit comments

Comments
 (0)