Merge pull request #70 from team-Ollie/develop

[develop] main merge
team-Ollie · Jun 27, 2024 · e9847c2 · e9847c2
2 parents f502659 + 4817a6d
commit e9847c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/ollie/wecare/common/configuration/WebConfiguration.java b/src/main/java/ollie/wecare/common/configuration/WebConfiguration.java
@@ -10,7 +10,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:8080", "https://wecare-ollie.netlify.app", "http://localhost:3000", "https://team-ollie.github.io/WeCare-FE")
+                .allowedOrigins("http://localhost:8080", "http://localhost:3000", "https://team-ollie.github.io/WeCare-FE")
                 .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
                 .allowedHeaders("*")
                 .allowCredentials(true);

diff --git a/src/main/java/ollie/wecare/common/configuration/WebSecurityConfiguration.java b/src/main/java/ollie/wecare/common/configuration/WebSecurityConfiguration.java
@@ -34,7 +34,7 @@ public class WebSecurityConfiguration {
     CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowedHeaders(List.of("*"));
-        configuration.setAllowedOrigins(List.of("http://localhost:8080", "https://wecare-ollie.netlify.app", "http://localhost:3000", "https://team-ollie.github.io/WeCare-FE"));
+        configuration.setAllowedOrigins(List.of("http://localhost:8080", "http://localhost:3000", "https://team-ollie.github.io/WeCare-FE"));
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
         configuration.setAllowCredentials(true);
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();