From 1ca76257d673183f74d350419eaa00e26b434b83 Mon Sep 17 00:00:00 2001 From: jooinjoo Date: Tue, 10 Dec 2024 00:28:25 +0900 Subject: [PATCH] =?UTF-8?q?MATE-125=20:=20[FEAT]=20=ED=94=84=EB=A1=A0?= =?UTF-8?q?=ED=8A=B8=EC=97=94=EB=93=9C=20=EC=97=94=EB=93=9C=ED=8F=AC?= =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20CORS=20=EC=97=B0=EA=B2=B0=20=ED=97=88?= =?UTF-8?q?=EC=9A=A9=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 +--- .../java/com/example/mate/common/config/SecurityConfig.java | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 832847d7..774247cf 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,8 +1,6 @@ name: Deploy To EC2 on: - push: - branches: - - develop + push jobs: deploy: diff --git a/src/main/java/com/example/mate/common/config/SecurityConfig.java b/src/main/java/com/example/mate/common/config/SecurityConfig.java index 507ef6c8..ccd3bb69 100644 --- a/src/main/java/com/example/mate/common/config/SecurityConfig.java +++ b/src/main/java/com/example/mate/common/config/SecurityConfig.java @@ -1,7 +1,6 @@ package com.example.mate.common.config; import com.example.mate.common.security.filter.JwtCheckFilter; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,6 +15,8 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import java.util.List; + @Configuration @EnableWebSecurity @EnableMethodSecurity @@ -45,7 +46,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); - config.setAllowedOrigins(List.of("http://localhost:5173", "http://localhost:8080")); + config.setAllowedOrigins(List.of("http://localhost:5173", "http://localhost:8080", "http://catchmi-web-page.s3-website.ap-northeast-2.amazonaws.com/")); config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH")); config.setAllowedHeaders(List.of("Authorization", "Content-Type", "Cache-Control")); config.setAllowCredentials(true);