From 7a13083851cc9afe40702d37f9a28982fb92602f Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 12 Nov 2020 13:06:55 +0200
Subject: [PATCH] BaseUrl check

---
 .../security/system/DefaultSystemSecurityService.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java b/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
index 4219dbc609..9bd22c88f5 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
@@ -202,16 +202,19 @@ public class DefaultSystemSecurityService implements SystemSecurityService {
 
     @Override
     public String getBaseUrl(TenantId tenantId, CustomerId customerId, HttpServletRequest httpServletRequest) {
-        String baseUrl;
+        String baseUrl = null;
         AdminSettings generalSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "general");
 
         JsonNode prohibitDifferentUrl = generalSettings.getJsonValue().get("prohibitDifferentUrl");
 
         if (prohibitDifferentUrl != null && prohibitDifferentUrl.asBoolean()) {
             baseUrl = generalSettings.getJsonValue().get("baseUrl").asText();
-        } else {
+        }
+
+        if (StringUtils.isEmpty(baseUrl)) {
             baseUrl = MiscUtils.constructBaseUrl(httpServletRequest);
         }
+
         return baseUrl;
     }