v2.9.2

v2.9.2

Author: khyojun

main/src/main/java/org/sopt/makers/crew/main/global/config/SecurityConfig.java

@@ -1,5 +1,6 @@
 package org.sopt.makers.crew.main.global.config;
 
+import java.util.List;
 import java.util.stream.Stream;
 
 import org.sopt.makers.crew.main.global.security.filter.JwtAuthenticationExceptionFilter;
@@ -15,6 +16,9 @@
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 import lombok.RequiredArgsConstructor;
 
@@ -74,4 +78,26 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 			.addFilterBefore(jwtAuthenticationExceptionFilter, JwtAuthenticationFilter.class);
 		return http.build();
 	}
+
+	@Bean
+	CorsConfigurationSource corsConfigurationSource() {
+		CorsConfiguration configuration = new CorsConfiguration();
+		configuration.setAllowCredentials(false);
+
+		configuration.setAllowedOrigins(List.of(
+			"https://playground.sopt.org",
+			"http://localhost:3000",
+			"https://sopt-internal-dev.pages.dev",
+			"https://crew.api.dev.sopt.org",
+			"https://crew.api.prod.sopt.org"
+		));
+
+		configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+		configuration.setAllowedHeaders(List.of("*"));
+
+		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+		source.registerCorsConfiguration("/**", configuration);
+
+		return source;
+	}
 }

main/src/main/java/org/sopt/makers/crew/main/global/config/WebMvcConfig.java

@@ -5,7 +5,6 @@
 import org.sopt.makers.crew.main.global.resolver.AuthenticatedUserIdArgumentResolver;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import lombok.RequiredArgsConstructor;
@@ -20,19 +19,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
 		resolvers.add(authenticatedUserIdArgumentResolver);
 	}
-
-	@Override
-	public void addCorsMappings(CorsRegistry registry) {
-		registry.addMapping("/**")
-			.allowedOrigins(
-				"https://playground.sopt.org",
-				"http://localhost:3000",
-				"https://sopt-internal-dev.pages.dev",
-				"https://crew.api.dev.sopt.org",
-				"https://crew.api.prod.sopt.org"
-			)
-			.allowedMethods("GET", "POST", "PATCH", "DELETE", "PUT", "OPTIONS")
-			.allowedHeaders("*")
-			.allowCredentials(true);
-	}
 }

main/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
     import: application-secret.properties
   datasource:
     driver-class-name: org.postgresql.Driver
-    jdbc-url: jdbc:postgresql://${DEV_DB_HOST}:${DEV_DB_PORT}/${DEV_DB_NAME}?currentSchema=${DEV_DB_SCHEMA}
+    jdbc-url: jdbc:postgresql://${DEV_DB_HOST}:${DEV_DB_PORT}/${DEV_DB_NAME}?currentSchema=${DEV_DB_V2_SCHEMA}
     username: ${DEV_DB_USERNAME}
     password: ${DEV_DB_PASSWORD}
   playground-datasource:
@@ -32,11 +32,6 @@ spring:
     caffeine:
       spec: maximumSize=500,expireAfterWrite=24h
 
-#jwt:
-#  header: Authorization
-#  secret: ${DEV_JWT_SECRET}
-#  access-token:
-#    expire-length: ${DEV_ACCESS_TOKEN_EXPIRED_TIME} # 10분
 
 aws-property:
   aws-region: ${AWS_REGION}

main/src/main/resources/application-prod.yml

@@ -31,11 +31,6 @@ spring:
     caffeine:
       spec: maximumSize=500,expireAfterWrite=24h
 
-  #jwt:
-  #  header: Authorization
-  #  secret: ${PROD_JWT_SECRET}
-  #  access-token:
-  #    expire-length: ${ACCESS_TOKEN_EXPIRED_TIME} # 10분
 
 jwt:
   jwk:

main/src/test/java/org/sopt/makers/crew/main/meeting/v2/service/MeetingV2ConcurrencyTest.java

@@ -139,7 +139,7 @@ void applyMeetingWithLock_WhenMultipleRequestsFromSameUser_ShouldProcessOnlyOne(
 
 			readyLatch.await();
 
-			Thread.sleep(1000);
+			Thread.sleep(5000);
 
 			startLatch.countDown();
 			boolean completedInTime = finishLatch.await(10, TimeUnit.SECONDS);