Merge branch 'hotfix/3.6.3' into master-with-hotfix

# Conflicts:
#	common/util/src/main/java/org/thingsboard/common/util/SslUtil.java

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV1.java

@@ -73,6 +73,24 @@ public class TenantMsgConstructorV1 implements TenantMsgConstructor {
 
     @Override
     public TenantProfileUpdateMsg constructTenantProfileUpdateMsg(UpdateMsgType msgType, TenantProfile tenantProfile, EdgeVersion edgeVersion) {
+        tenantProfile = JacksonUtil.clone(tenantProfile);
+        // clear all config
+        var tenantProfileData = tenantProfile.getProfileData();
+        var configuration = tenantProfile.getDefaultProfileConfiguration();
+        configuration.setRpcTtlDays(0);
+        configuration.setMaxJSExecutions(0);
+        configuration.setMaxREExecutions(0);
+        configuration.setMaxDPStorageDays(0);
+        configuration.setMaxTbelExecutions(0);
+        configuration.setQueueStatsTtlDays(0);
+        configuration.setMaxTransportMessages(0);
+        configuration.setDefaultStorageTtlDays(0);
+        configuration.setMaxTransportDataPoints(0);
+        configuration.setRuleEngineExceptionsTtlDays(0);
+        configuration.setMaxRuleNodeExecutionsPerMessage(0);
+        tenantProfileData.setConfiguration(configuration);
+        tenantProfile.setProfileData(tenantProfileData);
+
         ByteString profileData = EdgeVersionUtils.isEdgeVersionOlderThan(edgeVersion, EdgeVersion.V_3_6_2) ?
                 ByteString.empty() : ByteString.copyFrom(tenantProfile.getProfileDataBytes());
         TenantProfileUpdateMsg.Builder builder = TenantProfileUpdateMsg.newBuilder()
@@ -88,4 +106,5 @@ public class TenantMsgConstructorV1 implements TenantMsgConstructor {
         }
         return builder.build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/tenant/TenantMsgConstructorV2.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.gen.edge.v1.EdgeVersion;
 import org.thingsboard.server.gen.edge.v1.TenantProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.TenantUpdateMsg;
@@ -36,6 +37,23 @@ public class TenantMsgConstructorV2 implements TenantMsgConstructor {
 
     @Override
     public TenantProfileUpdateMsg constructTenantProfileUpdateMsg(UpdateMsgType msgType, TenantProfile tenantProfile, EdgeVersion edgeVersion) {
+        tenantProfile = JacksonUtil.clone(tenantProfile);
+        // clear all config
+        var configuration = tenantProfile.getDefaultProfileConfiguration();
+        configuration.setRpcTtlDays(0);
+        configuration.setMaxJSExecutions(0);
+        configuration.setMaxREExecutions(0);
+        configuration.setMaxDPStorageDays(0);
+        configuration.setMaxTbelExecutions(0);
+        configuration.setQueueStatsTtlDays(0);
+        configuration.setMaxTransportMessages(0);
+        configuration.setDefaultStorageTtlDays(0);
+        configuration.setMaxTransportDataPoints(0);
+        configuration.setRuleEngineExceptionsTtlDays(0);
+        configuration.setMaxRuleNodeExecutionsPerMessage(0);
+        tenantProfile.getProfileData().setConfiguration(configuration);
+
         return TenantProfileUpdateMsg.newBuilder().setMsgType(msgType).setEntity(JacksonUtil.toString(tenantProfile)).build();
     }
+
 }

application/src/main/java/org/thingsboard/server/service/mail/RefreshTokenExpCheckService.java

@@ -54,9 +54,18 @@ public class RefreshTokenExpCheckService {
         AdminSettings settings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
         if (settings != null && settings.getJsonValue().has("enableOauth2") && settings.getJsonValue().get("enableOauth2").asBoolean()) {
             JsonNode jsonValue = settings.getJsonValue();
-            if (OFFICE_365.name().equals(jsonValue.get("providerId").asText()) && jsonValue.has("refreshTokenExpires")) {
+            if (OFFICE_365.name().equals(jsonValue.get("providerId").asText()) && jsonValue.has("refreshToken")
+                    && jsonValue.has("refreshTokenExpires")) {
+                try {
                     long expiresIn = jsonValue.get("refreshTokenExpires").longValue();
-                if ((expiresIn - System.currentTimeMillis()) < 604800000L) { //less than 7 days
+                    long tokenLifeDuration = expiresIn - System.currentTimeMillis();
+                    if (tokenLifeDuration < 0) {
+                        ((ObjectNode) jsonValue).put("tokenGenerated", false);
+                        ((ObjectNode) jsonValue).remove("refreshToken");
+                        ((ObjectNode) jsonValue).remove("refreshTokenExpires");
+
+                        adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                    } else if (tokenLifeDuration < 604800000L) { //less than 7 days
                         log.info("Trying to refresh refresh token.");
 
                         String clientId = jsonValue.get("clientId").asText();
@@ -72,6 +81,9 @@ public class RefreshTokenExpCheckService {
                         ((ObjectNode) jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
                         adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
                     }
+                } catch (Exception e) {
+                    log.error("Error occurred while checking token", e);
+                }
             }
         }
     }

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java

@@ -112,10 +112,18 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             if (partitionService.isManagedByCurrentService(queueKey.getTenantId())) {
                 var consumer = getConsumer(queueKey).orElseGet(() -> {
                     Queue config = queueService.findQueueByTenantIdAndName(queueKey.getTenantId(), queueKey.getQueueName());
+                    if (config == null) {
+                        if (!partitions.isEmpty()) {
+                            log.error("[{}] Queue configuration is missing", queueKey, new RuntimeException("stacktrace"));
+                        }
+                        return null;
+                    }
                     return createConsumer(queueKey, config);
                 });
+                if (consumer != null) {
                     consumer.update(partitions);
                 }
+            }
         });
         consumers.keySet().stream()
                 .collect(Collectors.groupingBy(QueueKey::getTenantId))

application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionUtils.java

@@ -36,7 +36,6 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.KeyValueProto;
-import org.thingsboard.server.gen.transport.TransportProtos.KeyValueType;
 import org.thingsboard.server.gen.transport.TransportProtos.SubscriptionMgrMsgProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbAlarmDeleteProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TbAlarmUpdateProto;
@@ -54,6 +53,7 @@ import org.thingsboard.server.service.ws.notification.sub.NotificationsSubscript
 import org.thingsboard.server.service.ws.telemetry.sub.AlarmSubscriptionUpdate;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -62,6 +62,14 @@ import java.util.UUID;
 
 public class TbSubscriptionUtils {
 
+    private static final DataType[] dataTypeByProtoNumber;
+
+    static {
+        int arraySize = Arrays.stream(DataType.values()).mapToInt(DataType::getProtoNumber).max().orElse(0);
+        dataTypeByProtoNumber = new DataType[arraySize + 1];
+        Arrays.stream(DataType.values()).forEach(dataType -> dataTypeByProtoNumber[dataType.getProtoNumber()] = dataType);
+    }
+
     public static ToCoreMsg toSubEventProto(String serviceId, TbEntitySubEvent event) {
         SubscriptionMgrMsgProto.Builder msgBuilder = SubscriptionMgrMsgProto.newBuilder();
         var builder = TbEntitySubEventProto.newBuilder()
@@ -234,7 +242,7 @@ public class TbSubscriptionUtils {
     private static TsKvProto.Builder toKeyValueProto(long ts, KvEntry attr) {
         KeyValueProto.Builder dataBuilder = KeyValueProto.newBuilder();
         dataBuilder.setKey(attr.getKey());
-        dataBuilder.setType(KeyValueType.forNumber(attr.getDataType().ordinal()));
+        dataBuilder.setType(toProto(attr.getDataType()));
         switch (attr.getDataType()) {
             case BOOLEAN:
                 attr.getBooleanValue().ifPresent(dataBuilder::setBoolV);
@@ -258,7 +266,7 @@ public class TbSubscriptionUtils {
     private static TransportProtos.TsValueProto toTsValueProto(long ts, KvEntry attr) {
         TransportProtos.TsValueProto.Builder dataBuilder = TransportProtos.TsValueProto.newBuilder();
         dataBuilder.setTs(ts);
-        dataBuilder.setType(KeyValueType.forNumber(attr.getDataType().ordinal()));
+        dataBuilder.setType(toProto(attr.getDataType()));
         switch (attr.getDataType()) {
             case BOOLEAN:
                 attr.getBooleanValue().ifPresent(dataBuilder::setBoolV);
@@ -298,8 +306,7 @@ public class TbSubscriptionUtils {
 
     private static KvEntry getKvEntry(KeyValueProto proto) {
         KvEntry entry = null;
-        DataType type = DataType.values()[proto.getType().getNumber()];
+        switch (fromProto(proto.getType())) {
-        switch (type) {
             case BOOLEAN:
                 entry = new BooleanDataEntry(proto.getKey(), proto.getBoolV());
                 break;
@@ -327,8 +334,7 @@ public class TbSubscriptionUtils {
 
     private static KvEntry getKvEntry(String key, TransportProtos.TsValueProto proto) {
         KvEntry entry = null;
-        DataType type = DataType.values()[proto.getType().getNumber()];
+        switch (fromProto(proto.getType())) {
-        switch (type) {
             case BOOLEAN:
                 entry = new BooleanDataEntry(key, proto.getBoolV());
                 break;
@@ -447,4 +453,12 @@ public class TbSubscriptionUtils {
         return ToCoreNotificationMsg.newBuilder().setToLocalSubscriptionServiceMsg(result).build();
     }
 
+    public static TransportProtos.KeyValueType toProto(DataType dataType) {
+        return TransportProtos.KeyValueType.forNumber(dataType.getProtoNumber());
+    }
+
+    public static DataType fromProto(TransportProtos.KeyValueType keyValueType) {
+        return dataTypeByProtoNumber[keyValueType.getNumber()];
+    }
+
 }

application/src/main/java/org/thingsboard/server/service/ttl/rpc/RpcCleanUpService.java

@@ -68,7 +68,7 @@ public class RpcCleanUpService {
                     long ttl = TimeUnit.DAYS.toMillis(tenantProfileConfiguration.get().getRpcTtlDays());
                     long expirationTime = System.currentTimeMillis() - ttl;
 
-                    long totalRemoved = rpcDao.deleteOutdatedRpcByTenantId(tenantId, expirationTime);
+                    int totalRemoved = rpcDao.deleteOutdatedRpcByTenantId(tenantId, expirationTime);
 
                     if (totalRemoved > 0) {
                         log.info("Removed {} outdated rpc(s) for tenant {} older than {}", totalRemoved, tenantId, new Date(expirationTime));

application/src/test/java/org/thingsboard/server/utils/TbSubscriptionUtilsTest.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.utils;
+
+import org.junit.Test;
+import org.thingsboard.server.common.data.kv.DataType;
+import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TbSubscriptionUtilsTest {
+
+    @Test
+    public void protoDataTypeSerialization() {
+        for (DataType dataType : DataType.values()) {
+            assertThat(TbSubscriptionUtils.fromProto(TbSubscriptionUtils.toProto(dataType))).as(dataType.name()).isEqualTo(dataType);
+        }
+    }
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
  * @author Andrew Shvayka
  */
 public enum EntityType {
+
     TENANT(1),
     CUSTOMER(2),
     USER(3),
@@ -63,7 +64,7 @@ public enum EntityType {
     @Getter
     private final int protoNumber; // Corresponds to EntityTypeProto
 
-    private EntityType(int protoNumber) {
+    EntityType(int protoNumber) {
         this.protoNumber = protoNumber;
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java

@@ -15,8 +15,21 @@
  */
 package org.thingsboard.server.common.data.kv;
 
+import lombok.Getter;
+
 public enum DataType {
 
-    STRING, LONG, BOOLEAN, DOUBLE, JSON;
+    BOOLEAN(0),
+    LONG(1),
+    DOUBLE(2),
+    STRING(3),
+    JSON(4);
+
+    @Getter
+    private final int protoNumber; // Corresponds to KeyValueType
+
+    DataType(int protoNumber) {
+        this.protoNumber = protoNumber;
+    }
 
 }

common/util/src/main/java/org/thingsboard/common/util/SslUtil.java

@@ -104,7 +104,7 @@ public class SslUtil {
     }
 
     private static PrivateKey readPrivateKey(Reader reader, String passStr) throws IOException, PKCSException {
-        char[] password = StringUtils.isEmpty(passStr) ? EMPTY_PASS : passStr.toCharArray();
+        char[] password = getPassword(passStr);
         PrivateKey privateKey = null;
         JcaPEMKeyConverter keyConverter = new JcaPEMKeyConverter();
         try (PEMParser pemParser = new PEMParser(reader)) {
@@ -130,4 +130,8 @@ public class SslUtil {
         return privateKey;
     }
 
+    public static char[] getPassword(String passStr) {
+        return StringUtils.isEmpty(passStr) ? EMPTY_PASS : passStr.toCharArray();
+    }
+
 }

dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.dao.entity;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.thingsboard.server.common.data.HasCustomerId;
@@ -60,6 +61,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     private EntityQueryDao entityQueryDao;
 
     @Autowired
+    @Lazy
     EntityServiceRegistry entityServiceRegistry;
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java

@@ -17,15 +17,12 @@ package org.thingsboard.server.dao.entity;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 
+import javax.annotation.PostConstruct;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -33,14 +30,13 @@ import java.util.Map;
 @Slf4j
 public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
 
-    private final ApplicationContext applicationContext;
+    private final List<EntityDaoService> entityDaoServices;
     private final Map<EntityType, EntityDaoService> entityDaoServicesMap = new HashMap<>();
 
-    @EventListener(ContextRefreshedEvent.class)
+    @PostConstruct
-    @Order(Ordered.HIGHEST_PRECEDENCE)
     public void init() {
         log.debug("Initializing EntityServiceRegistry on ContextRefreshedEvent");
-        applicationContext.getBeansOfType(EntityDaoService.class).values().forEach(entityDaoService -> {
+        entityDaoServices.forEach(entityDaoService -> {
             EntityType entityType = entityDaoService.getEntityType();
             entityDaoServicesMap.put(entityType, entityDaoService);
             if (EntityType.RULE_CHAIN.equals(entityType)) {

dao/src/main/java/org/thingsboard/server/dao/rpc/RpcDao.java

@@ -30,5 +30,6 @@ public interface RpcDao extends Dao<Rpc> {
 
     PageData<Rpc> findAllRpcByTenantId(TenantId tenantId, PageLink pageLink);
 
-    Long deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime);
+    int deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime);
+
 }

dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java

@@ -19,6 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -67,8 +68,9 @@ public class JpaRpcDao extends JpaAbstractDao<RpcEntity, Rpc> implements RpcDao
         return DaoUtil.toPageData(rpcRepository.findAllByTenantId(tenantId.getId(), DaoUtil.toPageable(pageLink)));
     }
 
+    @Transactional
     @Override
-    public Long deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime) {
+    public int deleteOutdatedRpcByTenantId(TenantId tenantId, Long expirationTime) {
         return rpcRepository.deleteOutdatedRpcByTenantId(tenantId.getId(), expirationTime);
     }
 

dao/src/main/java/org/thingsboard/server/dao/sql/rpc/RpcRepository.java

@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.rpc;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
@@ -32,7 +33,8 @@ public interface RpcRepository extends JpaRepository<RpcEntity, UUID> {
 
     Page<RpcEntity> findAllByTenantId(UUID tenantId, Pageable pageable);
 
-    @Query(value = "WITH deleted AS (DELETE FROM rpc WHERE (tenant_id = :tenantId AND created_time < :expirationTime) IS TRUE RETURNING *) SELECT count(*) FROM deleted",
+    @Modifying
+    @Query(value = "DELETE FROM rpc WHERE tenant_id = :tenantId AND created_time < :expirationTime",
             nativeQuery = true)
-    Long deleteOutdatedRpcByTenantId(@Param("tenantId") UUID tenantId, @Param("expirationTime") Long expirationTime);
+    int deleteOutdatedRpcByTenantId(@Param("tenantId") UUID tenantId, @Param("expirationTime") Long expirationTime);
 }

dao/src/test/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDaoTest.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.sql.rpc;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rpc.Rpc;
+import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.dao.AbstractJpaDaoTest;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JpaRpcDaoTest extends AbstractJpaDaoTest {
+
+    @Autowired
+    JpaRpcDao rpcDao;
+
+    @Test
+    public void deleteOutdated() {
+        Rpc rpc = new Rpc();
+        rpc.setTenantId(TenantId.SYS_TENANT_ID);
+        rpc.setDeviceId(new DeviceId(UUID.randomUUID()));
+        rpc.setStatus(RpcStatus.QUEUED);
+        rpc.setRequest(JacksonUtil.toJsonNode("{}"));
+        rpcDao.saveAndFlush(rpc.getTenantId(), rpc);
+
+        rpc.setId(null);
+        rpcDao.saveAndFlush(rpc.getTenantId(), rpc);
+
+        TenantId tenantId = TenantId.fromUUID(UUID.fromString("3d193a7a-774b-4c05-84d5-f7fdcf7a37cf"));
+        rpc.setId(null);
+        rpc.setTenantId(tenantId);
+        rpc.setDeviceId(new DeviceId(UUID.randomUUID()));
+        rpcDao.saveAndFlush(rpc.getTenantId(), rpc);
+
+        assertThat(rpcDao.deleteOutdatedRpcByTenantId(TenantId.SYS_TENANT_ID, 0L)).isEqualTo(0);
+        assertThat(rpcDao.deleteOutdatedRpcByTenantId(TenantId.SYS_TENANT_ID, Long.MAX_VALUE)).isEqualTo(2);
+        assertThat(rpcDao.deleteOutdatedRpcByTenantId(tenantId, System.currentTimeMillis() + 1)).isEqualTo(1);
+    }
+
+}

dao/src/test/resources/logback.xml

@@ -10,6 +10,9 @@
     <logger name="org.thingsboard.server.dao" level="WARN"/>
     <logger name="org.testcontainers" level="INFO" />
 
+    <!-- Log Hibernate SQL queries -->
+    <!-- <logger name="org.hibernate.SQL" level="DEBUG"/> -->
+
     <root level="WARN">
         <appender-ref ref="console"/>
     </root>

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java

@@ -87,7 +87,7 @@ public class CertPemCredentials implements ClientCredentials {
 
     private KeyManagerFactory createAndInitKeyManagerFactory() throws Exception {
         KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-        kmf.init(loadKeyStore(), password.toCharArray());
+        kmf.init(loadKeyStore(), SslUtil.getPassword(password));
         return kmf;
     }
 
@@ -107,7 +107,7 @@ public class CertPemCredentials implements ClientCredentials {
             CertPath certPath = factory.generateCertPath(certificates);
             List<? extends Certificate> path = certPath.getCertificates();
             Certificate[] x509Certificates = path.toArray(new Certificate[0]);
-            keyStore.setKeyEntry(PRIVATE_KEY_ALIAS, privateKey, password.toCharArray(), x509Certificates);
+            keyStore.setKeyEntry(PRIVATE_KEY_ALIAS, privateKey, SslUtil.getPassword(password), x509Certificates);
         }
         return keyStore;
     }

ui-ngx/.eslintrc.json

@@ -51,7 +51,8 @@
                 "import/order": "off",
                 "@typescript-eslint/member-ordering": "off",
                 "no-underscore-dangle": "off",
-                "@typescript-eslint/naming-convention": "off"
+                "@typescript-eslint/naming-convention": "off",
+                "jsdoc/newline-after-description": 0
             }
         },
         {

ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.scss

@@ -63,7 +63,9 @@
             height: 18px;
             background: #305680;
             mask-image: url(/assets/copy-code-icon.svg);
+            -webkit-mask-image: url(/assets/copy-code-icon.svg);
             mask-repeat: no-repeat;
+            -webkit-mask-repeat: no-repeat;
           }
         }
       }

ui-ngx/src/app/modules/home/components/widget/lib/indicator/battery-level-widget.component.scss

@@ -73,8 +73,11 @@
           position: absolute;
           inset: 0;
           mask-repeat: no-repeat;
+          -webkit-mask-repeat: no-repeat;
           mask-size: cover;
+          -webkit-mask-size: cover;
           mask-position: center;
+          -webkit-mask-position: center;
         }
         .tb-battery-level-container {
           position: absolute;
@@ -95,6 +98,7 @@
         &.vertical {
           .tb-battery-level-shape {
             mask-image: url(/assets/widget/battery-level/battery-shape-vertical.svg);
+            -webkit-mask-image: url(/assets/widget/battery-level/battery-shape-vertical.svg);
           }
           .tb-battery-level-container {
             flex-direction: column-reverse;
@@ -122,6 +126,7 @@
         &.horizontal {
           .tb-battery-level-shape {
             mask-image: url(/assets/widget/battery-level/battery-shape-horizontal.svg);
+            -webkit-mask-image: url(/assets/widget/battery-level/battery-shape-horizontal.svg);
           }
           .tb-battery-level-container {
             inset: 6.25% 8.85% 6.25% 3.54%;

ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.models.ts

@@ -444,7 +444,7 @@ class InnerShadowCircle {
       add.x('-50%').y('-50%').width('200%').height('200%');
       let effect: Effect = add.componentTransfer(components => {
         components.funcA({ type: 'table', tableValues: '1 0' });
-      }).in(add.$fill);
+      });
       effect = effect.gaussianBlur(this.blur, this.blur).attr({stdDeviation: this.blur});
       this.blurEffect = effect;
       effect = effect.offset(this.dx, this.dy);
@@ -454,7 +454,7 @@ class InnerShadowCircle {
       effect = effect.composite(this.offsetEffect, 'in');
       effect.composite(add.$sourceAlpha, 'in');
       add.merge(m => {
-        m.mergeNode(add.$fill);
+        m.mergeNode();
         m.mergeNode();
       });
     });
@@ -538,14 +538,14 @@ class DefaultPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 
@@ -602,14 +602,14 @@ class SimplifiedPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 }
@@ -674,7 +674,7 @@ class OutlinedPowerButtonShape extends PowerButtonShape {
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 0.98});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
@@ -682,7 +682,7 @@ class OutlinedPowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 }
@@ -774,14 +774,14 @@ class DefaultVolumePowerButtonShape extends PowerButtonShape {
     this.innerShadow.show();
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.innerShadow.animate(6, 0.6);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.innerShadow.animateRestore().after(() => {
       if (this.disabled) {
         this.innerShadow.hide();
@@ -849,14 +849,14 @@ class SimplifiedVolumePowerButtonShape extends PowerButtonShape {
       this.backgroundShape.removeClass('tb-shadow');
     }
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
-    powerButtonAnimation(this.onCenterGroup).transform({scale: pressedScale});
+    powerButtonAnimation(this.onCenterGroup).transform({scale: pressedScale, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(8, 0.4);
   }
 
   protected onPressEnd() {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
-    powerButtonAnimation(this.onCenterGroup).transform({scale: 1});
+    powerButtonAnimation(this.onCenterGroup).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore().after(() => {
       if (!this.value) {
         this.backgroundShape.addClass('tb-shadow');
@@ -938,7 +938,7 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
     const pressedScale = 0.75;
     powerButtonAnimation(this.centerGroup).transform({scale: pressedScale});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 0.98});
-    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98});
+    powerButtonAnimation(this.onLabelShape).transform({scale: pressedScale / 0.98, origin: {x: cx, y: cy}});
     this.pressedShadow.animate(6, 0.6);
   }
 
@@ -946,7 +946,7 @@ class OutlinedVolumePowerButtonShape extends PowerButtonShape {
     this.pressedTimeline.finish();
     powerButtonAnimation(this.centerGroup).transform({scale: 1});
     powerButtonAnimation(this.onCenterGroup).transform({scale: 1});
-    powerButtonAnimation(this.onLabelShape).transform({scale: 1});
+    powerButtonAnimation(this.onLabelShape).transform({scale: 1, origin: {x: cx, y: cy}});
     this.pressedShadow.animateRestore();
   }
 

ui-ngx/src/app/modules/home/pages/device/device-check-connectivity-dialog.component.scss

@@ -155,7 +155,9 @@
             height: 18px;
             background: #305680;
             mask-image: url(/assets/copy-code-icon.svg);
+            -webkit-mask-image: url(/assets/copy-code-icon.svg);
             mask-repeat: no-repeat;
+            -webkit-mask-repeat: no-repeat;
           }
         }
       }

ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.scss

@@ -92,7 +92,9 @@
             height: 18px;
             background: $tb-primary-color;
             mask-image: url(/assets/copy-code-icon.svg);
+            -webkit-mask-image: url(/assets/copy-code-icon.svg);
             mask-repeat: no-repeat;
+            -webkit-mask-repeat: no-repeat;
           }
         }
         &.multiline {

ui-ngx/src/app/shared/components/time/timeinterval.component.ts

@@ -21,6 +21,7 @@ import { coerceNumberProperty } from '@angular/cdk/coercion';
 import { SubscriptSizing } from '@angular/material/form-field';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { Interval, IntervalMath, TimeInterval } from '@shared/models/time/time.models';
+import { isDefined } from '@core/utils';
 
 @Component({
   selector: 'tb-timeinterval',
@@ -90,14 +91,17 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
   secs = 0;
 
   interval: Interval = 0;
-  modelValue: Interval;
-
-  advanced = false;
-  rendered = false;
-
   intervals: Array<TimeInterval>;
 
-  private propagateChange = (_: any) => {};
+  advanced = false;
+
+  private modelValue: Interval;
+  private rendered = false;
+  private propagateChangeValue: any;
+
+  private propagateChange = (value: any) => {
+    this.propagateChangeValue = value;
+  };
 
   constructor(private timeService: TimeService) {
   }
@@ -108,6 +112,9 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
 
   registerOnChange(fn: any): void {
     this.propagateChange = fn;
+    if (isDefined(this.propagateChangeValue)) {
+      this.propagateChange(this.propagateChangeValue);
+    }
   }
 
   registerOnTouched(fn: any): void {
@@ -132,7 +139,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  setInterval(interval: Interval) {
+  private setInterval(interval: Interval) {
     if (!this.advanced) {
       this.interval = interval;
     }
@@ -143,7 +150,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.secs = intervalSeconds % 60;
   }
 
-  boundInterval(updateToPreferred = false) {
+  private boundInterval(updateToPreferred = false) {
     const min = this.timeService.boundMinInterval(this.minValue);
     const max = this.timeService.boundMaxInterval(this.maxValue);
     this.intervals = this.timeService.getIntervals(this.minValue, this.maxValue, this.useCalendarIntervals);
@@ -165,7 +172,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  updateView(updateToPreferred = false) {
+  private updateView(updateToPreferred = false) {
     if (!this.rendered) {
       return;
     }
@@ -187,7 +194,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.boundInterval(updateToPreferred);
   }
 
-  calculateIntervalMs(): number {
+  private calculateIntervalMs(): number {
     return (this.days * 86400 +
       this.hours * 3600 +
       this.mins * 60 +
@@ -232,7 +239,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  onSecsChange() {
+  private onSecsChange() {
     if (typeof this.secs === 'undefined') {
       return;
     }
@@ -252,7 +259,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.updateView();
   }
 
-  onMinsChange() {
+  private onMinsChange() {
     if (typeof this.mins === 'undefined') {
       return;
     }
@@ -272,7 +279,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.updateView();
   }
 
-  onHoursChange() {
+  private onHoursChange() {
     if (typeof this.hours === 'undefined') {
       return;
     }
@@ -292,7 +299,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
     this.updateView();
   }
 
-  onDaysChange() {
+  private onDaysChange() {
     if (typeof this.days === 'undefined') {
       return;
     }

ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts

@@ -20,7 +20,6 @@ import {
   AggregationType,
   DAY,
   HistoryWindowType,
-  QuickTimeInterval,
   quickTimeIntervalPeriod,
   RealtimeWindowType,
   Timewindow,

ui-ngx/src/form.scss

@@ -588,9 +588,13 @@
       bottom: 0;
       background: $tb-primary-color;
       mask-image: url(/assets/home/no_data_folder_bg.svg);
+      -webkit-mask-image: url(/assets/home/no_data_folder_bg.svg);
       mask-repeat: no-repeat;
+      -webkit-mask-repeat: no-repeat;
       mask-size: contain;
+      -webkit-mask-size: contain;
       mask-position: center;
+      -webkit-mask-position: center;
     }
   }