From 93376eef5e7181782912e2c1b536e8424ea65ea3 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Tue, 26 Apr 2022 18:22:00 +0300
Subject: [PATCH] Fix CORS configuration issue introduced in Spring 5.3

---
 .../org/thingsboard/server/config/WebSocketConfiguration.java   | 2 +-
 application/src/main/resources/thingsboard.yml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
index 664e6c3181..13b13123e6 100644
--- a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
@@ -55,7 +55,7 @@ public class WebSocketConfiguration implements WebSocketConfigurer {
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(wsHandler(), WS_PLUGIN_MAPPING).setAllowedOrigins("*")
+        registry.addHandler(wsHandler(), WS_PLUGIN_MAPPING).setAllowedOriginPatterns("*")
                 .addInterceptors(new HttpSessionHandshakeInterceptor(), new HandshakeInterceptor() {
 
                     @Override
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index a1c7bc765e..0aa7b3bb66 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -492,7 +492,7 @@ spring.mvc.cors:
     # Intercept path
     "[/api/**]":
       #Comma-separated list of origins to allow. '*' allows all origins. When not set,CORS support is disabled.
-      allowed-origins: "*"
+      allowed-origin-patterns: "*"
       #Comma-separated list of methods to allow. '*' allows all methods.
       allowed-methods: "*"
       #Comma-separated list of headers to allow in a request. '*' allows all headers.