Merge pull request #59 from dnwls16071/fix-episodes

fix-episodes PR
Project-aniwhere · Dec 30, 2024 · 15ff1df · 15ff1df
2 parents f088f28 + aab900a
commit 15ff1df
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/src/main/java/com/example/aniwhere/application/auth/jwt/JwtWhitelist.java b/src/main/java/com/example/aniwhere/application/auth/jwt/JwtWhitelist.java
@@ -39,7 +39,8 @@ private List<WhitelistEntry> initializeWhitelist() {
 		entries.add(new WhitelistEntry("/api/v3/api-docs/**", HttpMethod.GET));
 		entries.add(new WhitelistEntry("/api/swagger-ui/**", HttpMethod.GET));
 
-		entries.add(new WhitelistEntry("/api/animes/**", HttpMethod.GET));
+		entries.add(new WhitelistEntry("/api/anime/**", HttpMethod.GET));
+		entries.add(new WhitelistEntry("/api/episodes/**", HttpMethod.GET));
 		entries.add(new WhitelistEntry("/", HttpMethod.GET));
 
 		return entries;

diff --git a/src/main/java/com/example/aniwhere/application/config/CorsConfig.java b/src/main/java/com/example/aniwhere/application/config/CorsConfig.java
@@ -0,0 +1,33 @@
+package com.example.aniwhere.application.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+import java.util.List;
+
+@Configuration
+public class CorsConfig {
+
+	private static final String FRONT_END_LOCAL = "http://localhost:3000";
+
+	@Bean
+	public CorsConfigurationSource corsConfigurationSource() {
+		CorsConfiguration corsConfiguration = new CorsConfiguration();
+
+		corsConfiguration.setAllowCredentials(true);
+		corsConfiguration.setAllowedOrigins(List.of(FRONT_END_LOCAL));
+		corsConfiguration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+		corsConfiguration.setAllowedHeaders(List.of("*"));
+		corsConfiguration.setExposedHeaders(List.of("Set-Cookie", "*"));
+
+		corsConfiguration.addAllowedHeader("*");
+		corsConfiguration.addAllowedMethod("*");
+
+		UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+		source.registerCorsConfiguration("/**", corsConfiguration);
+		return source;
+	}
+}
diff --git a/src/main/java/com/example/aniwhere/application/config/WebConfig.java b/src/main/java/com/example/aniwhere/application/config/WebConfig.java
@@ -5,6 +5,7 @@
 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.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.List;
@@ -14,6 +15,7 @@
 
 @Configuration
 @RequiredArgsConstructor
+@EnableWebMvc
 public class WebConfig implements WebMvcConfigurer {
 
 	private final LoginUserArgumentResolver loginUserArgumentResolver;

diff --git a/src/main/java/com/example/aniwhere/application/config/cookie/CookieConfig.java b/src/main/java/com/example/aniwhere/application/config/cookie/CookieConfig.java
@@ -66,8 +66,6 @@ public String extractRefreshToken(HttpServletRequest request) {
 	public ResponseCookie invalidateAccessTokenCookie(String name, String value) {
 		return ResponseCookie.from(name, value)
 				.httpOnly(true)
-				.secure(true)
-				.sameSite("none")
 				.maxAge(0)
 				.path("/")
 				.build();
@@ -76,8 +74,6 @@ public ResponseCookie invalidateAccessTokenCookie(String name, String value) {
 	public ResponseCookie invalidateRefreshTokenCookie(String name, String value) {
 		return ResponseCookie.from(name, value)
 				.httpOnly(true)
-				.secure(true)
-				.sameSite("none")
 				.maxAge(0)
 				.path("/")
 				.build();

diff --git a/src/main/java/com/example/aniwhere/application/config/security/SecurityConfig.java b/src/main/java/com/example/aniwhere/application/config/security/SecurityConfig.java
@@ -60,7 +60,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 new AntPathRequestMatcher("/api/login"),
                                 new AntPathRequestMatcher("/api/token"),
                                 new AntPathRequestMatcher("/api/auth/**"),
-								new AntPathRequestMatcher("/api/animes/**"),
+								new AntPathRequestMatcher("/api/anime/**"),
+								new AntPathRequestMatcher("/api/episodes/**"),
                                 new AntPathRequestMatcher("/recommend"),
                                 new AntPathRequestMatcher("/anime/*"),
 								new AntPathRequestMatcher("/api/v3/api-docs/**"),

diff --git a/src/main/java/com/example/aniwhere/controller/episodes/EpisodeApiController.java b/src/main/java/com/example/aniwhere/controller/episodes/EpisodeApiController.java
@@ -34,7 +34,7 @@ public class EpisodeApiController {
 			summary = "애니메이션 ID값에 대한 전체 에피소드 조회",
 			description = "특정 애니메이션의 모든 에피소드를 페이지 단위로 조회합니다."
 	)
-	@GetMapping("/animes/{animeId}/episodes")
+	@GetMapping("/anime/{animeId}/episodes")
 	public ResponseEntity<Page<EpisodesDto>> getEpisodes(@PathVariable(name = "animeId") Long animeId, Pageable pageable) {
 		Page<EpisodesDto> episodes = episodesRepository.getEpisodes(animeId, pageable);
 		return ResponseEntity