Skip to content

Commit a486904

Browse files
author
richard jimenez
committed
added cors configuration for CORS on the browser
1 parent df39f1f commit a486904

File tree

3 files changed

+41
-6
lines changed

3 files changed

+41
-6
lines changed

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3'
33
services:
44

55
edgeservice:
6-
image: aista/edge-service
6+
build: ./
77
ports:
88
- "8080:8080"
99
depends_on:
@@ -105,7 +105,7 @@ services:
105105
# - discoveryservice
106106
#
107107
gmaps-adapter:
108-
build: ../gmaps-adapter
108+
image: aista/gmaps-adapter
109109
environment:
110110
- EUREKA_SERVER=discoveryservice
111111
- RABBIT_HOST=rabbitmq
@@ -115,7 +115,7 @@ services:
115115
- discoveryservice
116116

117117
calculation-service:
118-
build: ../calculation-service
118+
image: aista/calculation-service
119119
environment:
120120
- EUREKA_SERVER=discoveryservice
121121
- RABBIT_HOST=rabbitmq
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package aist.edge.edgeservice;
2+
3+
4+
5+
import org.springframework.context.annotation.Bean;
6+
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
8+
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
9+
import org.springframework.web.cors.CorsConfiguration;
10+
import org.springframework.web.cors.CorsConfigurationSource;
11+
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
12+
13+
import java.util.Arrays;
14+
15+
@Configuration
16+
public class ConfigurationCORS extends WebSecurityConfigurerAdapter {
17+
18+
@Override
19+
protected void configure(HttpSecurity http) throws Exception {
20+
http.cors().configurationSource(corsConfigurationSource()).and().csrf().disable();
21+
}
22+
23+
@Bean
24+
public CorsConfigurationSource corsConfigurationSource() {
25+
CorsConfiguration configuration = new CorsConfiguration();
26+
configuration.setAllowedOrigins(Arrays.asList("*"));
27+
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
28+
configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type", "x-auth-token"));
29+
configuration.setExposedHeaders(Arrays.asList("x-auth-token"));
30+
configuration.setAllowCredentials(true);
31+
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
32+
source.registerCorsConfiguration("/**", configuration);
33+
return source;
34+
}
35+
}

src/main/resources/application.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ spring:
99
zuul:
1010
prefix: /api
1111
routes:
12-
calculationservice:
13-
path: /calculationservice/**
14-
url: http://calculationservice:8080/api
12+
# calculationservice:
13+
# path: /calculationservice/**
14+
# url: http://calculationservice:8080/api
1515
trip-cmd:
1616
path: /trip/cmd/**
1717
url: http://tripmanagementcmd:8080/api

0 commit comments

Comments
 (0)