Skip to content
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

[#96] cors bug fix #102

Merged
merged 1 commit into from
Jul 18, 2024
Merged

[#96] cors bug fix #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .platform/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ http {
proxy_pass http://springboot;
if ($request_method = 'OPTIONS') {
# OPTIONS 요청에 대한 CORS 헤더 추가
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Origin' 'https://travel-compass.netlify.app';
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type';
add_header 'Access-Control-Allow-Credentials' 'true';
Expand All @@ -50,10 +50,10 @@ http {
}

# CORS 관련 헤더 추가
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type';
add_header 'Access-Control-Allow-Credentials' 'true';
add_header 'Access-Control-Allow-Origin' 'https://travel-compass.netlify.app' always;
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type' always;
add_header 'Access-Control-Allow-Credentials' 'true' always;
proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Upgrade $http_upgrade;
Expand All @@ -74,4 +74,4 @@ http {
# Include the Elastic Beanstalk generated locations
include conf.d/elasticbeanstalk/healthd.conf;
}
}
}
38 changes: 18 additions & 20 deletions src/main/java/com/travelcompass/api/global/config/WebSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,33 @@ protected SecurityFilterChain securityFilterChain(
) throws Exception {
http
.csrf(AbstractHttpConfigurer::disable)
.cors(cors -> cors.configurationSource(corsConfigurationSource()))
.authorizeHttpRequests(authHttp -> authHttp
.requestMatchers(
"/health", // health check
"/", // root
.requestMatchers(
"/health", // health check
"/", // root

"/oauth2/authorization/naver", // 로그인
"/login/oauth2/code/**", // code, state 반환
"/token/**", // 로컬에게 토큰 반환
"/oauth/**", // 프론트에게 토큰 반환
"/oauth2/authorization/naver", // 로그인
"/login/oauth2/code/**", // code, state 반환
"/token/**", // 로컬에게 토큰 반환
"/oauth/**", // 프론트에게 토큰 반환

"/swagger-ui/**", // Swagger UI
"/v3/api-docs/**", // Swagger API docs
"/swagger-resources/**", // Swagger resources
"/swagger-ui/**", // Swagger UI
"/v3/api-docs/**", // Swagger API docs
"/swagger-resources/**", // Swagger resources

"/locations/regions/**", // 지역별 장소 리스트 조회
"/locations/**", // 장소 상세 조회
"/locations/regions/**", // 지역별 장소 리스트 조회
"/locations/**", // 장소 상세 조회

"/plans/search/**" // 여행계획 조회
)
.permitAll()
//.anyRequest().permitAll()
.anyRequest().authenticated()
"/plans/search/**" // 여행계획 조회
)
.permitAll()
//.anyRequest().permitAll()
.anyRequest().authenticated()

)
.oauth2Login(oauth2Login -> oauth2Login
//.loginPage("/users/login")
//.loginPage("http://umc.persi0815.site:8080/oauth2/authorization/naver") //비인증 사용자를 이동시킬 로그인 페이지
.successHandler(oAuth2SuccessHandler) //인증 성공 후 jwt 생성, 사용자 정보 db에 등록
//.defaultSuccessUrl("/users/main") //로그인(일정 부분) 성공하면 특정 화면으로 이동
.userInfoEndpoint(userInfo -> userInfo
.userService(oAuth2UserService) //사용자 데이터 처리
)
Expand Down
Loading