From 18b088e5841d33b0fdc260b74e0ebc3c2a6fcf32 Mon Sep 17 00:00:00 2001 From: open-schnick Date: Tue, 24 Nov 2020 11:43:52 +0100 Subject: [PATCH 1/2] FF-181 Removed custom cors config. --- .../rest/configuration/RestConfiguration.java | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/main/java/de/filefighter/rest/configuration/RestConfiguration.java b/src/main/java/de/filefighter/rest/configuration/RestConfiguration.java index 21fd5372..51986036 100644 --- a/src/main/java/de/filefighter/rest/configuration/RestConfiguration.java +++ b/src/main/java/de/filefighter/rest/configuration/RestConfiguration.java @@ -1,15 +1,5 @@ package de.filefighter.rest.configuration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -import java.util.ArrayList; -import java.util.Arrays; - -@Configuration public class RestConfiguration { //Custom static constants @@ -21,17 +11,7 @@ public class RestConfiguration { public static final String USER_BASE_URI = "/users/"; public static final String DEFAULT_ERROR_PATH = "/error"; - @Bean - public CorsFilter corsFilter(){ - final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - final CorsConfiguration config = new CorsConfiguration(); - // Don't do this in production, use a proper list of allowed origins - ArrayList allowedOrigins = new ArrayList<>(); - allowedOrigins.add("http://localhost:3000"); - config.setAllowedOrigins(allowedOrigins); - config.setAllowedHeaders(Arrays.asList("Origin", "Content-Type", "Accept")); - config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "OPTIONS", "DELETE", "PATCH")); - source.registerCorsConfiguration("/**", config); - return new CorsFilter(source); + private RestConfiguration(){ + // Cannot be inst } -} +} \ No newline at end of file From 6806f63e36fa13a66de85700bec89a035ac55d90 Mon Sep 17 00:00:00 2001 From: open-schnick Date: Tue, 24 Nov 2020 18:35:06 +0100 Subject: [PATCH 2/2] BUG: fixed pipeline --- .github/workflows/featureRelease.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/featureRelease.yml b/.github/workflows/featureRelease.yml index f803cfb3..bb113ae8 100644 --- a/.github/workflows/featureRelease.yml +++ b/.github/workflows/featureRelease.yml @@ -26,9 +26,6 @@ jobs: run: | docker create -p 27017:27017 --name FileFighterDB mongo:latest docker start FileFighterDB - - - name: Run Tests and update Sonar - run: mvn clean test sonar:sonar -s ./settings.xml - name: Build Docker Image run: mvn spring-boot:build-image -f pom.xml