diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e80b88e..f6088c2 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -76,7 +76,7 @@ jobs: env_vars: | SPRING_PROFILES_ACTIVE=prod - DB_URL=jdbc:mysql://google/mydb?socketFactory=com.google.cloud.sql.mysql.SocketFactory&cloudSqlInstance=${{ secrets.GCP_SQL_CONNECTION_NAME }}&useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8 + DB_URL=jdbc:mysql:///mydb?socketFactory=com.google.cloud.sql.mysql.SocketFactory&cloudSqlInstance=${{ secrets.GCP_SQL_CONNECTION_NAME }}&useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8 DB_USERNAME=${{ secrets.DB_USERNAME }} DB_PASSWORD=${{ secrets.DB_PASSWORD }} GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }} diff --git a/src/main/java/com/precourse/openMission/config/auth/SecurityConfig.java b/src/main/java/com/precourse/openMission/config/auth/SecurityConfig.java index d66c069..d3d252d 100644 --- a/src/main/java/com/precourse/openMission/config/auth/SecurityConfig.java +++ b/src/main/java/com/precourse/openMission/config/auth/SecurityConfig.java @@ -19,28 +19,8 @@ public class SecurityConfig { private final CustomOAuth2UserService customOAuth2UserService; - // (운영/배포) 환경 전용 SecurityFilterChain @Bean - @Profile("prod") - public SecurityFilterChain prodFilterChain(HttpSecurity http) throws Exception { - http.requiresChannel(channel -> channel - .anyRequest().requiresSecure() - ); - - commonSecurityConfig(http); - - return http.build(); - } - - @Bean - @Profile("!prod") - public SecurityFilterChain devFilterChain(HttpSecurity http) throws Exception { - commonSecurityConfig(http); - - return http.build(); - } - - private void commonSecurityConfig(HttpSecurity http) throws Exception { + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests((authz) -> authz .requestMatchers("/").permitAll() @@ -66,6 +46,8 @@ private void commonSecurityConfig(HttpSecurity http) throws Exception { .userService(customOAuth2UserService) ) ); + + return http.build(); } @Bean