Skip to content

Commit b8a545b

Browse files
authored
Merge branch 'prgrms-web-devcourse-final-project:dev' into dev
2 parents 01e26b4 + a8f6852 commit b8a545b

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

src/main/java/com/grepp/spring/infra/auth/oauth2/OAuth2SuccessHandler.java

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.grepp.spring.app.model.auth.dto.TokenDto;
66
import com.grepp.spring.infra.auth.jwt.TokenCookieFactory;
77
import com.grepp.spring.infra.auth.oauth2.user.OAuth2UserInfo;
8+
import jakarta.annotation.PostConstruct;
89
import jakarta.servlet.http.Cookie;
910
import jakarta.servlet.http.HttpServletRequest;
1011
import jakarta.servlet.http.HttpServletResponse;
@@ -13,6 +14,8 @@
1314
import java.net.URISyntaxException;
1415
import java.util.Arrays;
1516
import java.util.List;
17+
import java.util.stream.Stream;
18+
1619
import lombok.RequiredArgsConstructor;
1720
import lombok.extern.slf4j.Slf4j;
1821
import org.springframework.beans.factory.annotation.Value;
@@ -34,18 +37,27 @@ public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler
3437
@Value("${front-server.domain-A}")
3538
private String frontServerDomainA;
3639

40+
@Value("${front-server.domain-B}")
41+
private String frontServerDomainB;
42+
3743
@Value("${url.backend}")
3844
private String backendServer;
3945

4046
@Value("${front-server.redirect-url}")
4147
private String DEFAULT_REDIRECT_URL;
4248

43-
// 허용 도메인
44-
private final List<String> ALLOWED_DOMAINS = Arrays.asList(
45-
frontServerDomainA, // frontend 로컬 도메인
46-
backendServer,
47-
"https://localhost:3000"
48-
);
49+
private List<String> allowedDomains;
50+
51+
@PostConstruct
52+
private void initAllowedDomains() {
53+
allowedDomains = Stream.of(
54+
frontServerDomainA,
55+
frontServerDomainB,
56+
backendServer
57+
)
58+
.filter(StringUtils::hasText)
59+
.collect(java.util.stream.Collectors.toList());
60+
}
4961

5062
@Override
5163
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
@@ -108,7 +120,7 @@ private boolean isAllowedUrl(String url) {
108120
return false;
109121
}
110122

111-
return ALLOWED_DOMAINS.stream()
123+
return allowedDomains.stream()
112124
.anyMatch(allowedDomain -> {
113125
try {
114126
URI allowedUri = new URI(allowedDomain);

0 commit comments

Comments
 (0)