chore: add allowed origins param

Onlineberatung · Jun 29, 2021 · dfdd376 · dfdd376
1 parent ce99dcf
commit dfdd376
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/de/caritas/cob/liveservice/api/config/CustomSwaggerPathWebMvcConfigurer.java b/src/main/java/de/caritas/cob/liveservice/api/config/CustomSwaggerPathWebMvcConfigurer.java
@@ -2,7 +2,6 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -18,10 +17,4 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
         .addResourceLocations("classpath:/META-INF/resources/");
   }
 
-  @Override
-  public void addCorsMappings(CorsRegistry registry) {
-    registry.addMapping("/**")
-        .allowedOrigins("*")
-        .allowedMethods("*");
-  }
 }
diff --git a/src/main/java/de/caritas/cob/liveservice/websocket/config/WebSocketConfig.java b/src/main/java/de/caritas/cob/liveservice/websocket/config/WebSocketConfig.java
@@ -22,8 +22,8 @@
 @RequiredArgsConstructor
 public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
-  @Value("${app.base.url}")
-  private String appBaseUrl;
+  @Value("${allowed.origins}")
+  private String[] allowedOrigins;
 
   private final @NonNull ClientInboundChannelInterceptor clientInboundChannelInterceptor;
 
@@ -46,7 +46,7 @@ public void configureMessageBroker(MessageBrokerRegistry config) {
   @Override
   public void registerStompEndpoints(StompEndpointRegistry registry) {
     registry.addEndpoint("/live")
-        .setAllowedOrigins(this.appBaseUrl)
+        .setAllowedOrigins(this.allowedOrigins)
         .withSockJS();
   }
 

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -5,6 +5,7 @@ keycloak.resource=
 keycloak.disable-trust-manager=true
 
 app.base.url=
+allowed.origins=
 
 # Springfox/API documentation
 springfox.docuTitle=Caritas Online Beratung: LiveService