commit 819abe1751d66538ca42ace456452cb5fde847aa
author Simon Reis <simon.reis@pta.de> Fri Jan 31 16:10:02 2020 +0100
committer Simon Reis <simon.reis@pta.de> Fri Jan 31 16:10:02 2020 +0100
tree 31497eed023e8735977206f041adddb57a83841b
parent a26187183036d64f457ac8ef512dd12e2f0d6bbd
parent 3da4d4fe51d3e63a2763acca6fab95b2ca4d154f

Merge branch 'KON-221_KON-103_Q-Umgebung' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend into DEVELOP

src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java

diff --git a/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java b/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java
new file mode 100644
index 0000000..1d82a2e
--- /dev/null
+++ b/src/main/java/org/eclipse/openk/contactbasedata/config/CorsConfig.java
@@ -0,0 +1,36 @@
+package org.eclipse.openk.contactbasedata.config;
+
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Log4j2
+@Configuration
+public class CorsConfig {
+
+    @Value("${cors.allowedOrigins}")
+    private String allowedOrigins;
+
+    @Value("${cors.corsEnabled}")
+    private boolean corsEnabled;
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer () {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                if (corsEnabled) {
+                    log.info("Cors enabled");
+                    log.info("AllowedOrigins: " + allowedOrigins);
+                    registry.addMapping("/**");
+                            //.allowedOrigins(allowedOrigins).maxAge(1800);
+                } else {
+                    log.info("Cors disabled");
+                }
+            }
+        };
+    }
+}

src/main/resources/application.yml

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7c7017c..a75f8c6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,13 +34,18 @@
   ribbon:
     listOfServers: http://entopkon:8880
 
-
 feign:
   client:
     config:
       default:
         connectTimeout: 60000
         readTimeout: 60000
+cors:
+  allowedOrigins: http://localhost:8080
+  corsEnabled: false
+
+logging:
+  file: contact-base-data.log
 
 ---
 
@@ -74,12 +79,16 @@
 server:
   port: 9155
 
+cors:
+  allowedOrigins: http://localhost:8080
+  corsEnabled: true
+
 ---
 
 spring:
   profiles: qserver
   datasource:
-    url: jdbc:postgresql://entopticadirx:5432/ContactBaseDataDev
+    url: jdbc:postgresql://localhost:5432/contactBaseDataQa
     username: cbd_service
     password: cbd_service
   flyway:
@@ -94,7 +103,7 @@
 
 jwt:
   tokenHeader: Authorization
-  useStaticJwt: false
+  useStaticJwt: true
   staticJwt: eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJIYlI3Z2pobmE2eXJRZnZJTWhUSV9tY2g3ZmtTQWVFX3hLTjBhZVl0bjdjIn0.eyJqdGkiOiI5MGI0NGFkOC1iYjlmLTQ1MzktYTQwYy0yYjQyZTNkNjNiOGEiLCJleHAiOjE1Nzg2NTU3OTUsIm5iZiI6MCwiaWF0IjoxNTc4NjU1NDk1LCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgwODAvYXV0aC9yZWFsbXMvRWxvZ2Jvb2siLCJhdWQiOiJlbG9nYm9vay1iYWNrZW5kIiwic3ViIjoiODYyNjY5NmYtZjFhMi00ZGI1LTkyZWYtZTlhMjQ2Njg1YTU0IiwidHlwIjoiQmVhcmVyIiwiYXpwIjoiZWxvZ2Jvb2stYmFja2VuZCIsImF1dGhfdGltZSI6MCwic2Vzc2lvbl9zdGF0ZSI6IjJmMWIzODE5LWZjNjQtNDEzNC1iNWQxLWY3ZWY4NzU5NDBkNCIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsia29uLWFkbWluIiwia29uLXdyaXRlciIsImtvbi1hY2Nlc3MiLCJrb24tcmVhZGVyIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnt9LCJuYW1lIjoiVGVzdGVyRmlyc3RuYW1lX3J3YSBUZXN0ZXJMYXN0bmFtZV9yd2EiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ0ZXN0dXNlcl9yd2EiLCJnaXZlbl9uYW1lIjoiVGVzdGVyRmlyc3RuYW1lX3J3YSIsImZhbWlseV9uYW1lIjoiVGVzdGVyTGFzdG5hbWVfcndhIn0.DAYXuv4tKn8RXqO1jyttnD-tF4nShUBQyfe4bKbAiPAyY2x5YbAf3M4eXnLrGqo8-loGKldICC28bL0LaMA3KKkQEOfW5sfpGqoN6212vs89mOklt0TJYc5PMXwFgJ5WC_TKjdwq7-aaDafOEWehV0U1ut3s-94ovNYIEn29nzXm2W1ldoXJEq03F880jlysQ5zlRvGF7eXEEpFfI2URyyNQ2UWh0Ssfq-gOAt2pbF1u6prA5RfvUmZ3v1eu21YLGZtgqPqxb1l6odyH3ip15j_HdgnTeo52ymxuRUj65Mskme3V5ev2DitHI9vZgnpV8Idhb4TTWliBeGCOMfDFCg
 
 services:
@@ -103,5 +112,8 @@
 
 authNAuthService:
   ribbon:
-    listOfServers: http://localhost:8880
+    listOfServers: http://localhost:8380
 
+cors:
+  allowedOrigins: http://localhost:8080
+  corsEnabled: true
\ No newline at end of file

src/main/resources/application_localdev.yml

diff --git a/src/main/resources/application_localdev.yml b/src/main/resources/application_localdev.yml
index 665fbec..387436a 100644
--- a/src/main/resources/application_localdev.yml
+++ b/src/main/resources/application_localdev.yml
@@ -38,3 +38,6 @@
   ribbon:
     listOfServers: http://entopkon:8880
 
+logging:
+  file: contact-base-data.log
+