Skip to content

[refactor] 도메인 통일 #141

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

Merged
dyk-im merged 3 commits into from
Feb 19, 2025
Merged

[refactor] 도메인 통일 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7772001
[feat] #140 api.wedit.com 관련 2개 추가 허용
dogsub Feb 19, 2025
9065e54
[fix] #140 api.wedit.site로 변경
dogsub Feb 19, 2025
aeb242e
[fix] #140 도메인 허용
dyk-im Feb 19, 2025
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
6 changes: 2 additions & 4 deletions src/main/java/com/wedit/weditapp/global/auth/jwt/JwtProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ public void setAccessTokenCookie(HttpServletResponse response, String accessToke
accessCookie.setSecure(true); // HTTPS 상황에서만 전송
accessCookie.setPath("/");
accessCookie.setAttribute("SameSite", "None");
//accessCookie.setDomain(cookieDomain);
accessCookie.setDomain("43.201.85.194.nip.io");
accessCookie.setDomain(".wedit.site");
accessCookie.setMaxAge((int) TimeUnit.MILLISECONDS.toSeconds(accessTokenExpiry));

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

response.addCookie(refreshCookie);
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/com/wedit/weditapp/global/auth/login/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

Expand All @@ -26,9 +25,6 @@
@RequiredArgsConstructor
public class AuthController {

@Value("${cookie-domain}")
private String cookieDomain;

private final JwtProvider jwtProvider;
private final MemberRepository memberRepository;
private final RefreshTokenService refreshTokenService;
Expand Down Expand Up @@ -100,8 +96,7 @@ public ResponseEntity<GlobalResponseDto<Map<String, String>>> logout(HttpServlet

private void expireCookie(HttpServletResponse response, String cookieName) {
Cookie cookie = new Cookie(cookieName, null);
//cookie.setDomain(cookieDomain);
cookie.setDomain("43.201.85.194.nip.io");
cookie.setDomain(".wedit.site");
cookie.setPath("/");
cookie.setHttpOnly(true);
cookie.setSecure(true);
Expand Down
10 changes: 3 additions & 7 deletions src/main/java/com/wedit/weditapp/global/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
@RequiredArgsConstructor
public class SecurityConfig {

// @Value("#{'${cors.allowed-origins}'.split(',')}")
// private String[] allowedOrigins;

private final JwtAuthenticationFilter jwtAuthenticationFilter;
private final CustomOAuth2UserService customOAuth2UserService;
private final OAuth2LoginSuccessHandler oAuth2LoginSuccessHandler;
Expand Down Expand Up @@ -63,7 +60,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
"/api/decisions",
"/api/comments/**")
.permitAll()
//.anyRequest().permitAll()
.anyRequest().authenticated()
)
// 4. OAuth2 설정
Expand All @@ -82,14 +78,14 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration configuration = new CorsConfiguration();

//configuration.setAllowedOrigins(Arrays.asList(allowedOrigins));
configuration.setAllowedOrigins(Arrays.asList(
"http://localhost:3000",
"http://localhost:5173",
"http://localhost:8080",
"https://wedit.site",
"https://43.201.85.194.nip.io",
"https://wedit.site/oauth/callback/kakao"
"https://wedit.site/oauth/callback/kakao",
"https://api.wedit.site",
"https://api.wedit.site/oauth/callback/kakao"
));
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PATCH", "DELETE", "OPTIONS"));
configuration.setAllowedHeaders(Arrays.asList("*"));
Expand Down