diff --git a/application/src/test/java/org/thingsboard/server/controller/TrendzControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TrendzControllerTest.java index 115b895521..3612c4a584 100644 --- a/application/src/test/java/org/thingsboard/server/controller/TrendzControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TrendzControllerTest.java @@ -27,6 +27,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public class TrendzControllerTest extends AbstractControllerTest { private final String trendzUrl = "https://some.domain.com:18888/also_necessary_prefix"; + private final String apiKey = "$2a$10$iDjfqYmnrw9gkdw4XhgzFOU.R/pVz3OKgXOdpbR2LuXaKatGcGLiG"; @Before public void setUp() throws Exception { @@ -35,6 +36,7 @@ public class TrendzControllerTest extends AbstractControllerTest { TrendzSettings trendzSettings = new TrendzSettings(); trendzSettings.setEnabled(true); trendzSettings.setBaseUrl(trendzUrl); + trendzSettings.setApiKey(apiKey); doPost("/api/trendz/settings", trendzSettings).andExpect(status().isOk()); } @@ -48,9 +50,12 @@ public class TrendzControllerTest extends AbstractControllerTest { assertThat(trendzSettings).isNotNull(); assertThat(trendzSettings.isEnabled()).isTrue(); assertThat(trendzSettings.getBaseUrl()).isEqualTo(trendzUrl); + trendzSettings.setApiKey(apiKey); String updatedUrl = "https://some.domain.com:18888/tenant_trendz"; + String updatedApiKey = "$2a$10$aRR0bHa8rtzP5jRcE72vp.hRFsGQz4MGIs62oogLbfOCFK3.RIESG"; trendzSettings.setBaseUrl(updatedUrl); + trendzSettings.setApiKey(updatedApiKey); doPost("/api/trendz/settings", trendzSettings).andExpect(status().isOk()); @@ -65,6 +70,7 @@ public class TrendzControllerTest extends AbstractControllerTest { TrendzSettings newTrendzSettings = new TrendzSettings(); newTrendzSettings.setEnabled(true); newTrendzSettings.setBaseUrl("https://some.domain.com:18888/customer_trendz"); + newTrendzSettings.setApiKey("some_api_key"); doPost("/api/trendz/settings", newTrendzSettings).andExpect(status().isForbidden()); @@ -72,6 +78,6 @@ public class TrendzControllerTest extends AbstractControllerTest { assertThat(fetchedTrendzSettings).isNotNull(); assertThat(fetchedTrendzSettings.isEnabled()).isTrue(); assertThat(fetchedTrendzSettings.getBaseUrl()).isEqualTo(trendzUrl); + assertThat(fetchedTrendzSettings.getApiKey()).isEqualTo(apiKey); } - } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/trendz/TrendzSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/trendz/TrendzSettings.java index 3c3b49399c..3f00d7062e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/trendz/TrendzSettings.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/trendz/TrendzSettings.java @@ -15,12 +15,16 @@ */ package org.thingsboard.server.common.data.trendz; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor +@AllArgsConstructor public class TrendzSettings { private boolean enabled; private String baseUrl; - + private String apiKey; } diff --git a/ui-ngx/src/app/modules/home/pages/admin/trendz-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/trendz-settings.component.html index 45ba62dace..ba6fb21ed4 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/trendz-settings.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/trendz-settings.component.html @@ -31,13 +31,17 @@