Skip to content

Commit 2b55e20

Browse files
authored
Merge pull request #141 from Wedit-project/refactor/#140-도메인-통일
[refactor] 도메인 통일
2 parents 05f59be + aeb242e commit 2b55e20

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

src/main/java/com/wedit/weditapp/global/auth/jwt/JwtProvider.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ public void setAccessTokenCookie(HttpServletResponse response, String accessToke
8484
accessCookie.setSecure(true); // HTTPS 상황에서만 전송
8585
accessCookie.setPath("/");
8686
accessCookie.setAttribute("SameSite", "None");
87-
//accessCookie.setDomain(cookieDomain);
88-
accessCookie.setDomain("43.201.85.194.nip.io");
87+
accessCookie.setDomain(".wedit.site");
8988
accessCookie.setMaxAge((int) TimeUnit.MILLISECONDS.toSeconds(accessTokenExpiry));
9089

9190
response.addCookie(accessCookie);
@@ -100,8 +99,7 @@ public void setRefreshTokenCookie(HttpServletResponse response, String refreshTo
10099
refreshCookie.setSecure(true); // HTTPS 환경에서만 전송
101100
refreshCookie.setPath("/");
102101
refreshCookie.setAttribute("SameSite", "None");
103-
//refreshCookie.setDomain(cookieDomain);
104-
refreshCookie.setDomain("43.201.85.194.nip.io");
102+
refreshCookie.setDomain(".wedit.site");
105103
refreshCookie.setMaxAge((int) TimeUnit.MILLISECONDS.toSeconds(refreshTokenExpiry));
106104

107105
response.addCookie(refreshCookie);

src/main/java/com/wedit/weditapp/global/auth/login/controller/AuthController.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import jakarta.servlet.http.HttpServletResponse;
1616
import lombok.RequiredArgsConstructor;
1717

18-
import org.springframework.beans.factory.annotation.Value;
1918
import org.springframework.http.ResponseEntity;
2019
import org.springframework.web.bind.annotation.*;
2120

@@ -26,9 +25,6 @@
2625
@RequiredArgsConstructor
2726
public class AuthController {
2827

29-
@Value("${cookie-domain}")
30-
private String cookieDomain;
31-
3228
private final JwtProvider jwtProvider;
3329
private final MemberRepository memberRepository;
3430
private final RefreshTokenService refreshTokenService;
@@ -100,8 +96,7 @@ public ResponseEntity<GlobalResponseDto<Map<String, String>>> logout(HttpServlet
10096

10197
private void expireCookie(HttpServletResponse response, String cookieName) {
10298
Cookie cookie = new Cookie(cookieName, null);
103-
//cookie.setDomain(cookieDomain);
104-
cookie.setDomain("43.201.85.194.nip.io");
99+
cookie.setDomain(".wedit.site");
105100
cookie.setPath("/");
106101
cookie.setHttpOnly(true);
107102
cookie.setSecure(true);

src/main/java/com/wedit/weditapp/global/config/SecurityConfig.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
@RequiredArgsConstructor
3131
public class SecurityConfig {
3232

33-
// @Value("#{'${cors.allowed-origins}'.split(',')}")
34-
// private String[] allowedOrigins;
35-
3633
private final JwtAuthenticationFilter jwtAuthenticationFilter;
3734
private final CustomOAuth2UserService customOAuth2UserService;
3835
private final OAuth2LoginSuccessHandler oAuth2LoginSuccessHandler;
@@ -63,7 +60,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
6360
"/api/decisions",
6461
"/api/comments/**")
6562
.permitAll()
66-
//.anyRequest().permitAll()
6763
.anyRequest().authenticated()
6864
)
6965
// 4. OAuth2 설정
@@ -82,14 +78,14 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
8278
public CorsConfigurationSource corsConfigurationSource() {
8379
CorsConfiguration configuration = new CorsConfiguration();
8480

85-
//configuration.setAllowedOrigins(Arrays.asList(allowedOrigins));
8681
configuration.setAllowedOrigins(Arrays.asList(
8782
"http://localhost:3000",
8883
"http://localhost:5173",
8984
"http://localhost:8080",
9085
"https://wedit.site",
91-
"https://43.201.85.194.nip.io",
92-
"https://wedit.site/oauth/callback/kakao"
86+
"https://wedit.site/oauth/callback/kakao",
87+
"https://api.wedit.site",
88+
"https://api.wedit.site/oauth/callback/kakao"
9389
));
9490
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PATCH", "DELETE", "OPTIONS"));
9591
configuration.setAllowedHeaders(Arrays.asList("*"));

0 commit comments

Comments
 (0)