Merge pull request #20 from AITestingOrg/configureEdgeServiceCORS

configureEdgeServiceCORS

Author: jusoto

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
 
   edgeservice:
-    image: aista/edge-service
+    build: ./
     ports:
       - "8080:8080"
     depends_on:
@@ -21,7 +21,7 @@ services:
 #      - SPRING_PROFILES_ACTIVE=docker
 #    ports:
 #      - 6161:6161
-
+#
 #  config-service:
 #    build: config-service
 #    container_name: config-service
@@ -104,19 +104,21 @@ services:
       - mongo
       - discoveryservice
 
-  gmapsadapter:
+  gmaps-adapter:
     image: aista/gmaps-adapter
     environment:
       - EUREKA_SERVER=discoveryservice
+      - RABBIT_HOST=rabbitmq
     ports:
       - '8080'
     depends_on:
       - discoveryservice
 
-  calculationservice:
+  calculation-service:
     image: aista/calculation-service
     environment:
       - EUREKA_SERVER=discoveryservice
+      - RABBIT_HOST=rabbitmq
     command: ["go", "run", "main.go"]
     ports:
       - '8080'

src/main/java/aist/edge/edgeservice/ConfigurationCORS.java

@@ -0,0 +1,35 @@
+package aist.edge.edgeservice;
+
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+import java.util.Arrays;
+
+@Configuration
+public class ConfigurationCORS extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.cors().configurationSource(corsConfigurationSource()).and().csrf().disable();
+    }
+
+    @Bean
+    public CorsConfigurationSource corsConfigurationSource()  {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.setAllowedOrigins(Arrays.asList("*"));
+        configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
+        configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type", "x-auth-token"));
+        configuration.setExposedHeaders(Arrays.asList("x-auth-token"));
+        configuration.setAllowCredentials(true);
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
+}