Merge with develop/3.5.2

application/pom.xml

@@ -354,6 +354,10 @@
             <groupId>com.slack.api</groupId>
             <artifactId>slack-api-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.oauth-client</groupId>
+            <artifactId>google-oauth-client</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

application/src/main/data/upgrade/3.5.0/schema_update.sql

@@ -0,0 +1,23 @@
+--
+-- Copyright © 2016-2023 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.
+--
+
+-- FIX DASHBOARD TEMPLATES AFTER ANGULAR MIGRATION TO VER.15
+
+UPDATE dashboard SET configuration = REPLACE(configuration, 'mat-button mat-icon-button', 'mat-icon-button')
+        WHERE configuration like '%mat-button mat-icon-button%';
+
+UPDATE widget_type SET descriptor = REPLACE(descriptor, 'mat-button mat-icon-button', 'mat-icon-button')
+        WHERE descriptor like '%mat-button mat-icon-button%';

application/src/main/data/upgrade/3.5.1/schema_update.sql

@@ -52,3 +52,10 @@ $$
 $$;
 
 -- NOTIFICATION CONFIGS VERSION CONTROL END
+
+ALTER TABLE resource
+    ADD COLUMN IF NOT EXISTS etag varchar;
+
+UPDATE resource
+    SET etag = encode(sha256(decode(resource.data, 'base64')),'hex') WHERE resource.data is not null;
+

application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@@ -90,7 +90,7 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.queue.discovery.DiscoveryService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.component.ComponentDiscoveryService;

application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java

@@ -59,10 +59,10 @@ public class DeviceActor extends ContextAwareActor {
     protected boolean doProcess(TbActorMsg msg) {
         switch (msg.getMsgType()) {
             case TRANSPORT_TO_DEVICE_ACTOR_MSG:
-                processor.process(ctx, (TransportToDeviceActorMsgWrapper) msg);
+                processor.process((TransportToDeviceActorMsgWrapper) msg);
                 break;
             case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG:
-                processor.processAttributesUpdate(ctx, (DeviceAttributesEventNotificationMsg) msg);
+                processor.processAttributesUpdate((DeviceAttributesEventNotificationMsg) msg);
                 break;
             case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG:
                 processor.processCredentialsUpdate(msg);
@@ -74,10 +74,10 @@ public class DeviceActor extends ContextAwareActor {
                 processor.processRpcRequest(ctx, (ToDeviceRpcRequestActorMsg) msg);
                 break;
             case DEVICE_RPC_RESPONSE_TO_DEVICE_ACTOR_MSG:
-                processor.processRpcResponsesFromEdge(ctx, (FromDeviceRpcResponseActorMsg) msg);
+                processor.processRpcResponsesFromEdge((FromDeviceRpcResponseActorMsg) msg);
                 break;
             case DEVICE_ACTOR_SERVER_SIDE_RPC_TIMEOUT_MSG:
-                processor.processServerSideRpcTimeout(ctx, (DeviceActorServerSideRpcTimeoutMsg) msg);
+                processor.processServerSideRpcTimeout((DeviceActorServerSideRpcTimeoutMsg) msg);
                 break;
             case SESSION_TIMEOUT_MSG:
                 processor.checkSessionsTimeout();
@@ -86,7 +86,7 @@ public class DeviceActor extends ContextAwareActor {
                 processor.processEdgeUpdate((DeviceEdgeUpdateMsg) msg);
                 break;
             case REMOVE_RPC_TO_DEVICE_ACTOR_MSG:
-                processor.processRemoveRpc(ctx, (RemoveRpcActorMsg) msg);
+                processor.processRemoveRpc((RemoveRpcActorMsg) msg);
                 break;
             default:
                 return false;

application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java

@@ -83,7 +83,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.SubscriptionInfoProt
 import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcResponseStatusMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportUpdateCredentialsProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportToDeviceActorMsg;
@@ -182,13 +181,15 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
 
     void processRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg) {
         ToDeviceRpcRequest request = msg.getMsg();
+        UUID rpcId = request.getId();
+        log.debug("[{}][{}] Received RPC request to process ...", deviceId, rpcId);
         ToDeviceRpcRequestMsg rpcRequest = creteToDeviceRpcRequestMsg(request);
 
         long timeout = request.getExpirationTime() - System.currentTimeMillis();
         boolean persisted = request.isPersisted();
 
         if (timeout <= 0) {
-            log.debug("[{}][{}] Ignoring message due to exp time reached, {}", deviceId, request.getId(), request.getExpirationTime());
+            log.debug("[{}][{}] Ignoring message due to exp time reached, {}", deviceId, rpcId, request.getExpirationTime());
             if (persisted) {
                 createRpc(request, RpcStatus.EXPIRED);
             }
@@ -198,21 +199,23 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         }
 
         boolean sent = false;
+        int requestId = rpcRequest.getRequestId();
         if (systemContext.isEdgesEnabled() && edgeId != null) {
-            log.debug("[{}][{}] device is related to edge [{}]. Saving RPC request to edge queue", tenantId, deviceId, edgeId.getId());
+            log.debug("[{}][{}] device is related to edge: [{}]. Saving RPC request: [{}][{}] to edge queue", tenantId, deviceId, edgeId.getId(), rpcId, requestId);
             try {
-                saveRpcRequestToEdgeQueue(request, rpcRequest.getRequestId()).get();
+                saveRpcRequestToEdgeQueue(request, requestId).get();
                 sent = true;
             } catch (InterruptedException | ExecutionException e) {
-                log.error("[{}][{}][{}] Failed to save rpc request to edge queue {}", tenantId, deviceId, edgeId.getId(), request, e);
+                log.error("[{}][{}][{}] Failed to save RPC request to edge queue {}", tenantId, deviceId, edgeId.getId(), request, e);
             }
         } else if (isSendNewRpcAvailable()) {
             sent = rpcSubscriptions.size() > 0;
             Set<UUID> syncSessionSet = new HashSet<>();
-            rpcSubscriptions.forEach((key, value) -> {
-                sendToTransport(rpcRequest, key, value.getNodeId());
-                if (SessionType.SYNC == value.getType()) {
-                    syncSessionSet.add(key);
+            rpcSubscriptions.forEach((sessionId, sessionInfo) -> {
+                log.debug("[{}][{}][{}][{}] send RPC request to transport ...", deviceId, sessionId, rpcId, requestId);
+                sendToTransport(rpcRequest, sessionId, sessionInfo.getNodeId());
+                if (SessionType.SYNC == sessionInfo.getType()) {
+                    syncSessionSet.add(sessionId);
                 }
             });
             log.trace("Rpc syncSessionSet [{}] subscription after sent [{}]", syncSessionSet, rpcSubscriptions);
@@ -221,20 +224,20 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
 
         if (persisted) {
             ObjectNode response = JacksonUtil.newObjectNode();
-            response.put("rpcId", request.getId().toString());
+            response.put("rpcId", rpcId.toString());
             systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(msg.getMsg().getId(), JacksonUtil.toString(response), null));
         }
 
         if (!persisted && request.isOneway() && sent) {
-            log.debug("[{}] Rpc command response sent [{}]!", deviceId, request.getId());
+            log.debug("[{}] RPC command response sent [{}][{}]!", deviceId, rpcId, requestId);
             systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(msg.getMsg().getId(), null, null));
         } else {
             registerPendingRpcRequest(context, msg, sent, rpcRequest, timeout);
         }
         if (sent) {
-            log.debug("[{}] RPC request {} is sent!", deviceId, request.getId());
+            log.debug("[{}][{}][{}] RPC request is sent!", deviceId, rpcId, requestId);
         } else {
-            log.debug("[{}] RPC request {} is NOT sent!", deviceId, request.getId());
+            log.debug("[{}][{}][{}] RPC request is NOT sent!", deviceId, rpcId, requestId);
         }
     }
 
@@ -242,7 +245,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         return !rpcSequential || toDeviceRpcPendingMap.values().stream().filter(md -> !md.isDelivered()).findAny().isEmpty();
     }
 
-    private Rpc createRpc(ToDeviceRpcRequest request, RpcStatus status) {
+    private void createRpc(ToDeviceRpcRequest request, RpcStatus status) {
         Rpc rpc = new Rpc(new RpcId(request.getId()));
         rpc.setCreatedTime(System.currentTimeMillis());
         rpc.setTenantId(tenantId);
@@ -251,7 +254,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         rpc.setRequest(JacksonUtil.valueToTree(request));
         rpc.setStatus(status);
         rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
-        return systemContext.getTbRpcService().save(tenantId, rpc);
+        systemContext.getTbRpcService().save(tenantId, rpc);
     }
 
     private ToDeviceRpcRequestMsg creteToDeviceRpcRequestMsg(ToDeviceRpcRequest request) {
@@ -268,82 +271,92 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 .build();
     }
 
-    void processRpcResponsesFromEdge(TbActorCtx context, FromDeviceRpcResponseActorMsg responseMsg) {
-        log.debug("[{}] Processing rpc command response from edge session", deviceId);
+    void processRpcResponsesFromEdge(FromDeviceRpcResponseActorMsg responseMsg) {
+        log.debug("[{}] Processing RPC command response from edge session", deviceId);
         ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
         boolean success = requestMd != null;
         if (success) {
             systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(responseMsg.getMsg());
         } else {
-            log.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId());
+            log.debug("[{}] RPC command response [{}] is stale!", deviceId, responseMsg.getRequestId());
         }
     }
 
-    void processRemoveRpc(TbActorCtx context, RemoveRpcActorMsg msg) {
-        log.debug("[{}] Processing remove rpc command", msg.getRequestId());
+    void processRemoveRpc(RemoveRpcActorMsg msg) {
+        UUID requestId = msg.getRequestId();
+        log.debug("[{}][{}] Received remove RPC request ...", deviceId, requestId);
         Map.Entry<Integer, ToDeviceRpcRequestMetadata> entry = null;
         for (Map.Entry<Integer, ToDeviceRpcRequestMetadata> e : toDeviceRpcPendingMap.entrySet()) {
-            if (e.getValue().getMsg().getMsg().getId().equals(msg.getRequestId())) {
+            if (e.getValue().getMsg().getMsg().getId().equals(requestId)) {
                 entry = e;
                 break;
             }
         }
 
         if (entry != null) {
+            Integer key = entry.getKey();
             if (entry.getValue().isDelivered()) {
-                toDeviceRpcPendingMap.remove(entry.getKey());
+                toDeviceRpcPendingMap.remove(key);
             } else {
                 Optional<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> firstRpc = getFirstRpc();
-                if (firstRpc.isPresent() && entry.getKey().equals(firstRpc.get().getKey())) {
-                    toDeviceRpcPendingMap.remove(entry.getKey());
-                    sendNextPendingRequest(context);
+                if (firstRpc.isPresent() && key.equals(firstRpc.get().getKey())) {
+                    toDeviceRpcPendingMap.remove(key);
+                    log.debug("[{}][{}][{}] Removed pending RPC! Going to send next pending request ...", deviceId, requestId, key);
+                    sendNextPendingRequest();
                 } else {
-                    toDeviceRpcPendingMap.remove(entry.getKey());
+                    toDeviceRpcPendingMap.remove(key);
                 }
             }
         }
     }
 
     private void registerPendingRpcRequest(TbActorCtx context, ToDeviceRpcRequestActorMsg msg, boolean sent, ToDeviceRpcRequestMsg rpcRequest, long timeout) {
-        toDeviceRpcPendingMap.put(rpcRequest.getRequestId(), new ToDeviceRpcRequestMetadata(msg, sent));
-        DeviceActorServerSideRpcTimeoutMsg timeoutMsg = new DeviceActorServerSideRpcTimeoutMsg(rpcRequest.getRequestId(), timeout);
+        int requestId = rpcRequest.getRequestId();
+        UUID rpcId = new UUID(rpcRequest.getRequestIdMSB(), rpcRequest.getRequestIdLSB());
+        log.debug("[{}][{}][{}] Registering pending RPC request...", deviceId, rpcId, requestId);
+        toDeviceRpcPendingMap.put(requestId, new ToDeviceRpcRequestMetadata(msg, sent));
+        DeviceActorServerSideRpcTimeoutMsg timeoutMsg = new DeviceActorServerSideRpcTimeoutMsg(requestId, timeout);
         scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout());
     }
 
-    void processServerSideRpcTimeout(TbActorCtx context, DeviceActorServerSideRpcTimeoutMsg msg) {
-        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(msg.getId());
+    void processServerSideRpcTimeout(DeviceActorServerSideRpcTimeoutMsg msg) {
+        Integer requestId = msg.getId();
+        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(requestId);
         if (requestMd != null) {
-            log.debug("[{}] RPC request [{}] timeout detected!", deviceId, msg.getId());
-            if (requestMd.getMsg().getMsg().isPersisted()) {
-                systemContext.getTbRpcService().save(tenantId, new RpcId(requestMd.getMsg().getMsg().getId()), RpcStatus.EXPIRED, null);
+            ToDeviceRpcRequest toDeviceRpcRequest = requestMd.getMsg().getMsg();
+            UUID rpcId = toDeviceRpcRequest.getId();
+            log.debug("[{}][{}][{}] RPC request timeout detected!", deviceId, rpcId, requestId);
+            if (toDeviceRpcRequest.isPersisted()) {
+                systemContext.getTbRpcService().save(tenantId, new RpcId(rpcId), RpcStatus.EXPIRED, null);
             }
-            systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(),
+            systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(rpcId,
                     null, requestMd.isSent() ? RpcError.TIMEOUT : RpcError.NO_ACTIVE_CONNECTION));
             if (!requestMd.isDelivered()) {
-                sendNextPendingRequest(context);
+                log.debug("[{}][{}][{}] Pending RPC timeout detected! Going to send next pending request ...", deviceId, rpcId, requestId);
+                sendNextPendingRequest();
             }
         }
     }
 
-    private void sendPendingRequests(TbActorCtx context, UUID sessionId, String nodeId) {
+    private void sendPendingRequests(UUID sessionId, String nodeId) {
         SessionType sessionType = getSessionType(sessionId);
         if (!toDeviceRpcPendingMap.isEmpty()) {
-            log.debug("[{}] Pushing {} pending RPC messages to new async session [{}]", deviceId, toDeviceRpcPendingMap.size(), sessionId);
+            log.debug("[{}] Pushing {} pending RPC messages to session: [{}]", deviceId, sessionId, toDeviceRpcPendingMap.size());
             if (sessionType == SessionType.SYNC) {
-                log.debug("[{}] Cleanup sync rpc session [{}]", deviceId, sessionId);
+                log.debug("[{}] Cleanup sync RPC session [{}]", deviceId, sessionId);
                 rpcSubscriptions.remove(sessionId);
             }
         } else {
-            log.debug("[{}] No pending RPC messages for new async session [{}]", deviceId, sessionId);
+            log.debug("[{}] No pending RPC messages for session: [{}]", deviceId, sessionId);
         }
         Set<Integer> sentOneWayIds = new HashSet<>();
 
         if (rpcSequential) {
-            getFirstRpc().ifPresent(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+            getFirstRpc().ifPresent(processPendingRpc(sessionId, nodeId, sentOneWayIds));
         } else if (sessionType == SessionType.ASYNC) {
-            toDeviceRpcPendingMap.entrySet().forEach(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+            toDeviceRpcPendingMap.entrySet().forEach(processPendingRpc(sessionId, nodeId, sentOneWayIds));
         } else {
-            toDeviceRpcPendingMap.entrySet().stream().findFirst().ifPresent(processPendingRpc(context, sessionId, nodeId, sentOneWayIds));
+            toDeviceRpcPendingMap.entrySet().stream().findFirst().ifPresent(processPendingRpc(sessionId, nodeId, sentOneWayIds));
         }
 
         sentOneWayIds.stream().filter(id -> !toDeviceRpcPendingMap.get(id).getMsg().getMsg().isPersisted()).forEach(toDeviceRpcPendingMap::remove);
@@ -353,35 +366,38 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         return toDeviceRpcPendingMap.entrySet().stream().filter(e -> !e.getValue().isDelivered()).findFirst();
     }
 
-    private void sendNextPendingRequest(TbActorCtx context) {
+    private void sendNextPendingRequest() {
         if (rpcSequential) {
-            rpcSubscriptions.forEach((id, s) -> sendPendingRequests(context, id, s.getNodeId()));
+            rpcSubscriptions.forEach((id, s) -> sendPendingRequests(id, s.getNodeId()));
         }
     }
 
-    private Consumer<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> processPendingRpc(TbActorCtx context, UUID sessionId, String nodeId, Set<Integer> sentOneWayIds) {
+    private Consumer<Map.Entry<Integer, ToDeviceRpcRequestMetadata>> processPendingRpc(UUID sessionId, String nodeId, Set<Integer> sentOneWayIds) {
         return entry -> {
             ToDeviceRpcRequest request = entry.getValue().getMsg().getMsg();
             ToDeviceRpcRequestBody body = request.getBody();
+            Integer requestId = entry.getKey();
+            UUID rpcId = request.getId();
             if (request.isOneway() && !rpcSequential) {
-                sentOneWayIds.add(entry.getKey());
-                systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(request.getId(), null, null));
+                sentOneWayIds.add(requestId);
+                systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(rpcId, null, null));
             }
             ToDeviceRpcRequestMsg rpcRequest = ToDeviceRpcRequestMsg.newBuilder()
-                    .setRequestId(entry.getKey())
+                    .setRequestId(requestId)
                     .setMethodName(body.getMethod())
                     .setParams(body.getParams())
                     .setExpirationTime(request.getExpirationTime())
-                    .setRequestIdMSB(request.getId().getMostSignificantBits())
-                    .setRequestIdLSB(request.getId().getLeastSignificantBits())
+                    .setRequestIdMSB(rpcId.getMostSignificantBits())
+                    .setRequestIdLSB(rpcId.getLeastSignificantBits())
                     .setOneway(request.isOneway())
                     .setPersisted(request.isPersisted())
                     .build();
+            log.debug("[{}][{}][{}][{}] Send pending RPC request to transport ...", deviceId, sessionId, rpcId, requestId);
             sendToTransport(rpcRequest, sessionId, nodeId);
         };
     }
 
-    void process(TbActorCtx context, TransportToDeviceActorMsgWrapper wrapper) {
+    void process(TransportToDeviceActorMsgWrapper wrapper) {
         TransportToDeviceActorMsg msg = wrapper.getMsg();
         TbCallback callback = wrapper.getCallback();
         var sessionInfo = msg.getSessionInfo();
@@ -390,36 +406,36 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
             processSessionStateMsgs(sessionInfo, msg.getSessionEvent());
         }
         if (msg.hasSubscribeToAttributes()) {
-            processSubscriptionCommands(context, sessionInfo, msg.getSubscribeToAttributes());
+            processSubscriptionCommands(sessionInfo, msg.getSubscribeToAttributes());
         }
         if (msg.hasSubscribeToRPC()) {
-            processSubscriptionCommands(context, sessionInfo, msg.getSubscribeToRPC());
+            processSubscriptionCommands(sessionInfo, msg.getSubscribeToRPC());
         }
         if (msg.hasSendPendingRPC()) {
-            sendPendingRequests(context, getSessionId(sessionInfo), sessionInfo.getNodeId());
+            sendPendingRequests(getSessionId(sessionInfo), sessionInfo.getNodeId());
         }
         if (msg.hasGetAttributes()) {
-            handleGetAttributesRequest(context, sessionInfo, msg.getGetAttributes());
+            handleGetAttributesRequest(sessionInfo, msg.getGetAttributes());
         }
         if (msg.hasToDeviceRPCCallResponse()) {
-            processRpcResponses(context, sessionInfo, msg.getToDeviceRPCCallResponse());
+            processRpcResponses(sessionInfo, msg.getToDeviceRPCCallResponse());
         }
         if (msg.hasSubscriptionInfo()) {
-            handleSessionActivity(context, sessionInfo, msg.getSubscriptionInfo());
+            handleSessionActivity(sessionInfo, msg.getSubscriptionInfo());
         }
         if (msg.hasClaimDevice()) {
-            handleClaimDeviceMsg(context, sessionInfo, msg.getClaimDevice());
+            handleClaimDeviceMsg(msg.getClaimDevice());
         }
         if (msg.hasRpcResponseStatusMsg()) {
-            processRpcResponseStatus(context, sessionInfo, msg.getRpcResponseStatusMsg());
+            processRpcResponseStatus(sessionInfo, msg.getRpcResponseStatusMsg());
         }
         if (msg.hasUplinkNotificationMsg()) {
-            processUplinkNotificationMsg(context, sessionInfo, msg.getUplinkNotificationMsg());
+            processUplinkNotificationMsg(sessionInfo, msg.getUplinkNotificationMsg());
         }
         callback.onSuccess();
     }
 
-    private void processUplinkNotificationMsg(TbActorCtx context, SessionInfoProto sessionInfo, TransportProtos.UplinkNotificationMsg uplinkNotificationMsg) {
+    private void processUplinkNotificationMsg(SessionInfoProto sessionInfo, TransportProtos.UplinkNotificationMsg uplinkNotificationMsg) {
         String nodeId = sessionInfo.getNodeId();
         sessions.entrySet().stream()
                 .filter(kv -> kv.getValue().getSessionInfo().getNodeId().equals(nodeId) && (kv.getValue().isSubscribedToAttributes() || kv.getValue().isSubscribedToRPC()))
@@ -433,7 +449,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 });
     }
 
-    private void handleClaimDeviceMsg(TbActorCtx context, SessionInfoProto sessionInfo, ClaimDeviceMsg msg) {
+    private void handleClaimDeviceMsg(ClaimDeviceMsg msg) {
         DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
         systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
     }
@@ -446,7 +462,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         systemContext.getDeviceStateService().onDeviceDisconnect(tenantId, deviceId);
     }
 
-    private void handleGetAttributesRequest(TbActorCtx context, SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
+    private void handleGetAttributesRequest(SessionInfoProto sessionInfo, GetAttributeRequestMsg request) {
         int requestId = request.getRequestId();
         if (request.getOnlyShared()) {
             Futures.addCallback(findAllAttributesByScope(DataConstants.SHARED_SCOPE), new FutureCallback<>() {
@@ -530,7 +546,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         return sessions.containsKey(sessionId) ? SessionType.ASYNC : SessionType.SYNC;
     }
 
-    void processAttributesUpdate(TbActorCtx context, DeviceAttributesEventNotificationMsg msg) {
+    void processAttributesUpdate(DeviceAttributesEventNotificationMsg msg) {
         if (attributeSubscriptions.size() > 0) {
             boolean hasNotificationData = false;
             AttributeUpdateNotificationMsg.Builder notification = AttributeUpdateNotificationMsg.newBuilder();
@@ -567,19 +583,21 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         }
     }
 
-    private void processRpcResponses(TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg responseMsg) {
+    private void processRpcResponses(SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg responseMsg) {
         UUID sessionId = getSessionId(sessionInfo);
-        log.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId);
-        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+        log.debug("[{}][{}] Processing RPC command response: {}", deviceId, sessionId, responseMsg);
+        int requestId = responseMsg.getRequestId();
+        ToDeviceRpcRequestMetadata requestMd = toDeviceRpcPendingMap.remove(requestId);
         boolean success = requestMd != null;
         if (success) {
+            ToDeviceRpcRequest toDeviceRequestMsg = requestMd.getMsg().getMsg();
+            boolean delivered = requestMd.isDelivered();
             boolean hasError = StringUtils.isNotEmpty(responseMsg.getError());
             try {
                 String payload = hasError ? responseMsg.getError() : responseMsg.getPayload();
                 systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(
-                        new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(),
-                                payload, null));
-                if (requestMd.getMsg().getMsg().isPersisted()) {
+                        new FromDeviceRpcResponse(toDeviceRequestMsg.getId(), payload, null));
+                if (toDeviceRequestMsg.isPersisted()) {
                     RpcStatus status = hasError ? RpcStatus.FAILED : RpcStatus.SUCCESSFUL;
                     JsonNode response;
                     try {
@@ -587,28 +605,33 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                     } catch (IllegalArgumentException e) {
                         response = JacksonUtil.newObjectNode().put("error", payload);
                     }
-                    systemContext.getTbRpcService().save(tenantId, new RpcId(requestMd.getMsg().getMsg().getId()), status, response);
+                    systemContext.getTbRpcService().save(tenantId, new RpcId(toDeviceRequestMsg.getId()), status, response);
                 }
             } finally {
-                if (hasError && !requestMd.isDelivered()) {
-                    sendNextPendingRequest(context);
+                if (!delivered) {
+                    String errorResponse = hasError ? "error" : "";
+                    log.debug("[{}][{}][{}] Received {} response for undelivered RPC! Going to send next pending request ...", deviceId, sessionId, requestId, errorResponse);
+                    sendNextPendingRequest();
                 }
             }
         } else {
-            log.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId());
+            log.debug("[{}][{}][{}] RPC command response is stale!", deviceId, sessionId, requestId);
         }
     }
 
-    private void processRpcResponseStatus(TbActorCtx context, SessionInfoProto sessionInfo, ToDeviceRpcResponseStatusMsg responseMsg) {
+    private void processRpcResponseStatus(SessionInfoProto sessionInfo, ToDeviceRpcResponseStatusMsg responseMsg) {
         UUID rpcId = new UUID(responseMsg.getRequestIdMSB(), responseMsg.getRequestIdLSB());
         RpcStatus status = RpcStatus.valueOf(responseMsg.getStatus());
-        ToDeviceRpcRequestMetadata md = toDeviceRpcPendingMap.get(responseMsg.getRequestId());
+        UUID sessionId = getSessionId(sessionInfo);
+        int requestId = responseMsg.getRequestId();
+        log.debug("[{}][{}][{}][{}] Processing RPC command response status: [{}]", deviceId, sessionId, rpcId, requestId, status);
+        ToDeviceRpcRequestMetadata md = toDeviceRpcPendingMap.get(requestId);
 
         if (md != null) {
             JsonNode response = null;
             if (status.equals(RpcStatus.DELIVERED)) {
                 if (md.getMsg().getMsg().isOneway()) {
-                    toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+                    toDeviceRpcPendingMap.remove(requestId);
                     if (rpcSequential) {
                         systemContext.getTbCoreDeviceRpcService().processRpcResponseFromDeviceActor(new FromDeviceRpcResponse(rpcId, null, null));
                     }
@@ -619,7 +642,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 Integer maxRpcRetries = md.getMsg().getMsg().getRetries();
                 maxRpcRetries = maxRpcRetries == null ? systemContext.getMaxRpcRetries() : Math.min(maxRpcRetries, systemContext.getMaxRpcRetries());
                 if (maxRpcRetries <= md.getRetries()) {
-                    toDeviceRpcPendingMap.remove(responseMsg.getRequestId());
+                    toDeviceRpcPendingMap.remove(requestId);
                     status = RpcStatus.FAILED;
                     response = JacksonUtil.newObjectNode().put("error", "There was a Timeout and all retry attempts have been exhausted. Retry attempts set: " + maxRpcRetries);
                 } else {
@@ -631,17 +654,18 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 systemContext.getTbRpcService().save(tenantId, new RpcId(rpcId), status, response);
             }
             if (status != RpcStatus.SENT) {
-                sendNextPendingRequest(context);
+                log.debug("[{}][{}][{}][{}] RPC was {}! Going to send next pending request ...", deviceId, sessionId, rpcId, requestId, status.name().toLowerCase());
+                sendNextPendingRequest();
             }
         } else {
-            log.info("[{}][{}] Rpc has already removed from pending map.", deviceId, rpcId);
+            log.warn("[{}][{}][{}][{}] RPC has already been removed from pending map.", deviceId, sessionId, rpcId, requestId);
         }
     }
 
-    private void processSubscriptionCommands(TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg subscribeCmd) {
+    private void processSubscriptionCommands(SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg subscribeCmd) {
         UUID sessionId = getSessionId(sessionInfo);
         if (subscribeCmd.getUnsubscribe()) {
-            log.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId);
+            log.debug("[{}] Canceling attributes subscription for session: [{}]", deviceId, sessionId);
             attributeSubscriptions.remove(sessionId);
         } else {
             SessionInfoMetaData sessionMD = sessions.get(sessionId);
@@ -649,7 +673,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 sessionMD = new SessionInfoMetaData(new SessionInfo(subscribeCmd.getSessionType(), sessionInfo.getNodeId()));
             }
             sessionMD.setSubscribedToAttributes(true);
-            log.debug("[{}] Registering attributes subscription for session [{}]", deviceId, sessionId);
+            log.debug("[{}] Registering attributes subscription for session: [{}]", deviceId, sessionId);
             attributeSubscriptions.put(sessionId, sessionMD.getSessionInfo());
             dumpSessions();
         }
@@ -659,10 +683,10 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         return new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
     }
 
-    private void processSubscriptionCommands(TbActorCtx context, SessionInfoProto sessionInfo, SubscribeToRPCMsg subscribeCmd) {
+    private void processSubscriptionCommands(SessionInfoProto sessionInfo, SubscribeToRPCMsg subscribeCmd) {
         UUID sessionId = getSessionId(sessionInfo);
         if (subscribeCmd.getUnsubscribe()) {
-            log.debug("[{}] Canceling rpc subscription for session [{}]", deviceId, sessionId);
+            log.debug("[{}] Canceling RPC subscription for session: [{}]", deviceId, sessionId);
             rpcSubscriptions.remove(sessionId);
         } else {
             SessionInfoMetaData sessionMD = sessions.get(sessionId);
@@ -670,9 +694,9 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
                 sessionMD = new SessionInfoMetaData(new SessionInfo(subscribeCmd.getSessionType(), sessionInfo.getNodeId()));
             }
             sessionMD.setSubscribedToRPC(true);
-            log.debug("[{}] Registering rpc subscription for session [{}]", deviceId, sessionId);
             rpcSubscriptions.put(sessionId, sessionMD.getSessionInfo());
-            sendPendingRequests(context, sessionId, sessionInfo.getNodeId());
+            log.debug("[{}] Registered RPC subscription for session: [{}] Going to check for pending requests ...", deviceId, sessionId);
+            sendPendingRequests(sessionId, sessionInfo.getNodeId());
             dumpSessions();
         }
     }
@@ -682,10 +706,10 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         Objects.requireNonNull(sessionId);
         if (msg.getEvent() == SessionEvent.OPEN) {
             if (sessions.containsKey(sessionId)) {
-                log.debug("[{}] Received duplicate session open event [{}]", deviceId, sessionId);
+                log.debug("[{}][{}] Received duplicate session open event.", deviceId, sessionId);
                 return;
             }
-            log.debug("[{}] Processing new session [{}]. Current sessions size {}", deviceId, sessionId, sessions.size());
+            log.debug("[{}] Processing new session: [{}] Current sessions size: {}", deviceId, sessionId, sessions.size());
 
             sessions.put(sessionId, new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfo.getNodeId())));
             if (sessions.size() == 1) {
@@ -694,7 +718,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
             systemContext.getDeviceStateService().onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
             dumpSessions();
         } else if (msg.getEvent() == SessionEvent.CLOSED) {
-            log.debug("[{}] Canceling subscriptions for closed session [{}]", deviceId, sessionId);
+            log.debug("[{}][{}] Canceling subscriptions for closed session.", deviceId, sessionId);
             sessions.remove(sessionId);
             attributeSubscriptions.remove(sessionId);
             rpcSubscriptions.remove(sessionId);
@@ -705,7 +729,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         }
     }
 
-    private void handleSessionActivity(TbActorCtx context, SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
+    private void handleSessionActivity(SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
         UUID sessionId = getSessionId(sessionInfoProto);
         Objects.requireNonNull(sessionId);
 
@@ -742,7 +766,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
     }
 
     private void notifyTransportAboutClosedSessionMaxSessionsLimit(UUID sessionId, SessionInfoMetaData sessionMd) {
-        log.debug("remove eldest session (max concurrent sessions limit reached per device) sessionId [{}] sessionMd [{}]", sessionId, sessionMd);
+        log.debug("remove eldest session (max concurrent sessions limit reached per device) sessionId: [{}] sessionMd: [{}]", sessionId, sessionMd);
         notifyTransportAboutClosedSession(sessionId, sessionMd, "max concurrent sessions limit reached per device!");
     }
 
@@ -806,14 +830,6 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
         systemContext.getTbCoreToTransportService().process(nodeId, msg);
     }
 
-    private void sendToTransport(ToServerRpcResponseMsg rpcMsg, UUID sessionId, String nodeId) {
-        ToTransportMsg msg = ToTransportMsg.newBuilder()
-                .setSessionIdMSB(sessionId.getMostSignificantBits())
-                .setSessionIdLSB(sessionId.getLeastSignificantBits())
-                .setToServerResponse(rpcMsg).build();
-        systemContext.getTbCoreToTransportService().process(nodeId, msg);
-    }
-
     private ListenableFuture<Void> saveRpcRequestToEdgeQueue(ToDeviceRpcRequest msg, Integer requestId) {
         ObjectNode body = JacksonUtil.newObjectNode();
         body.put("requestId", requestId);
@@ -914,14 +930,14 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
             }
             log.debug("[{}] Restored session: {}", deviceId, sessionMD);
         }
-        log.debug("[{}] Restored sessions: {}, rpc subscriptions: {}, attribute subscriptions: {}", deviceId, sessions.size(), rpcSubscriptions.size(), attributeSubscriptions.size());
+        log.debug("[{}] Restored sessions: {}, RPC subscriptions: {}, attribute subscriptions: {}", deviceId, sessions.size(), rpcSubscriptions.size(), attributeSubscriptions.size());
     }
 
     private void dumpSessions() {
         if (systemContext.isLocalCacheType()) {
             return;
         }
-        log.debug("[{}] Dumping sessions: {}, rpc subscriptions: {}, attribute subscriptions: {} to cache", deviceId, sessions.size(), rpcSubscriptions.size(), attributeSubscriptions.size());
+        log.debug("[{}] Dumping sessions: {}, RPC subscriptions: {}, attribute subscriptions: {} to cache", deviceId, sessions.size(), rpcSubscriptions.size(), attributeSubscriptions.size());
         List<SessionSubscriptionInfoProto> sessionsList = new ArrayList<>(sessions.size());
         sessions.forEach((uuid, sessionMD) -> {
             if (sessionMD.getSessionInfo().getType() == SessionType.SYNC) {

application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java

@@ -49,7 +49,6 @@ import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.aware.DeviceAwareMsg;
 import org.thingsboard.server.common.msg.aware.RuleChainAwareMsg;
 import org.thingsboard.server.common.msg.edge.EdgeSessionMsg;
-import org.thingsboard.server.common.msg.notification.trigger.RuleEngineMsgTrigger;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.PartitionChangeMsg;
 import org.thingsboard.server.common.msg.queue.QueueToRuleEngineMsg;
@@ -211,10 +210,6 @@ public class TenantActor extends RuleChainManagerActor {
             log.trace("[{}] Ack message because Rule Engine is disabled", tenantId);
             tbMsg.getCallback().onSuccess();
         }
-        systemContext.getNotificationRuleProcessor().process(RuleEngineMsgTrigger.builder()
-                .tenantId(tenantId)
-                .msg(tbMsg)
-                .build());
     }
 
     private void onRuleChainMsg(RuleChainAwareMsg msg) {

application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java

@@ -77,6 +77,8 @@ public class ThingsboardSecurityConfiguration {
     protected static final String[] NON_TOKEN_BASED_AUTH_ENTRY_POINTS = new String[] {"/index.html", "/assets/**", "/static/**", "/api/noauth/**", "/webjars/**",  "/api/license/**"};
     public static final String TOKEN_BASED_AUTH_ENTRY_POINT = "/api/**";
     public static final String WS_TOKEN_BASED_AUTH_ENTRY_POINT = "/api/ws/**";
+    public static final String MAIL_OAUTH2_PROCESSING_ENTRY_POINT = "/api/admin/mail/oauth2/code";
+
 
     @Autowired private ThingsboardErrorResponseHandler restAccessDeniedHandler;
 
@@ -134,7 +136,7 @@ public class ThingsboardSecurityConfiguration {
     protected JwtTokenAuthenticationProcessingFilter buildJwtTokenAuthenticationProcessingFilter() throws Exception {
         List<String> pathsToSkip = new ArrayList<>(Arrays.asList(NON_TOKEN_BASED_AUTH_ENTRY_POINTS));
         pathsToSkip.addAll(Arrays.asList(WS_TOKEN_BASED_AUTH_ENTRY_POINT, TOKEN_REFRESH_ENTRY_POINT, FORM_BASED_LOGIN_ENTRY_POINT,
-                PUBLIC_LOGIN_ENTRY_POINT, DEVICE_API_ENTRY_POINT, WEBJARS_ENTRY_POINT));
+                PUBLIC_LOGIN_ENTRY_POINT, DEVICE_API_ENTRY_POINT, WEBJARS_ENTRY_POINT, MAIL_OAUTH2_PROCESSING_ENTRY_POINT));
         SkipPathRequestMatcher matcher = new SkipPathRequestMatcher(pathsToSkip, TOKEN_BASED_AUTH_ENTRY_POINT);
         JwtTokenAuthenticationProcessingFilter filter
                 = new JwtTokenAuthenticationProcessingFilter(failureHandler, jwtHeaderTokenExtractor, matcher);
@@ -201,6 +203,7 @@ public class ThingsboardSecurityConfiguration {
                 .antMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
                 .antMatchers(PUBLIC_LOGIN_ENTRY_POINT).permitAll() // Public login end-point
                 .antMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
+                .antMatchers(MAIL_OAUTH2_PROCESSING_ENTRY_POINT).permitAll() // Mail oauth2 code processing url
                 .antMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll() // static resources, user activation and password reset end-points
                 .and()
                 .authorizeRequests()

application/src/main/java/org/thingsboard/server/controller/AdminController.java

@@ -15,13 +15,24 @@
  */
 package org.thingsboard.server.controller;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.api.client.auth.oauth2.AuthorizationCodeRequestUrl;
+import com.google.api.client.auth.oauth2.AuthorizationCodeTokenRequest;
+import com.google.api.client.auth.oauth2.ClientParametersAuthentication;
+import com.google.api.client.auth.oauth2.TokenResponse;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -32,18 +43,25 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.FeaturesInfo;
 import org.thingsboard.server.common.data.FeaturesInfo;
 import org.thingsboard.server.common.data.SystemInfo;
 import org.thingsboard.server.common.data.UpdateMessage;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.security.model.JwtPair;
 import org.thingsboard.server.common.data.security.model.JwtSettings;
@@ -56,6 +74,7 @@ import org.thingsboard.server.common.data.sync.vc.VcUtils;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.security.auth.oauth2.CookieUtils;
 import org.thingsboard.server.service.security.auth.jwt.settings.JwtSettingsService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
@@ -67,15 +86,29 @@ import org.thingsboard.server.service.sync.vc.autocommit.TbAutoCommitSettingsSer
 import org.thingsboard.server.service.system.SystemInfoService;
 import org.thingsboard.server.service.update.UpdateService;
 
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+
+import static org.thingsboard.server.controller.ControllerConstants.*;
 import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_AUTHORITY_PARAGRAPH;
 
 @RestController
 @TbCoreComponent
+@Slf4j
 @RequestMapping("/api/admin")
 @RequiredArgsConstructor
 public class AdminController extends BaseController {
 
+    private static final String PREV_URI_PATH_PARAMETER = "prevUri";
+    private static final String PREV_URI_COOKIE_NAME = "prev_uri";
+    private static final String STATE_COOKIE_NAME = "state";
+    private static final String MAIL_SETTINGS_KEY = "mail";
+
     private final MailService mailService;
     private final SmsService smsService;
     private final AdminSettingsService adminSettingsService;
@@ -102,6 +135,7 @@ public class AdminController extends BaseController {
         AdminSettings adminSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, key), "No Administration settings found for key: " + key);
         if (adminSettings.getKey().equals("mail")) {
             ((ObjectNode) adminSettings.getJsonValue()).remove("password");
+            ((ObjectNode) adminSettings.getJsonValue()).remove("refreshToken");
         }
         return adminSettings;
     }
@@ -122,6 +156,7 @@ public class AdminController extends BaseController {
         if (adminSettings.getKey().equals("mail")) {
             mailService.updateMailConfiguration();
             ((ObjectNode) adminSettings.getJsonValue()).remove("password");
+            ((ObjectNode) adminSettings.getJsonValue()).remove("refreshToken");
         } else if (adminSettings.getKey().equals("sms")) {
             smsService.updateSmsConfiguration();
         }
@@ -188,9 +223,20 @@ public class AdminController extends BaseController {
         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
         adminSettings = checkNotNull(adminSettings);
         if (adminSettings.getKey().equals("mail")) {
-            if (!adminSettings.getJsonValue().has("password")) {
+            if (adminSettings.getJsonValue().has("enableOauth2") && adminSettings.getJsonValue().get("enableOauth2").asBoolean()){
                 AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
-                ((ObjectNode) adminSettings.getJsonValue()).put("password", mailSettings.getJsonValue().get("password").asText());
+                JsonNode refreshToken = mailSettings.getJsonValue().get("refreshToken");
+                if (refreshToken == null) {
+                    throw new ThingsboardException("Refresh token was not generated. Please, generate refresh token.", ThingsboardErrorCode.GENERAL);
+                }
+                ObjectNode settings = (ObjectNode) adminSettings.getJsonValue();
+                settings.put("refreshToken", refreshToken.asText());
+            }
+            else {
+                if (!adminSettings.getJsonValue().has("password")) {
+                    AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
+                    ((ObjectNode) adminSettings.getJsonValue()).put("password", mailSettings.getJsonValue().get("password").asText());
+                }
             }
             String email = getCurrentUser().getEmail();
             mailService.sendTestMail(adminSettings.getJsonValue(), email);
@@ -362,4 +408,84 @@ public class AdminController extends BaseController {
         return systemInfoService.getFeaturesInfo();
     }
 
+    @ApiOperation(value = "Get OAuth2 log in processing URL (getMailProcessingUrl)", notes = "Returns the URL enclosed in " +
+            "double quotes. After successful authentication with OAuth2 provider and user consent for requested scope, it makes a redirect to this path so that the platform can do " +
+            "further log in processing and generating access tokens. " + SYSTEM_AUTHORITY_PARAGRAPH)
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/mail/oauth2/loginProcessingUrl", method = RequestMethod.GET)
+    @ResponseBody
+    public String getMailProcessingUrl() throws ThingsboardException {
+         accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
+         return "\"/api/admin/mail/oauth2/code\"";
+    }
+
+    @ApiOperation(value = "Redirect user to mail provider login page. ", notes = "After user logged in and provided access" +
+            "provider sends authorization code to specified redirect uri.)" )
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/mail/oauth2/authorize", method = RequestMethod.GET, produces = "application/text")
+    public String getAuthorizationUrl(HttpServletRequest request, HttpServletResponse response) throws ThingsboardException {
+        String state = StringUtils.generateSafeToken();
+        if (request.getParameter(PREV_URI_PATH_PARAMETER) != null) {
+            CookieUtils.addCookie(response, PREV_URI_COOKIE_NAME, request.getParameter(PREV_URI_PATH_PARAMETER), 180);
+        }
+        CookieUtils.addCookie(response, STATE_COOKIE_NAME, state, 180);
+
+        accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
+        AdminSettings adminSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, MAIL_SETTINGS_KEY), "No Administration mail settings found");
+        JsonNode jsonValue = adminSettings.getJsonValue();
+
+        String clientId = checkNotNull(jsonValue.get("clientId"), "No clientId was configured").asText();
+        String authUri = checkNotNull(jsonValue.get("authUri"), "No authorization uri was configured").asText();
+        String redirectUri = checkNotNull(jsonValue.get("redirectUri"), "No Redirect uri was configured").asText();
+        List<String> scope =  JacksonUtil.convertValue(checkNotNull(jsonValue.get("scope"), "No scope was configured"), new TypeReference<>() {
+        });
+
+        return "\"" + new AuthorizationCodeRequestUrl(authUri, clientId)
+                .setScopes(scope)
+                .setState(state)
+                .setRedirectUri(redirectUri)
+                .build() + "\"";
+    }
+
+    @RequestMapping(value = "/mail/oauth2/code", params = {"code", "state"}, method = RequestMethod.GET)
+    public void codeProcessingUrl(
+            @RequestParam(value = "code") String code, @RequestParam(value = "state") String state,
+            HttpServletRequest request, HttpServletResponse response) throws ThingsboardException, IOException {
+        Optional<Cookie> prevUrlOpt = CookieUtils.getCookie(request, PREV_URI_COOKIE_NAME);
+        Optional<Cookie> cookieState = CookieUtils.getCookie(request, STATE_COOKIE_NAME);
+
+        String baseUrl = this.systemSecurityService.getBaseUrl(TenantId.SYS_TENANT_ID, new CustomerId(EntityId.NULL_UUID), request);
+        String prevUri = baseUrl + (prevUrlOpt.isPresent() ? prevUrlOpt.get().getValue(): "/settings/outgoing-mail");
+
+        if (cookieState.isEmpty() || !cookieState.get().getValue().equals(state)) {
+            CookieUtils.deleteCookie(request, response, STATE_COOKIE_NAME);
+            throw new ThingsboardException("Refresh token was not generated, invalid state param", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        CookieUtils.deleteCookie(request, response, STATE_COOKIE_NAME);
+        CookieUtils.deleteCookie(request, response, PREV_URI_COOKIE_NAME);
+
+        AdminSettings adminSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, MAIL_SETTINGS_KEY), "No Administration mail settings found");
+        JsonNode jsonValue = adminSettings.getJsonValue();
+
+        String clientId = checkNotNull(jsonValue.get("clientId"), "No clientId was configured").asText();
+        String clientSecret = checkNotNull(jsonValue.get("clientSecret"), "No client secret was configured").asText();
+        String clientRedirectUri = checkNotNull(jsonValue.get("redirectUri"), "No Redirect uri was configured").asText();
+        String tokenUri = checkNotNull(jsonValue.get("tokenUri"), "No authorization uri was configured").asText();
+
+        TokenResponse tokenResponse;
+        try {
+            tokenResponse = new AuthorizationCodeTokenRequest(new NetHttpTransport(), new GsonFactory(), new GenericUrl(tokenUri), code)
+                    .setRedirectUri(clientRedirectUri)
+                    .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
+                    .execute();
+        } catch (IOException e) {
+            log.warn("Unable to retrieve refresh token: {}", e.getMessage());
+            throw new ThingsboardException("Error while requesting access token: " + e.getMessage(), ThingsboardErrorCode.GENERAL);
+        }
+        ((ObjectNode)jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+        ((ObjectNode)jsonValue).put("tokenGenerated", true);
+
+        adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, adminSettings);
+        response.sendRedirect(prevUri);
+    }
 }

application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java

@@ -77,7 +77,7 @@ public class AlarmCommentController extends BaseController {
                                          @PathVariable(ALARM_ID) String strAlarmId, @ApiParam(value = "A JSON value representing the comment.") @RequestBody AlarmComment alarmComment) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
-        Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
+        Alarm alarm = checkAlarmInfoId(alarmId, Operation.WRITE);
         alarmComment.setAlarmId(alarmId);
         return tbAlarmCommentService.saveAlarmComment(alarm, alarmComment, getCurrentUser());
     }

application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java

@@ -140,6 +140,9 @@ public class ControllerConstants {
 
     protected static final String RESOURCE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'substring' filter based on the resource title.";
     protected static final String RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, title, resourceType, tenantId";
+    protected static final String RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES = "LWM2M_MODEL, JKS, PKCS_12, JS_MODULE";
+    protected static final String RESOURCE_TYPE = "A string value representing the resource type.";
+
     protected static final String LWM2M_OBJECT_DESCRIPTION = "LwM2M Object is a object that includes information about the LwM2M model which can be used in transport configuration for the LwM2M device profile. ";
     protected static final String LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES = "id, name";
 

application/src/main/java/org/thingsboard/server/controller/MailConfigTemplateController.java

@@ -0,0 +1,56 @@
+/**
+ * Copyright © 2016-2023 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.controller;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.mail.TbMailConfigTemplateService;
+import org.thingsboard.server.service.security.permission.Operation;
+import org.thingsboard.server.service.security.permission.Resource;
+
+import java.io.IOException;
+
+import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
+
+@RestController
+@TbCoreComponent
+@RequiredArgsConstructor
+@RequestMapping("/api/mail/config/template")
+@Slf4j
+public class MailConfigTemplateController extends BaseController {
+    private static final String MAIL_CONFIG_TEMPLATE_DEFINITION = "Mail configuration template is set of default smtp settings for mail server that specific provider supports";
+    private final TbMailConfigTemplateService mailConfigTemplateService;
+
+    @ApiOperation(value = "Get the list of all OAuth2 client registration templates (getClientRegistrationTemplates)" + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
+            notes = MAIL_CONFIG_TEMPLATE_DEFINITION)
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public JsonNode getClientRegistrationTemplates() throws ThingsboardException, IOException {
+        accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
+        return mailConfigTemplateService.findAllMailConfigTemplates();
+    }
+
+}

application/src/main/java/org/thingsboard/server/controller/QueueController.java

@@ -83,7 +83,7 @@ public class QueueController extends BaseController {
                                                         @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         checkParameter("serviceType", serviceType);
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-        ServiceType type = ServiceType.valueOf(serviceType);
+        ServiceType type = ServiceType.of(serviceType);
         switch (type) {
             case TB_RULE_ENGINE:
                 return queueService.findQueuesByTenantId(getTenantId(), pageLink);
@@ -136,7 +136,7 @@ public class QueueController extends BaseController {
 
         checkEntity(queue.getId(), queue, Resource.QUEUE);
 
-        ServiceType type = ServiceType.valueOf(serviceType);
+        ServiceType type = ServiceType.of(serviceType);
         switch (type) {
             case TB_RULE_ENGINE:
                 queue.setTenantId(getTenantId());

application/src/main/java/org/thingsboard/server/controller/TbResourceController.java

@@ -20,19 +20,25 @@ import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.CacheControl;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.TbResourceInfoFilter;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
@@ -47,6 +53,7 @@ import org.thingsboard.server.service.security.permission.Resource;
 import java.util.Base64;
 import java.util.List;
 
+import static org.thingsboard.server.controller.ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER;
 import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_DATA_PARAMETERS;
@@ -57,6 +64,8 @@ import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_ID_
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_INFO_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TEXT_SEARCH_DESCRIPTION;
+import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TYPE;
+import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_ALLOWABLE_VALUES;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
@@ -71,6 +80,7 @@ import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LI
 @RequiredArgsConstructor
 public class TbResourceController extends BaseController {
 
+    private static final String DOWNLOAD_RESOURCE_IF_NOT_CHANGED = "Download Resource based on the provided Resource Id or return 304 status code if resource was not changed.";
     private final TbResourceService tbResourceService;
 
     public static final String RESOURCE_ID = "resourceId";
@@ -94,6 +104,47 @@ public class TbResourceController extends BaseController {
                 .body(resource);
     }
 
+    @ApiOperation(value = "Download LWM2M Resource (downloadLwm2mResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/resource/lwm2m/{resourceId}/download", method = RequestMethod.GET, produces = "application/xml")
+    @ResponseBody
+    public ResponseEntity<org.springframework.core.io.Resource> downloadLwm2mResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+                                                                                               @PathVariable(RESOURCE_ID) String strResourceId,
+                                                                                               @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
+        return downloadResourceIfChanged(ResourceType.LWM2M_MODEL, strResourceId, etag);
+    }
+
+    @ApiOperation(value = "Download PKCS_12 Resource (downloadPkcs12ResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/resource/pkcs12/{resourceId}/download", method = RequestMethod.GET, produces = "application/x-pkcs12")
+    @ResponseBody
+    public ResponseEntity<org.springframework.core.io.Resource> downloadPkcs12ResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+                                                                                                @PathVariable(RESOURCE_ID) String strResourceId,
+                                                                                                @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
+        return downloadResourceIfChanged(ResourceType.PKCS_12, strResourceId, etag);
+    }
+
+    @ApiOperation(value = "Download JKS Resource (downloadJksResourceIfChanged)",
+            notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/resource/jks/{resourceId}/download", method = RequestMethod.GET, produces = "application/x-java-keystore")
+    @ResponseBody
+    public ResponseEntity<org.springframework.core.io.Resource> downloadJksResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+                                                                                             @PathVariable(RESOURCE_ID) String strResourceId,
+                                                                                             @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
+        return downloadResourceIfChanged(ResourceType.JKS, strResourceId, etag);
+    }
+
+    @ApiOperation(value = "Download JS Resource (downloadJsResourceIfChanged)", notes = DOWNLOAD_RESOURCE_IF_NOT_CHANGED + AVAILABLE_FOR_ANY_AUTHORIZED_USER)
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/resource/js/{resourceId}/download", method = RequestMethod.GET, produces = "application/javascript")
+    @ResponseBody
+    public ResponseEntity<org.springframework.core.io.Resource> downloadJsResourceIfChanged(@ApiParam(value = RESOURCE_ID_PARAM_DESCRIPTION)
+                                                                                            @PathVariable(RESOURCE_ID) String strResourceId,
+                                                                                            @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws ThingsboardException {
+        return downloadResourceIfChanged(ResourceType.JS_MODULE, strResourceId, etag);
+    }
+
     @ApiOperation(value = "Get Resource Info (getResourceInfoById)",
             notes = "Fetch the Resource Info object based on the provided Resource Id. " +
                     RESOURCE_INFO_DESCRIPTION + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH,
@@ -153,6 +204,8 @@ public class TbResourceController extends BaseController {
                                                  @RequestParam int pageSize,
                                                  @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
                                                  @RequestParam int page,
+                                                 @ApiParam(value = RESOURCE_TYPE, allowableValues = RESOURCE_TYPE_PROPERTY_ALLOWABLE_VALUES)
+                                                 @RequestParam(required = false) String resourceType,
                                                  @ApiParam(value = RESOURCE_TEXT_SEARCH_DESCRIPTION)
                                                  @RequestParam(required = false) String textSearch,
                                                  @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = RESOURCE_SORT_PROPERTY_ALLOWABLE_VALUES)
@@ -160,10 +213,15 @@ public class TbResourceController extends BaseController {
                                                  @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
                                                  @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
+        TbResourceInfoFilter.TbResourceInfoFilterBuilder filter = TbResourceInfoFilter.builder();
+        filter.tenantId(getTenantId());
+        if (StringUtils.isNotEmpty(resourceType)) {
+            filter.resourceType(ResourceType.valueOf(resourceType));
+        }
         if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
-            return checkNotNull(resourceService.findTenantResourcesByTenantId(getTenantId(), pageLink));
+            return checkNotNull(resourceService.findTenantResourcesByTenantId(filter.build(), pageLink));
         } else {
-            return checkNotNull(resourceService.findAllTenantResourcesByTenantId(getTenantId(), pageLink));
+            return checkNotNull(resourceService.findAllTenantResourcesByTenantId(filter.build(), pageLink));
         }
     }
 
@@ -216,4 +274,30 @@ public class TbResourceController extends BaseController {
         TbResource tbResource = checkResourceId(resourceId, Operation.DELETE);
         tbResourceService.delete(tbResource, getCurrentUser());
     }
+
+    private ResponseEntity<org.springframework.core.io.Resource> downloadResourceIfChanged(ResourceType type, String strResourceId, String etag) throws ThingsboardException {
+        checkParameter(RESOURCE_ID, strResourceId);
+        TbResourceId resourceId = new TbResourceId(toUUID(strResourceId));
+
+        if (etag != null) {
+            TbResourceInfo tbResourceInfo = checkResourceInfoId(resourceId, Operation.READ);
+            if (etag.equals(tbResourceInfo.getEtag())) {
+                return ResponseEntity.status(HttpStatus.NOT_MODIFIED)
+                        .eTag(tbResourceInfo.getEtag())
+                        .build();
+            }
+        }
+
+        TbResource tbResource = checkResourceId(resourceId, Operation.READ);
+        ByteArrayResource resource = new ByteArrayResource(Base64.getDecoder().decode(tbResource.getData().getBytes()));
+
+        return ResponseEntity.ok()
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + tbResource.getFileName())
+                .header("x-filename", tbResource.getFileName())
+                .contentLength(resource.contentLength())
+                .header("Content-Type", type.getMediaType())
+                .cacheControl(CacheControl.noCache())
+                .eTag(tbResource.getEtag())
+                .body(resource);
+    }
 }

application/src/main/java/org/thingsboard/server/controller/UserController.java

@@ -406,7 +406,7 @@ public class UserController extends BaseController {
     public void setUserCredentialsEnabled(
             @ApiParam(value = USER_ID_PARAM_DESCRIPTION)
             @PathVariable(USER_ID) String strUserId,
-            @ApiParam(value = "Disable (\"true\") or enable (\"false\") the credentials.", defaultValue = "true")
+            @ApiParam(value = "Enable (\"true\") or disable (\"false\") the credentials.", defaultValue = "true")
             @RequestParam(required = false, defaultValue = "true") boolean userCredentialsEnabled) throws ThingsboardException {
         checkParameter(USER_ID, strUserId);
         UserId userId = new UserId(toUUID(strUserId));

application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java

@@ -256,6 +256,7 @@ public class ThingsboardInstallService {
                             }
                         case "3.5.0":
                             log.info("Upgrading ThingsBoard from version 3.5.0 to 3.5.1 ...");
+                            databaseEntitiesUpgradeService.upgradeDatabase("3.5.0");
                         case "3.5.1":
                             log.info("Upgrading ThingsBoard from version 3.5.1 to 3.5.2 ...");
                             databaseEntitiesUpgradeService.upgradeDatabase("3.5.1");

application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java

@@ -28,7 +28,9 @@ import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
+import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -40,10 +42,12 @@ import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.trigger.AlarmAssignmentTrigger;
+import org.thingsboard.server.common.msg.notification.trigger.AlarmCommentTrigger;
 import org.thingsboard.server.common.msg.notification.trigger.EntitiesLimitTrigger;
 import org.thingsboard.server.common.msg.notification.trigger.EntityActionTrigger;
 import org.thingsboard.server.dao.audit.AuditLogService;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
 
 import java.util.List;
 import java.util.Map;
@@ -241,19 +245,7 @@ public class EntityActionService {
                     }
                 }
                 if (tenantId != null && !tenantId.isSysTenantId()) {
-                    if (actionType == ActionType.ADDED) {
-                        notificationRuleProcessor.process(EntitiesLimitTrigger.builder()
-                                .tenantId(tenantId)
-                                .entityType(entityId.getEntityType())
-                                .build());
-                    }
-                    notificationRuleProcessor.process(EntityActionTrigger.builder()
-                            .tenantId(tenantId)
-                            .entityId(entityId)
-                            .entity(entity)
-                            .actionType(actionType)
-                            .user(user)
-                            .build());
+                    processNotificationRules(tenantId, entityId, entity, actionType, user, additionalInfo);
                 }
                 TbMsg tbMsg = TbMsg.newMsg(msgType, entityId, customerId, metaData, TbMsgDataType.JSON, JacksonUtil.toString(entityNode));
                 tbClusterService.pushMsgToRuleEngine(tenantId, entityId, tbMsg, null);
@@ -263,6 +255,53 @@ public class EntityActionService {
         }
     }
 
+    private void processNotificationRules(TenantId tenantId, EntityId entityId, HasName entity, ActionType actionType, User user, Object... additionalInfo) {
+        switch (actionType) {
+            case ADDED:
+                notificationRuleProcessor.process(EntitiesLimitTrigger.builder()
+                        .tenantId(tenantId)
+                        .entityType(entityId.getEntityType())
+                        .build());
+            case UPDATED:
+            case DELETED:
+                notificationRuleProcessor.process(EntityActionTrigger.builder()
+                        .tenantId(tenantId)
+                        .entityId(entityId)
+                        .entity(entity)
+                        .actionType(actionType)
+                        .user(user)
+                        .build());
+                break;
+            case ALARM_ASSIGNED:
+            case ALARM_UNASSIGNED:
+                if (!(entity instanceof AlarmInfo)) { // should not normally happen
+                    log.warn("Invalid alarm assignment event: entity is not instance of AlarmInfo");
+                    break;
+                }
+                notificationRuleProcessor.process(AlarmAssignmentTrigger.builder()
+                        .tenantId(tenantId)
+                        .alarmInfo((AlarmInfo) entity)
+                        .actionType(actionType)
+                        .user(user)
+                        .build());
+                break;
+            case ADDED_COMMENT:
+            case UPDATED_COMMENT:
+                if (!(entity instanceof Alarm)) { // should not normally happen
+                    log.warn("Invalid alarm comment event: entity is not instance of Alarm");
+                    break;
+                }
+                notificationRuleProcessor.process(AlarmCommentTrigger.builder()
+                        .tenantId(tenantId)
+                        .comment(extractParameter(AlarmComment.class, 0, additionalInfo))
+                        .alarm((Alarm) entity)
+                        .actionType(actionType)
+                        .user(user)
+                        .build());
+                break;
+        }
+    }
+
     public <E extends HasName, I extends EntityId> void logEntityAction(User user, I entityId, E entity, CustomerId customerId,
                                                                         ActionType actionType, Exception e, Object... additionalInfo) {
         if (customerId == null || customerId.isNullUid()) {

application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java

@@ -61,7 +61,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ToUsageStatsServiceM
 import org.thingsboard.server.gen.transport.TransportProtos.UsageStatsKVProto;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.PartitionService;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.service.apiusage.BaseApiUsageState.StatsCalculationResult;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.mail.MailExecutorService;

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -638,7 +638,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                                 futures.add(dbUpgradeExecutor.submit(() -> {
                                     try {
                                         assetProfileService.createDefaultAssetProfile(tenantId);
-                                    } catch (Exception e) {}
+                                    } catch (Exception e) {
+                                    }
                                 }));
                             }
                             Futures.allAsList(futures).get();
@@ -657,7 +658,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                                     futures.add(dbUpgradeExecutor.submit(() -> {
                                         try {
                                             assetProfileService.findOrCreateAssetProfile(tenantId, assetType);
-                                        } catch (Exception e) {}
+                                        } catch (Exception e) {
+                                        }
                                     }));
                                 }
                             }
@@ -714,19 +716,33 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                     log.error("Failed updating schema!!!", e);
                 }
                 break;
-            case "3.5.1":
+            case "3.5.0":
                 try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
                     log.info("Updating schema ...");
                     if (isOldSchema(conn, 3005000)) {
+                        schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.5.0", SCHEMA_UPDATE_SQL);
+                        loadSql(schemaUpdateFile, conn);
+                        conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3005001;");
+                    }
+                    log.info("Schema updated.");
+                } catch (Exception e) {
+                    log.error("Failed updating schema!!!", e);
+                }
+                break;
+            case "3.5.1":
+                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
+                    log.info("Updating schema ...");
+                    if (isOldSchema(conn, 3005001)) {
                         schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.5.1", SCHEMA_UPDATE_SQL);
                         loadSql(schemaUpdateFile, conn);
 
-                        try {
-                            String[] entityNames = new String[]{"device"};
-                            for (String entityName : entityNames) {
-                                conn.createStatement().execute("ALTER TABLE " + entityName + " DROP COLUMN search_text CASCADE");
+                        String[] entityNames = new String[]{"device", "component_descriptor", "customer", "dashboard", "rule_chain", "rule_node", "ota_package",
+                                "asset_profile", "asset", "device_profile", "tb_user", "tenant_profile", "tenant", "widgets_bundle", "entity_view", "edge"};
+                        for (String entityName : entityNames) {
+                            try {
+                                conn.createStatement().execute("ALTER TABLE " + entityName + " DROP COLUMN " + SEARCH_TEXT + " CASCADE");
+                            } catch (Exception e) {
                             }
-                        } catch (Exception e) {
                         }
                         try {
                             conn.createStatement().execute("ALTER TABLE component_descriptor ADD COLUMN IF NOT EXISTS configuration_version int DEFAULT 0;");

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

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.mail;
 
 import com.fasterxml.jackson.databind.JsonNode;
+
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
@@ -53,7 +54,6 @@ import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -61,7 +61,6 @@ import java.util.concurrent.TimeoutException;
 @Slf4j
 public class DefaultMailService implements MailService {
 
-    public static final String MAIL_PROP = "mail.";
     public static final String TARGET_EMAIL = "targetEmail";
     public static final String UTF_8 = "UTF-8";
 
@@ -82,7 +81,10 @@ public class DefaultMailService implements MailService {
     @Autowired
     private PasswordResetExecutorService passwordResetExecutorService;
 
-    private JavaMailSenderImpl mailSender;
+    @Autowired
+    private TbMailContextComponent tbMailContextComponent;
+
+    private TbMailSender mailSender;
 
     private String mailFrom;
 
@@ -105,7 +107,7 @@ public class DefaultMailService implements MailService {
         AdminSettings settings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
         if (settings != null) {
             JsonNode jsonConfig = settings.getJsonValue();
-            mailSender = createMailSender(jsonConfig);
+            mailSender = new TbMailSender(tbMailContextComponent, jsonConfig);
             mailFrom = jsonConfig.get("mailFrom").asText();
             timeout = jsonConfig.get("timeout").asLong(DEFAULT_TIMEOUT);
         } else {
@@ -113,65 +115,6 @@ public class DefaultMailService implements MailService {
         }
     }
 
-    private JavaMailSenderImpl createMailSender(JsonNode jsonConfig) {
-        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(jsonConfig.get("smtpHost").asText());
-        mailSender.setPort(parsePort(jsonConfig.get("smtpPort").asText()));
-        mailSender.setUsername(jsonConfig.get("username").asText());
-        mailSender.setPassword(jsonConfig.get("password").asText());
-        mailSender.setJavaMailProperties(createJavaMailProperties(jsonConfig));
-        return mailSender;
-    }
-
-    private Properties createJavaMailProperties(JsonNode jsonConfig) {
-        Properties javaMailProperties = new Properties();
-        String protocol = jsonConfig.get("smtpProtocol").asText();
-        javaMailProperties.put("mail.transport.protocol", protocol);
-        javaMailProperties.put(MAIL_PROP + protocol + ".host", jsonConfig.get("smtpHost").asText());
-        javaMailProperties.put(MAIL_PROP + protocol + ".port", jsonConfig.get("smtpPort").asText());
-        javaMailProperties.put(MAIL_PROP + protocol + ".timeout", jsonConfig.get("timeout").asText());
-        javaMailProperties.put(MAIL_PROP + protocol + ".auth", String.valueOf(StringUtils.isNotEmpty(jsonConfig.get("username").asText())));
-        boolean enableTls = false;
-        if (jsonConfig.has("enableTls")) {
-            if (jsonConfig.get("enableTls").isBoolean() && jsonConfig.get("enableTls").booleanValue()) {
-                enableTls = true;
-            } else if (jsonConfig.get("enableTls").isTextual()) {
-                enableTls = "true".equalsIgnoreCase(jsonConfig.get("enableTls").asText());
-            }
-        }
-        javaMailProperties.put(MAIL_PROP + protocol + ".starttls.enable", enableTls);
-        if (enableTls && jsonConfig.has("tlsVersion") && !jsonConfig.get("tlsVersion").isNull()) {
-            String tlsVersion = jsonConfig.get("tlsVersion").asText();
-            if (StringUtils.isNoneEmpty(tlsVersion)) {
-                javaMailProperties.put(MAIL_PROP + protocol + ".ssl.protocols", tlsVersion);
-            }
-        }
-
-        boolean enableProxy = jsonConfig.has("enableProxy") && jsonConfig.get("enableProxy").asBoolean();
-
-        if (enableProxy) {
-            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.host", jsonConfig.get("proxyHost").asText());
-            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.port", jsonConfig.get("proxyPort").asText());
-            String proxyUser = jsonConfig.get("proxyUser").asText();
-            if (StringUtils.isNoneEmpty(proxyUser)) {
-                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.user", proxyUser);
-            }
-            String proxyPassword = jsonConfig.get("proxyPassword").asText();
-            if (StringUtils.isNoneEmpty(proxyPassword)) {
-                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.password", proxyPassword);
-            }
-        }
-        return javaMailProperties;
-    }
-
-    private int parsePort(String strPort) {
-        try {
-            return Integer.valueOf(strPort);
-        } catch (NumberFormatException e) {
-            throw new IncorrectParameterException(String.format("Invalid smtp port value: %s", strPort));
-        }
-    }
-
     @Override
     public void sendEmail(TenantId tenantId, String email, String subject, String message) throws ThingsboardException {
         sendMail(mailSender, mailFrom, email, subject, message, timeout);
@@ -179,7 +122,7 @@ public class DefaultMailService implements MailService {
 
     @Override
     public void sendTestMail(JsonNode jsonConfig, String email) throws ThingsboardException {
-        JavaMailSenderImpl testMailSender = createMailSender(jsonConfig);
+        TbMailSender testMailSender = new TbMailSender(tbMailContextComponent, jsonConfig);
         String mailFrom = jsonConfig.get("mailFrom").asText();
         String subject = messages.getMessage("test.message.subject", null, Locale.US);
         long timeout = jsonConfig.get("timeout").asLong(DEFAULT_TIMEOUT);

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

@@ -0,0 +1,42 @@
+/**
+ * Copyright © 2016-2023 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.service.mail;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
+
+import javax.annotation.PostConstruct;
+import java.io.IOException;
+
+@Service
+@Slf4j
+public class DefaultTbMailConfigTemplateService implements TbMailConfigTemplateService {
+
+    private JsonNode mailConfigTemplates;
+
+    @PostConstruct
+    private void postConstruct() throws IOException {
+        mailConfigTemplates = JacksonUtil.toJsonNode(new ClassPathResource("/templates/mail_config_templates.json").getFile());
+    }
+
+    @Override
+    public JsonNode findAllMailConfigTemplates() {
+        return mailConfigTemplates;
+    }
+}

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

@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2016-2023 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.service.mail;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.api.client.auth.oauth2.ClientParametersAuthentication;
+import com.google.api.client.auth.oauth2.RefreshTokenRequest;
+import com.google.api.client.auth.oauth2.TokenResponse;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+
+import static org.thingsboard.server.common.data.mail.MailOauth2Provider.OFFICE_365;
+
+@TbCoreComponent
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class RefreshTokenExpCheckService {
+    public static final int AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS = 90;
+    private final AdminSettingsService adminSettingsService;
+
+    @Scheduled(initialDelayString = "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${mail.oauth2.refreshTokenCheckingInterval})}", fixedDelayString = "${mail.oauth2.refreshTokenCheckingInterval}")
+    public void check() throws IOException {
+        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")) {
+                long expiresIn = jsonValue.get("refreshTokenExpires").longValue();
+                if ((expiresIn - System.currentTimeMillis()) < 604800000L) { //less than 7 days
+                    log.info("Trying to refresh refresh token.");
+
+                    String clientId = jsonValue.get("clientId").asText();
+                    String clientSecret = jsonValue.get("clientSecret").asText();
+                    String refreshToken = jsonValue.get("refreshToken").asText();
+                    String tokenUri = jsonValue.get("tokenUri").asText();
+
+                    TokenResponse tokenResponse = new RefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
+                            new GenericUrl(tokenUri), refreshToken)
+                            .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
+                            .execute();
+                    ((ObjectNode)jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+                    ((ObjectNode)jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
+                    adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+/**
+ * Copyright © 2016-2023 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.service.mail;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+import java.io.IOException;
+
+public interface TbMailConfigTemplateService {
+    JsonNode findAllMailConfigTemplates() throws IOException;
+}

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

@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016-2023 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.service.mail;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+
+@Component
+@Data
+@Lazy
+public class TbMailContextComponent {
+
+    @Autowired
+    private AdminSettingsService adminSettingsService;
+}

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

@@ -0,0 +1,168 @@
+/**
+ * Copyright © 2016-2023 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.service.mail;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.api.client.auth.oauth2.ClientParametersAuthentication;
+import com.google.api.client.auth.oauth2.RefreshTokenRequest;
+import com.google.api.client.auth.oauth2.TokenResponse;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.lang.Nullable;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.mail.MailOauth2Provider;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+
+import javax.mail.internet.MimeMessage;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Properties;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.thingsboard.server.service.mail.RefreshTokenExpCheckService.AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS;
+
+@Slf4j
+public class TbMailSender extends JavaMailSenderImpl {
+
+    private static final String MAIL_PROP = "mail.";
+    private final TbMailContextComponent ctx;
+    private final Lock lock;
+    private final Boolean oauth2Enabled;
+    private volatile String accessToken;
+    private volatile long tokenExpires;
+
+    public TbMailSender(TbMailContextComponent ctx, JsonNode jsonConfig) {
+        super();
+        this.lock = new ReentrantLock();
+        this.tokenExpires = 0L;
+        this.ctx = ctx;
+        this.oauth2Enabled = jsonConfig.has("enableOauth2") && jsonConfig.get("enableOauth2").asBoolean();
+
+        setHost(jsonConfig.get("smtpHost").asText());
+        setPort(parsePort(jsonConfig.get("smtpPort").asText()));
+        setUsername(jsonConfig.get("username").asText());
+        if (jsonConfig.has("password")) {
+            setPassword(jsonConfig.get("password").asText());
+        }
+        setJavaMailProperties(createJavaMailProperties(jsonConfig));
+    }
+
+    @SneakyThrows
+    @Override
+    public void doSend(MimeMessage[] mimeMessages, @Nullable Object[] originalMessages) {
+        if (oauth2Enabled && (System.currentTimeMillis() > tokenExpires)){
+            refreshAccessToken();
+            setPassword(accessToken);
+        }
+        super.doSend(mimeMessages, originalMessages);
+    }
+
+    private Properties createJavaMailProperties(JsonNode jsonConfig) {
+        Properties javaMailProperties = new Properties();
+        String protocol = jsonConfig.get("smtpProtocol").asText();
+        javaMailProperties.put("mail.transport.protocol", protocol);
+        javaMailProperties.put(MAIL_PROP + protocol + ".host", jsonConfig.get("smtpHost").asText());
+        javaMailProperties.put(MAIL_PROP + protocol + ".port", jsonConfig.get("smtpPort").asText());
+        javaMailProperties.put(MAIL_PROP + protocol + ".timeout", jsonConfig.get("timeout").asText());
+        javaMailProperties.put(MAIL_PROP + protocol + ".auth", String.valueOf(StringUtils.isNotEmpty(jsonConfig.get("username").asText())));
+        boolean enableTls = false;
+        if (jsonConfig.has("enableTls")) {
+            if (jsonConfig.get("enableTls").isBoolean() && jsonConfig.get("enableTls").booleanValue()) {
+                enableTls = true;
+            } else if (jsonConfig.get("enableTls").isTextual()) {
+                enableTls = "true".equalsIgnoreCase(jsonConfig.get("enableTls").asText());
+            }
+        }
+        javaMailProperties.put(MAIL_PROP + protocol + ".starttls.enable", enableTls);
+        if (enableTls && jsonConfig.has("tlsVersion") && !jsonConfig.get("tlsVersion").isNull()) {
+            String tlsVersion = jsonConfig.get("tlsVersion").asText();
+            if (StringUtils.isNoneEmpty(tlsVersion)) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".ssl.protocols", tlsVersion);
+            }
+        }
+
+        boolean enableProxy = jsonConfig.has("enableProxy") && jsonConfig.get("enableProxy").asBoolean();
+
+        if (enableProxy) {
+            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.host", jsonConfig.get("proxyHost").asText());
+            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.port", jsonConfig.get("proxyPort").asText());
+            String proxyUser = jsonConfig.get("proxyUser").asText();
+            if (StringUtils.isNoneEmpty(proxyUser)) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.user", proxyUser);
+            }
+            String proxyPassword = jsonConfig.get("proxyPassword").asText();
+            if (StringUtils.isNoneEmpty(proxyPassword)) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.password", proxyPassword);
+            }
+        }
+
+        if (oauth2Enabled) {
+            javaMailProperties.put(MAIL_PROP + protocol + ".auth.mechanisms", "XOAUTH2");
+        }
+        return javaMailProperties;
+    }
+
+    public void refreshAccessToken() throws ThingsboardException {
+        lock.lock();
+        try {
+            if (System.currentTimeMillis() > tokenExpires) {
+                AdminSettings settings = ctx.getAdminSettingsService().findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail");
+                JsonNode jsonValue = settings.getJsonValue();
+
+                String clientId = jsonValue.get("clientId").asText();
+                String clientSecret = jsonValue.get("clientSecret").asText();
+                String refreshToken = jsonValue.get("refreshToken").asText();
+                String tokenUri = jsonValue.get("tokenUri").asText();
+                String providerId = jsonValue.get("providerId").asText();
+
+                TokenResponse tokenResponse = new RefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
+                        new GenericUrl(tokenUri), refreshToken)
+                        .setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret))
+                        .execute();
+                if (MailOauth2Provider.OFFICE_365.name().equals(providerId)) {
+                    ((ObjectNode)jsonValue).put("refreshToken", tokenResponse.getRefreshToken());
+                    ((ObjectNode)jsonValue).put("refreshTokenExpires", Instant.now().plus(Duration.ofDays(AZURE_DEFAULT_REFRESH_TOKEN_LIFETIME_IN_DAYS)).toEpochMilli());
+                    ctx.getAdminSettingsService().saveAdminSettings(TenantId.SYS_TENANT_ID, settings);
+                }
+                accessToken = tokenResponse.getAccessToken();
+                tokenExpires = System.currentTimeMillis() + (tokenResponse.getExpiresInSeconds().intValue() * 1000);
+            }
+        } catch (Exception e) {
+            log.warn("Unable to retrieve access token: {}", e.getMessage());
+            throw new ThingsboardException("Error while retrieving access token: " + e.getMessage(), ThingsboardErrorCode.GENERAL);
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private int parsePort(String strPort) {
+        try {
+            return Integer.parseInt(strPort);
+        } catch (NumberFormatException e) {
+            throw new IncorrectParameterException(String.format("Invalid smtp port value: %s", strPort));
+        }
+    }
+}

application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java

@@ -15,13 +15,10 @@
  */
 package org.thingsboard.server.service.notification;
 
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.rule.engine.api.NotificationCenter;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
@@ -59,14 +56,12 @@ import org.thingsboard.server.dao.notification.NotificationService;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 import org.thingsboard.server.dao.notification.NotificationTargetService;
 import org.thingsboard.server.dao.notification.NotificationTemplateService;
-import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.util.limits.LimitedApi;
+import org.thingsboard.server.dao.util.limits.RateLimitService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.NotificationsTopicService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
-import org.thingsboard.server.dao.util.limits.LimitedApi;
-import org.thingsboard.server.dao.util.limits.RateLimitService;
-import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.executors.NotificationExecutorService;
 import org.thingsboard.server.service.notification.channels.NotificationChannel;
 import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
@@ -74,7 +69,6 @@ import org.thingsboard.server.service.telemetry.AbstractSubscriptionService;
 import org.thingsboard.server.service.ws.notification.sub.NotificationRequestUpdate;
 import org.thingsboard.server.service.ws.notification.sub.NotificationUpdate;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -87,7 +81,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor
-@SuppressWarnings({"UnstableApiUsage", "rawtypes"})
+@SuppressWarnings({"rawtypes"})
 public class DefaultNotificationCenter extends AbstractSubscriptionService implements NotificationCenter, NotificationChannel<User, WebDeliveryMethodNotificationTemplate> {
 
     private final NotificationTargetService notificationTargetService;
@@ -95,9 +89,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     private final NotificationService notificationService;
     private final NotificationTemplateService notificationTemplateService;
     private final NotificationSettingsService notificationSettingsService;
-    private final UserService userService;
     private final NotificationExecutorService notificationExecutor;
-    private final DbCallbackExecutorService dbCallbackExecutorService;
     private final NotificationsTopicService notificationsTopicService;
     private final TbQueueProducerProvider producerProvider;
     private final RateLimitService rateLimitService;
@@ -172,37 +164,32 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                 .build();
 
         notificationExecutor.submit(() -> {
-            List<ListenableFuture<Void>> results = new ArrayList<>();
-
             for (NotificationTarget target : targets) {
-                List<ListenableFuture<Void>> result = processForTarget(target, ctx);
-                results.addAll(result);
+                processForTarget(target, ctx);
+            }
+
+            NotificationRequestId requestId = ctx.getRequest().getId();
+            log.debug("[{}] Notification request processing is finished", requestId);
+            NotificationRequestStats stats = ctx.getStats();
+            try {
+                notificationRequestService.updateNotificationRequest(tenantId, requestId, NotificationRequestStatus.SENT, stats);
+            } catch (Exception e) {
+                log.error("[{}] Failed to update stats for notification request", requestId, e);
             }
 
-            Futures.whenAllComplete(results).run(() -> {
-                NotificationRequestId requestId = ctx.getRequest().getId();
-                log.debug("[{}] Notification request processing is finished", requestId);
-                NotificationRequestStats stats = ctx.getStats();
+            if (callback != null) {
                 try {
-                    notificationRequestService.updateNotificationRequest(tenantId, requestId, NotificationRequestStatus.SENT, stats);
+                    callback.accept(stats);
                 } catch (Exception e) {
-                    log.error("[{}] Failed to update stats for notification request", requestId, e);
-                }
-
-                if (callback != null) {
-                    try {
-                        callback.accept(stats);
-                    } catch (Exception e) {
-                        log.error("Failed to process callback for notification request {}", requestId, e);
-                    }
+                    log.error("Failed to process callback for notification request {}", requestId, e);
                 }
-            }, dbCallbackExecutorService);
+            }
         });
 
         return request;
     }
 
-    private List<ListenableFuture<Void>> processForTarget(NotificationTarget target, NotificationProcessingContext ctx) {
+    private void processForTarget(NotificationTarget target, NotificationProcessingContext ctx) {
         Iterable<? extends NotificationRecipient> recipients;
         switch (target.getConfiguration().getType()) {
             case PLATFORM_USERS: {
@@ -231,43 +218,35 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         Set<NotificationDeliveryMethod> deliveryMethods = new HashSet<>(ctx.getDeliveryMethods());
         deliveryMethods.removeIf(deliveryMethod -> !target.getConfiguration().getType().getSupportedDeliveryMethods().contains(deliveryMethod));
         log.debug("[{}] Processing notification request for {} target ({}) for delivery methods {}", ctx.getRequest().getId(), target.getConfiguration().getType(), target.getId(), deliveryMethods);
+        if (deliveryMethods.isEmpty()) {
+            return;
+        }
 
-        List<ListenableFuture<Void>> results = new ArrayList<>();
-        if (!deliveryMethods.isEmpty()) {
-            for (NotificationRecipient recipient : recipients) {
-                for (NotificationDeliveryMethod deliveryMethod : deliveryMethods) {
-                    ListenableFuture<Void> resultFuture = processForRecipient(deliveryMethod, recipient, ctx);
-                    DonAsynchron.withCallback(resultFuture, result -> {
-                        ctx.getStats().reportSent(deliveryMethod, recipient);
-                    }, error -> {
-                        ctx.getStats().reportError(deliveryMethod, error, recipient);
-                    });
-                    results.add(resultFuture);
+        for (NotificationRecipient recipient : recipients) {
+            for (NotificationDeliveryMethod deliveryMethod : deliveryMethods) {
+                try {
+                    processForRecipient(deliveryMethod, recipient, ctx);
+                    ctx.getStats().reportSent(deliveryMethod, recipient);
+                } catch (Exception error) {
+                    ctx.getStats().reportError(deliveryMethod, error, recipient);
                 }
             }
         }
-        return results;
     }
 
-    private ListenableFuture<Void> processForRecipient(NotificationDeliveryMethod deliveryMethod, NotificationRecipient recipient, NotificationProcessingContext ctx) {
+    private void processForRecipient(NotificationDeliveryMethod deliveryMethod, NotificationRecipient recipient, NotificationProcessingContext ctx) throws Exception {
         if (ctx.getStats().contains(deliveryMethod, recipient.getId())) {
-            return Futures.immediateFailedFuture(new AlreadySentException());
+            throw new AlreadySentException();
         }
-
-        DeliveryMethodNotificationTemplate processedTemplate;
-        try {
-            processedTemplate = ctx.getProcessedTemplate(deliveryMethod, recipient);
-        } catch (Exception e) {
-            return Futures.immediateFailedFuture(e);
-        }
-
         NotificationChannel notificationChannel = channels.get(deliveryMethod);
+        DeliveryMethodNotificationTemplate processedTemplate = ctx.getProcessedTemplate(deliveryMethod, recipient);
+
         log.trace("[{}] Sending {} notification for recipient {}", ctx.getRequest().getId(), deliveryMethod, recipient);
-        return notificationChannel.sendNotification(recipient, processedTemplate, ctx);
+        notificationChannel.sendNotification(recipient, processedTemplate, ctx);
     }
 
     @Override
-    public ListenableFuture<Void> sendNotification(User recipient, WebDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) {
+    public void sendNotification(User recipient, WebDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
         NotificationRequest request = ctx.getRequest();
         Notification notification = Notification.builder()
                 .requestId(request.getId())
@@ -283,14 +262,14 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             notification = notificationService.saveNotification(recipient.getTenantId(), notification);
         } catch (Exception e) {
             log.error("Failed to create notification for recipient {}", recipient.getId(), e);
-            return Futures.immediateFailedFuture(e);
+            throw e;
         }
 
         NotificationUpdate update = NotificationUpdate.builder()
                 .created(true)
                 .notification(notification)
                 .build();
-        return onNotificationUpdate(recipient.getTenantId(), recipient.getId(), update);
+        onNotificationUpdate(recipient.getTenantId(), recipient.getId(), update);
     }
 
     @Override
@@ -384,13 +363,11 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         clusterService.pushMsgToCore(tenantId, notificationRequestId, toCoreMsg, null);
     }
 
-    private ListenableFuture<Void> onNotificationUpdate(TenantId tenantId, UserId recipientId, NotificationUpdate update) {
+    private void onNotificationUpdate(TenantId tenantId, UserId recipientId, NotificationUpdate update) {
         log.trace("Submitting notification update for recipient {}: {}", recipientId, update);
-        return Futures.submit(() -> {
-            forwardToSubscriptionManagerService(tenantId, recipientId, subscriptionManagerService -> {
-                subscriptionManagerService.onNotificationUpdate(tenantId, recipientId, update, TbCallback.EMPTY);
-            }, () -> TbSubscriptionUtils.notificationUpdateToProto(tenantId, recipientId, update));
-        }, wsCallBackExecutor);
+        forwardToSubscriptionManagerService(tenantId, recipientId, subscriptionManagerService -> {
+            subscriptionManagerService.onNotificationUpdate(tenantId, recipientId, update, TbCallback.EMPTY);
+        }, () -> TbSubscriptionUtils.notificationUpdateToProto(tenantId, recipientId, update));
     }
 
     private void onNotificationRequestUpdate(TenantId tenantId, NotificationRequestUpdate update) {

application/src/main/java/org/thingsboard/server/service/notification/channels/EmailNotificationChannel.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.notification.channels;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.thingsboard.rule.engine.api.MailService;
@@ -24,7 +23,6 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
-import org.thingsboard.server.service.mail.MailExecutorService;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
 
 @Component
@@ -32,19 +30,15 @@ import org.thingsboard.server.service.notification.NotificationProcessingContext
 public class EmailNotificationChannel implements NotificationChannel<User, EmailDeliveryMethodNotificationTemplate> {
 
     private final MailService mailService;
-    private final MailExecutorService executor;
 
     @Override
-    public ListenableFuture<Void> sendNotification(User recipient, EmailDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) {
-        return executor.submit(() -> {
-            mailService.send(recipient.getTenantId(), null, TbEmail.builder()
-                    .to(recipient.getEmail())
-                    .subject(processedTemplate.getSubject())
-                    .body(processedTemplate.getBody())
-                    .html(true)
-                    .build());
-            return null;
-        });
+    public void sendNotification(User recipient, EmailDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
+        mailService.send(recipient.getTenantId(), null, TbEmail.builder()
+                .to(recipient.getEmail())
+                .subject(processedTemplate.getSubject())
+                .body(processedTemplate.getBody())
+                .html(true)
+                .build());
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/notification/channels/NotificationChannel.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.notification.channels;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.targets.NotificationRecipient;
@@ -24,7 +23,7 @@ import org.thingsboard.server.service.notification.NotificationProcessingContext
 
 public interface NotificationChannel<R extends NotificationRecipient, T extends DeliveryMethodNotificationTemplate> {
 
-    ListenableFuture<Void> sendNotification(R recipient, T processedTemplate, NotificationProcessingContext ctx);
+    void sendNotification(R recipient, T processedTemplate, NotificationProcessingContext ctx) throws Exception;
 
     void check(TenantId tenantId) throws Exception;
 

application/src/main/java/org/thingsboard/server/service/notification/channels/SlackNotificationChannel.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.notification.channels;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.thingsboard.rule.engine.api.slack.SlackService;
@@ -26,7 +25,6 @@ import org.thingsboard.server.common.data.notification.settings.SlackNotificatio
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversation;
 import org.thingsboard.server.common.data.notification.template.SlackDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
-import org.thingsboard.server.service.executors.ExternalCallExecutorService;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
 
 @Component
@@ -35,15 +33,11 @@ public class SlackNotificationChannel implements NotificationChannel<SlackConver
 
     private final SlackService slackService;
     private final NotificationSettingsService notificationSettingsService;
-    private final ExternalCallExecutorService executor;
 
     @Override
-    public ListenableFuture<Void> sendNotification(SlackConversation conversation, SlackDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) {
+    public void sendNotification(SlackConversation conversation, SlackDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
         SlackNotificationDeliveryMethodConfig config = ctx.getDeliveryMethodConfig(NotificationDeliveryMethod.SLACK);
-        return executor.submit(() -> {
-            slackService.sendMessage(ctx.getTenantId(), config.getBotToken(), conversation.getId(), processedTemplate.getBody());
-            return null;
-        });
+        slackService.sendMessage(ctx.getTenantId(), config.getBotToken(), conversation.getId(), processedTemplate.getBody());
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/notification/channels/SmsNotificationChannel.java

@@ -15,8 +15,6 @@
  */
 package org.thingsboard.server.service.notification.channels;
 
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -26,26 +24,21 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.template.SmsDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.service.notification.NotificationProcessingContext;
-import org.thingsboard.server.service.sms.SmsExecutorService;
 
 @Component
 @RequiredArgsConstructor
 public class SmsNotificationChannel implements NotificationChannel<User, SmsDeliveryMethodNotificationTemplate> {
 
     private final SmsService smsService;
-    private final SmsExecutorService executor;
 
     @Override
-    public ListenableFuture<Void> sendNotification(User recipient, SmsDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) {
+    public void sendNotification(User recipient, SmsDeliveryMethodNotificationTemplate processedTemplate, NotificationProcessingContext ctx) throws Exception {
         String phone = recipient.getPhone();
         if (StringUtils.isBlank(phone)) {
-            return Futures.immediateFailedFuture(new RuntimeException("User does not have phone number"));
+            throw new RuntimeException("User does not have phone number");
         }
 
-        return executor.submit(() -> {
-            smsService.sendSms(recipient.getTenantId(), recipient.getCustomerId(), new String[]{phone}, processedTemplate.getBody());
-            return null;
-        });
+        smsService.sendSms(recipient.getTenantId(), recipient.getCustomerId(), new String[]{phone}, processedTemplate.getBody());
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/notification/rule/DefaultNotificationRuleProcessor.java

@@ -15,10 +15,11 @@
  */
 package org.thingsboard.server.service.notification.rule;
 
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Lazy;
@@ -38,34 +39,33 @@ import org.thingsboard.server.common.data.notification.info.NotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.NotificationRule;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
+import org.thingsboard.server.common.data.notification.settings.TriggerTypeConfig;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.common.msg.notification.trigger.NotificationRuleTrigger;
-import org.thingsboard.server.common.msg.notification.trigger.RuleEngineMsgTrigger;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
 import org.thingsboard.server.dao.util.limits.LimitedApi;
 import org.thingsboard.server.dao.util.limits.RateLimitService;
 import org.thingsboard.server.queue.discovery.PartitionService;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
 import org.thingsboard.server.service.executors.NotificationExecutorService;
 import org.thingsboard.server.service.notification.rule.cache.NotificationRulesCache;
 import org.thingsboard.server.service.notification.rule.trigger.NotificationRuleTriggerProcessor;
-import org.thingsboard.server.service.notification.rule.trigger.RuleEngineMsgNotificationRuleTriggerProcessor;
 
 import javax.annotation.PostConstruct;
-import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@ConfigurationProperties(prefix = "notification-system.rules")
 @Slf4j
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class DefaultNotificationRuleProcessor implements NotificationRuleProcessor {
@@ -79,6 +79,8 @@ public class DefaultNotificationRuleProcessor implements NotificationRuleProcess
     private final NotificationExecutorService notificationExecutor;
     private final CacheManager cacheManager;
     private Cache sentNotifications;
+    @Setter
+    private Map<NotificationRuleTriggerType, TriggerTypeConfig> triggerTypesConfigs;
 
     private final Map<NotificationRuleTriggerType, NotificationRuleTriggerProcessor> triggerProcessors = new EnumMap<>(NotificationRuleTriggerType.class);
 
@@ -93,20 +95,27 @@ public class DefaultNotificationRuleProcessor implements NotificationRuleProcess
     @Override
     public void process(NotificationRuleTrigger trigger) {
         NotificationRuleTriggerType triggerType = trigger.getType();
-        if (triggerType == null) return;
         TenantId tenantId = triggerType.isTenantLevel() ? trigger.getTenantId() : TenantId.SYS_TENANT_ID;
 
         try {
-            List<NotificationRule> rules = notificationRulesCache.getEnabled(tenantId, triggerType);
-            for (NotificationRule rule : rules) {
-                notificationExecutor.submit(() -> {
+            List<NotificationRule> enabledRules = notificationRulesCache.getEnabled(tenantId, triggerType);
+            if (enabledRules.isEmpty()) {
+                return;
+            }
+            if (trigger.deduplicate()) {
+                enabledRules = new ArrayList<>(enabledRules);
+                enabledRules.removeIf(rule -> alreadySent(rule, trigger));
+            }
+            final List<NotificationRule> rules = enabledRules;
+            notificationExecutor.submit(() -> {
+                for (NotificationRule rule : rules) {
                     try {
                         processNotificationRule(rule, trigger);
                     } catch (Throwable e) {
                         log.error("Failed to process notification rule {} for trigger type {} with trigger object {}", rule.getId(), rule.getTriggerType(), trigger, e);
                     }
-                });
-            }
+                }
+            });
         } catch (Throwable e) {
             log.error("Failed to process notification rules for trigger: {}", trigger, e);
         }
@@ -142,9 +151,6 @@ public class DefaultNotificationRuleProcessor implements NotificationRuleProcess
                 log.debug("[{}] Rate limit for notification requests per rule was exceeded (rule '{}')", rule.getTenantId(), rule.getName());
                 return;
             }
-            if (trigger.getType().isDeduplicate() && alreadySent(rule.getId(), trigger)) {
-                return;
-            }
 
             NotificationInfo notificationInfo = constructNotificationInfo(trigger, triggerConfig);
             rule.getRecipientsConfig().getTargetsTable().forEach((delay, targets) -> {
@@ -172,14 +178,13 @@ public class DefaultNotificationRuleProcessor implements NotificationRuleProcess
                 .ruleId(rule.getId())
                 .originatorEntityId(originatorEntityId)
                 .build();
-        notificationExecutor.submit(() -> {
-            try {
-                log.debug("Submitting notification request for rule '{}' with delay of {} sec to targets {}", rule.getName(), delayInSec, targets);
-                notificationCenter.processNotificationRequest(rule.getTenantId(), notificationRequest, null);
-            } catch (Exception e) {
-                log.error("Failed to process notification request for tenant {} for rule {}", rule.getTenantId(), rule.getId(), e);
-            }
-        });
+
+        try {
+            log.debug("Submitting notification request for rule '{}' with delay of {} sec to targets {}", rule.getName(), delayInSec, targets);
+            notificationCenter.processNotificationRequest(rule.getTenantId(), notificationRequest, null);
+        } catch (Exception e) {
+            log.error("Failed to process notification request for tenant {} for rule {}", rule.getTenantId(), rule.getId(), e);
+        }
     }
 
     private boolean matchesFilter(NotificationRuleTrigger trigger, NotificationRuleTriggerConfig triggerConfig) {
@@ -194,23 +199,34 @@ public class DefaultNotificationRuleProcessor implements NotificationRuleProcess
         return triggerProcessors.get(triggerConfig.getTriggerType()).constructNotificationInfo(trigger);
     }
 
-    private boolean alreadySent(NotificationRuleId ruleId, NotificationRuleTrigger trigger) {
-        String key = ruleId + "_" + trigger.getOriginatorEntityId();
-        SentNotification sent = sentNotifications.get(key, SentNotification.class);
-        boolean alreadySent;
-        if (sent != null && sent.getTrigger().equals(trigger)) {
-            alreadySent = true;
-            log.debug("Notification for {} trigger was already sent, ignoring", trigger.getType());
-            // updating cache anyway so that the value is not removed by ttl
-        } else {
-            alreadySent = false;
-            sent = new SentNotification(trigger);
+    private boolean alreadySent(NotificationRule rule, NotificationRuleTrigger trigger) {
+        String deduplicationKey = getDeduplicationKey(trigger, rule);
+
+        boolean alreadySent = false;
+        Long lastSentTs = sentNotifications.get(deduplicationKey, Long.class);
+        if (lastSentTs != null) {
+            long deduplicationDuration = Optional.ofNullable(triggerTypesConfigs)
+                    .map(triggerTypes -> triggerTypes.get(trigger.getType()))
+                    .map(TriggerTypeConfig::getDeduplicationDuration)
+                    .orElseGet(trigger::getDefaultDeduplicationDuration);
+            long passed = System.currentTimeMillis() - lastSentTs;
+            log.trace("Deduplicating trigger {} for rule '{}' by key '{}'. Deduplication duration: {} ms, passed: {} ms",
+                    trigger.getType(), rule.getName(), deduplicationKey, deduplicationDuration, passed);
+            if (deduplicationDuration == 0 || passed <= deduplicationDuration) {
+                alreadySent = true;
+            }
+        }
+        if (!alreadySent) {
+            lastSentTs = System.currentTimeMillis();
         }
-        log.trace("[{}] Putting to sentNotifications cache: {}", ruleId, trigger);
-        sentNotifications.put(key, sent);
+        sentNotifications.put(deduplicationKey, lastSentTs);
         return alreadySent;
     }
 
+    public static String getDeduplicationKey(NotificationRuleTrigger trigger, NotificationRule rule) {
+        return String.join("_", trigger.getDeduplicationKey(), rule.getDeduplicationKey());
+    }
+
     @EventListener(ComponentLifecycleMsg.class)
     public void onNotificationRuleDeleted(ComponentLifecycleMsg componentLifecycleMsg) {
         if (componentLifecycleMsg.getEvent() != ComponentLifecycleEvent.DELETED ||
@@ -232,24 +248,9 @@ public class DefaultNotificationRuleProcessor implements NotificationRuleProcess
 
     @Autowired
     public void setTriggerProcessors(Collection<NotificationRuleTriggerProcessor> processors) {
-        Map<String, NotificationRuleTriggerType> ruleEngineMsgTypeToTriggerType = new HashMap<>();
         processors.forEach(processor -> {
             triggerProcessors.put(processor.getTriggerType(), processor);
-            if (processor instanceof RuleEngineMsgNotificationRuleTriggerProcessor) {
-                Set<String> supportedMsgTypes = ((RuleEngineMsgNotificationRuleTriggerProcessor<?>) processor).getSupportedMsgTypes();
-                supportedMsgTypes.forEach(supportedMsgType -> {
-                    ruleEngineMsgTypeToTriggerType.put(supportedMsgType, processor.getTriggerType());
-                });
-            }
         });
-        RuleEngineMsgTrigger.msgTypeToTriggerType = ruleEngineMsgTypeToTriggerType;
-    }
-
-    @Data
-    private static class SentNotification implements Serializable {
-        private static final long serialVersionUID = 38973480405095422L;
-
-        private final NotificationRuleTrigger trigger;
     }
 
 }

application/src/main/java/org/thingsboard/server/service/notification/rule/cache/DefaultNotificationRulesCache.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.service.notification.rule.cache;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -50,7 +49,7 @@ public class DefaultNotificationRulesCache implements NotificationRulesCache {
     private int cacheMaxSize;
     @Value("${cache.notificationRules.timeToLiveInMinutes:30}")
     private int cacheValueTtl;
-    private Cache<CacheKey, List<NotificationRule>> cache;
+    private Cache<String, List<NotificationRule>> cache;
 
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
 
@@ -96,21 +95,15 @@ public class DefaultNotificationRulesCache implements NotificationRulesCache {
         }
     }
 
-    private void evict(TenantId tenantId) {
+    public void evict(TenantId tenantId) {
         cache.invalidateAll(Arrays.stream(NotificationRuleTriggerType.values())
                 .map(triggerType -> key(tenantId, triggerType))
                 .collect(Collectors.toList()));
         log.trace("Evicted all notification rules for tenant {} from cache", tenantId);
     }
 
-    private static CacheKey key(TenantId tenantId, NotificationRuleTriggerType triggerType) {
-        return new CacheKey(tenantId, triggerType);
-    }
-
-    @Data
-    private static class CacheKey {
-        private final TenantId tenantId;
-        private final NotificationRuleTriggerType triggerType;
+    private static String key(TenantId tenantId, NotificationRuleTriggerType triggerType) {
+        return tenantId + "_" + triggerType;
     }
 
 }

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmAssignmentTriggerProcessor.java

@@ -16,52 +16,48 @@
 package org.thingsboard.server.service.notification.rule.trigger;
 
 import org.springframework.stereotype.Service;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.DataConstants;
-import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmAssignee;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
+import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.notification.info.AlarmAssignmentNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig.Action;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
-import org.thingsboard.server.common.msg.notification.trigger.RuleEngineMsgTrigger;
-
-import java.util.Set;
+import org.thingsboard.server.common.msg.notification.trigger.AlarmAssignmentTrigger;
 
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.thingsboard.server.common.data.util.CollectionsUtil.emptyOrContains;
 
 @Service
-public class AlarmAssignmentTriggerProcessor implements RuleEngineMsgNotificationRuleTriggerProcessor<AlarmAssignmentNotificationRuleTriggerConfig> {
+public class AlarmAssignmentTriggerProcessor implements NotificationRuleTriggerProcessor<AlarmAssignmentTrigger, AlarmAssignmentNotificationRuleTriggerConfig> {
 
     @Override
-    public boolean matchesFilter(RuleEngineMsgTrigger trigger, AlarmAssignmentNotificationRuleTriggerConfig triggerConfig) {
-        Action action = trigger.getMsg().getType().equals(DataConstants.ALARM_ASSIGNED) ? Action.ASSIGNED : Action.UNASSIGNED;
+    public boolean matchesFilter(AlarmAssignmentTrigger trigger, AlarmAssignmentNotificationRuleTriggerConfig triggerConfig) {
+        Action action = trigger.getActionType() == ActionType.ALARM_ASSIGNED ? Action.ASSIGNED : Action.UNASSIGNED;
         if (!triggerConfig.getNotifyOn().contains(action)) {
             return false;
         }
-        Alarm alarm = JacksonUtil.fromString(trigger.getMsg().getData(), Alarm.class);
-        return emptyOrContains(triggerConfig.getAlarmTypes(), alarm.getType()) &&
-                emptyOrContains(triggerConfig.getAlarmSeverities(), alarm.getSeverity()) &&
-                (isEmpty(triggerConfig.getAlarmStatuses()) || AlarmStatusFilter.from(triggerConfig.getAlarmStatuses()).matches(alarm));
+        AlarmInfo alarmInfo = trigger.getAlarmInfo();
+        return emptyOrContains(triggerConfig.getAlarmTypes(), alarmInfo.getType()) &&
+                emptyOrContains(triggerConfig.getAlarmSeverities(), alarmInfo.getSeverity()) &&
+                (isEmpty(triggerConfig.getAlarmStatuses()) || AlarmStatusFilter.from(triggerConfig.getAlarmStatuses()).matches(alarmInfo));
     }
 
     @Override
-    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
-        AlarmInfo alarmInfo = JacksonUtil.fromString(trigger.getMsg().getData(), AlarmInfo.class);
+    public RuleOriginatedNotificationInfo constructNotificationInfo(AlarmAssignmentTrigger trigger) {
+        AlarmInfo alarmInfo = trigger.getAlarmInfo();
         AlarmAssignee assignee = alarmInfo.getAssignee();
         return AlarmAssignmentNotificationInfo.builder()
-                .action(trigger.getMsg().getType().equals(DataConstants.ALARM_ASSIGNED) ? "assigned" : "unassigned")
+                .action(trigger.getActionType() == ActionType.ALARM_ASSIGNED ? "assigned" : "unassigned")
                 .assigneeFirstName(assignee != null ? assignee.getFirstName() : null)
                 .assigneeLastName(assignee != null ? assignee.getLastName() : null)
                 .assigneeEmail(assignee != null ? assignee.getEmail() : null)
                 .assigneeId(assignee != null ? assignee.getId() : null)
-                .userEmail(trigger.getMsg().getMetaData().getValue("userEmail"))
-                .userFirstName(trigger.getMsg().getMetaData().getValue("userFirstName"))
-                .userLastName(trigger.getMsg().getMetaData().getValue("userLastName"))
+                .userEmail(trigger.getUser().getEmail())
+                .userFirstName(trigger.getUser().getFirstName())
+                .userLastName(trigger.getUser().getLastName())
                 .alarmId(alarmInfo.getUuidId())
                 .alarmType(alarmInfo.getType())
                 .alarmOriginator(alarmInfo.getOriginator())
@@ -77,9 +73,4 @@ public class AlarmAssignmentTriggerProcessor implements RuleEngineMsgNotificatio
         return NotificationRuleTriggerType.ALARM_ASSIGNMENT;
     }
 
-    @Override
-    public Set<String> getSupportedMsgTypes() {
-        return Set.of(DataConstants.ALARM_ASSIGNED, DataConstants.ALARM_UNASSIGNED);
-    }
-
 }

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/AlarmCommentTriggerProcessor.java

@@ -15,68 +15,67 @@
  */
 package org.thingsboard.server.service.notification.rule.trigger;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.thingsboard.common.util.JacksonUtil;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.alarm.Alarm;
-import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmCommentType;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmStatusFilter;
+import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.notification.info.AlarmCommentNotificationInfo;
 import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotificationInfo;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmCommentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
-import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.notification.trigger.RuleEngineMsgTrigger;
-
-import java.util.Set;
+import org.thingsboard.server.common.msg.notification.trigger.AlarmCommentTrigger;
+import org.thingsboard.server.dao.entity.EntityService;
 
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.thingsboard.server.common.data.util.CollectionsUtil.emptyOrContains;
 
 @Service
-public class AlarmCommentTriggerProcessor implements RuleEngineMsgNotificationRuleTriggerProcessor<AlarmCommentNotificationRuleTriggerConfig> {
+@RequiredArgsConstructor
+public class AlarmCommentTriggerProcessor implements NotificationRuleTriggerProcessor<AlarmCommentTrigger, AlarmCommentNotificationRuleTriggerConfig> {
+
+    private final EntityService entityService;
 
     @Override
-    public boolean matchesFilter(RuleEngineMsgTrigger trigger, AlarmCommentNotificationRuleTriggerConfig triggerConfig) {
-        TbMsg msg = trigger.getMsg();
-        if (msg.getMetaData().getValue("comment") == null) {
-            return false;
-        }
-        if (msg.getType().equals(DataConstants.COMMENT_UPDATED) && !triggerConfig.isNotifyOnCommentUpdate()) {
+    public boolean matchesFilter(AlarmCommentTrigger trigger, AlarmCommentNotificationRuleTriggerConfig triggerConfig) {
+        if (trigger.getActionType() == ActionType.UPDATED_COMMENT && !triggerConfig.isNotifyOnCommentUpdate()) {
             return false;
         }
         if (triggerConfig.isOnlyUserComments()) {
-            AlarmComment comment = JacksonUtil.fromString(msg.getMetaData().getValue("comment"), AlarmComment.class);
-            if (comment.getType() == AlarmCommentType.SYSTEM) {
+            if (trigger.getComment().getType() == AlarmCommentType.SYSTEM) {
                 return false;
             }
         }
-        Alarm alarm = JacksonUtil.fromString(msg.getData(), Alarm.class);
+        Alarm alarm = trigger.getAlarm();
         return emptyOrContains(triggerConfig.getAlarmTypes(), alarm.getType()) &&
                 emptyOrContains(triggerConfig.getAlarmSeverities(), alarm.getSeverity()) &&
                 (isEmpty(triggerConfig.getAlarmStatuses()) || AlarmStatusFilter.from(triggerConfig.getAlarmStatuses()).matches(alarm));
     }
 
     @Override
-    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
-        TbMsg msg = trigger.getMsg();
-        AlarmComment comment = JacksonUtil.fromString(msg.getMetaData().getValue("comment"), AlarmComment.class);
-        AlarmInfo alarmInfo = JacksonUtil.fromString(msg.getData(), AlarmInfo.class);
+    public RuleOriginatedNotificationInfo constructNotificationInfo(AlarmCommentTrigger trigger) {
+        Alarm alarm = trigger.getAlarm();
+        String originatorName;
+        if (alarm instanceof AlarmInfo) {
+            originatorName = ((AlarmInfo) alarm).getOriginatorName();
+        } else {
+            originatorName = entityService.fetchEntityName(trigger.getTenantId(), alarm.getOriginator()).orElse("");
+        }
         return AlarmCommentNotificationInfo.builder()
-                .comment(comment.getComment().get("text").asText())
-                .action(msg.getType().equals(DataConstants.COMMENT_CREATED) ? "added" : "updated")
-                .userEmail(msg.getMetaData().getValue("userEmail"))
-                .userFirstName(msg.getMetaData().getValue("userFirstName"))
-                .userLastName(msg.getMetaData().getValue("userLastName"))
-                .alarmId(alarmInfo.getUuidId())
-                .alarmType(alarmInfo.getType())
-                .alarmOriginator(alarmInfo.getOriginator())
-                .alarmOriginatorName(alarmInfo.getOriginatorName())
-                .alarmSeverity(alarmInfo.getSeverity())
-                .alarmStatus(alarmInfo.getStatus())
-                .alarmCustomerId(alarmInfo.getCustomerId())
+                .comment(trigger.getComment().getComment().get("text").asText())
+                .action(trigger.getActionType() == ActionType.ADDED_COMMENT ? "added" : "updated")
+                .userEmail(trigger.getUser().getEmail())
+                .userFirstName(trigger.getUser().getFirstName())
+                .userLastName(trigger.getUser().getLastName())
+                .alarmId(alarm.getUuidId())
+                .alarmType(alarm.getType())
+                .alarmOriginator(alarm.getOriginator())
+                .alarmOriginatorName(originatorName)
+                .alarmSeverity(alarm.getSeverity())
+                .alarmStatus(alarm.getStatus())
+                .alarmCustomerId(alarm.getCustomerId())
                 .build();
     }
 
@@ -85,9 +84,4 @@ public class AlarmCommentTriggerProcessor implements RuleEngineMsgNotificationRu
         return NotificationRuleTriggerType.ALARM_COMMENT;
     }
 
-    @Override
-    public Set<String> getSupportedMsgTypes() {
-        return Set.of(DataConstants.COMMENT_CREATED, DataConstants.COMMENT_UPDATED);
-    }
-
 }

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/DeviceActivityTriggerProcessor.java

@@ -18,9 +18,7 @@ package org.thingsboard.server.service.notification.rule.trigger;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
-import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.info.DeviceActivityNotificationInfo;
@@ -28,28 +26,22 @@ import org.thingsboard.server.common.data.notification.info.RuleOriginatedNotifi
 import org.thingsboard.server.common.data.notification.rule.trigger.DeviceActivityNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.DeviceActivityNotificationRuleTriggerConfig.DeviceEvent;
 import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerType;
-import org.thingsboard.server.common.msg.TbMsg;
-import org.thingsboard.server.common.msg.notification.trigger.RuleEngineMsgTrigger;
+import org.thingsboard.server.common.msg.notification.trigger.DeviceActivityTrigger;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 
-import java.util.Set;
-
 @Service
 @RequiredArgsConstructor
-public class DeviceActivityTriggerProcessor implements RuleEngineMsgNotificationRuleTriggerProcessor<DeviceActivityNotificationRuleTriggerConfig> {
+public class DeviceActivityTriggerProcessor implements NotificationRuleTriggerProcessor<DeviceActivityTrigger, DeviceActivityNotificationRuleTriggerConfig> {
 
     private final TbDeviceProfileCache deviceProfileCache;
 
     @Override
-    public boolean matchesFilter(RuleEngineMsgTrigger trigger, DeviceActivityNotificationRuleTriggerConfig triggerConfig) {
-        if (trigger.getMsg().getOriginator().getEntityType() != EntityType.DEVICE) {
-            return false;
-        }
-        DeviceEvent event = trigger.getMsg().getType().equals(DataConstants.ACTIVITY_EVENT) ? DeviceEvent.ACTIVE : DeviceEvent.INACTIVE;
+    public boolean matchesFilter(DeviceActivityTrigger trigger, DeviceActivityNotificationRuleTriggerConfig triggerConfig) {
+        DeviceEvent event = trigger.isActive() ? DeviceEvent.ACTIVE : DeviceEvent.INACTIVE;
         if (!triggerConfig.getNotifyOn().contains(event)) {
             return false;
         }
-        DeviceId deviceId = (DeviceId) trigger.getMsg().getOriginator();
+        DeviceId deviceId = trigger.getDeviceId();
         if (CollectionUtils.isNotEmpty(triggerConfig.getDevices())) {
             return triggerConfig.getDevices().contains(deviceId.getId());
         } else if (CollectionUtils.isNotEmpty(triggerConfig.getDeviceProfiles())) {
@@ -61,15 +53,14 @@ public class DeviceActivityTriggerProcessor implements RuleEngineMsgNotification
     }
 
     @Override
-    public RuleOriginatedNotificationInfo constructNotificationInfo(RuleEngineMsgTrigger trigger) {
-        TbMsg msg = trigger.getMsg();
+    public RuleOriginatedNotificationInfo constructNotificationInfo(DeviceActivityTrigger trigger) {
         return DeviceActivityNotificationInfo.builder()
-                .eventType(trigger.getMsg().getType().equals(DataConstants.ACTIVITY_EVENT) ? "active" : "inactive")
-                .deviceId(msg.getOriginator().getId())
-                .deviceName(msg.getMetaData().getValue("deviceName"))
-                .deviceType(msg.getMetaData().getValue("deviceType"))
-                .deviceLabel(msg.getMetaData().getValue("deviceLabel"))
-                .deviceCustomerId(msg.getCustomerId())
+                .eventType(trigger.isActive() ? "active" : "inactive")
+                .deviceId(trigger.getDeviceId().getId())
+                .deviceName(trigger.getDeviceName())
+                .deviceType(trigger.getDeviceType())
+                .deviceLabel(trigger.getDeviceLabel())
+                .deviceCustomerId(trigger.getCustomerId())
                 .build();
     }
 
@@ -78,9 +69,4 @@ public class DeviceActivityTriggerProcessor implements RuleEngineMsgNotification
         return NotificationRuleTriggerType.DEVICE_ACTIVITY;
     }
 
-    @Override
-    public Set<String> getSupportedMsgTypes() {
-        return Set.of(DataConstants.ACTIVITY_EVENT, DataConstants.INACTIVITY_EVENT);
-    }
-
 }

application/src/main/java/org/thingsboard/server/service/notification/rule/trigger/RuleEngineMsgNotificationRuleTriggerProcessor.java

@@ -1,27 +0,0 @@
-/**
- * Copyright © 2016-2023 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.service.notification.rule.trigger;
-
-import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTriggerConfig;
-import org.thingsboard.server.common.msg.notification.trigger.RuleEngineMsgTrigger;
-
-import java.util.Set;
-
-public interface RuleEngineMsgNotificationRuleTriggerProcessor<C extends NotificationRuleTriggerConfig> extends NotificationRuleTriggerProcessor<RuleEngineMsgTrigger, C> {
-
-    Set<String> getSupportedMsgTypes();
-
-}

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

@@ -63,7 +63,7 @@ import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.DataDecodingEncodingService;

application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java

@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.service.resource;
 
+import com.google.common.hash.HashCode;
+import com.google.common.hash.Hashing;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
@@ -22,6 +24,7 @@ import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.TbResourceInfoFilter;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -35,6 +38,7 @@ import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 
+import java.util.Base64;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -72,13 +76,13 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
     }
 
     @Override
-    public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink) {
-        return resourceService.findAllTenantResourcesByTenantId(tenantId, pageLink);
+    public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
+        return resourceService.findAllTenantResourcesByTenantId(filter, pageLink);
     }
 
     @Override
-    public PageData<TbResourceInfo> findTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink) {
-        return resourceService.findTenantResourcesByTenantId(tenantId, pageLink);
+    public PageData<TbResourceInfo> findTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink) {
+        return resourceService.findTenantResourcesByTenantId(filter, pageLink);
     }
 
     @Override
@@ -165,6 +169,8 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
         } else {
             resource.setResourceKey(resource.getFileName());
         }
+        HashCode hashCode = Hashing.sha256().hashBytes(Base64.getDecoder().decode(resource.getData().getBytes()));
+        resource.setEtag(hashCode.toString());
         return resourceService.saveResource(resource);
     }
 }

application/src/main/java/org/thingsboard/server/service/resource/TbResourceService.java

@@ -18,6 +18,7 @@ package org.thingsboard.server.service.resource;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.TbResourceInfoFilter;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
@@ -35,9 +36,9 @@ public interface TbResourceService extends SimpleTbEntityService<TbResource> {
 
     TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId);
 
-    PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink);
+    PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink);
 
-    PageData<TbResourceInfo> findTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink);
+    PageData<TbResourceInfo> findTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink);
 
     List<LwM2mObject> findLwM2mObject(TenantId tenantId,
                                       String sortOrder,

application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtils.java

@@ -15,22 +15,30 @@
  */
 package org.thingsboard.server.service.security.auth.oauth2;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.SerializationUtils;
+import org.springframework.security.jackson2.SecurityJackson2Modules;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Optional;
 
 @Slf4j
 public class CookieUtils {
 
+    private static final ObjectMapper OBJECT_MAPPER;
+
+    static {
+        ClassLoader loader = CookieUtils.class.getClassLoader();
+        OBJECT_MAPPER = new ObjectMapper();
+        OBJECT_MAPPER.registerModules(SecurityJackson2Modules.getModules(loader));
+    }
+
     public static Optional<Cookie> getCookie(HttpServletRequest request, String name) {
         Cookie[] cookies = request.getCookies();
 
@@ -56,7 +64,7 @@ public class CookieUtils {
     public static void deleteCookie(HttpServletRequest request, HttpServletResponse response, String name) {
         Cookie[] cookies = request.getCookies();
         if (cookies != null && cookies.length > 0) {
-            for (Cookie cookie: cookies) {
+            for (Cookie cookie : cookies) {
                 if (cookie.getName().equals(name)) {
                     cookie.setValue("");
                     cookie.setPath("/");
@@ -68,27 +76,22 @@ public class CookieUtils {
     }
 
     public static String serialize(Object object) {
-        return Base64.getUrlEncoder()
-                .encodeToString(SerializationUtils.serialize(object));
+        try {
+            return Base64.getUrlEncoder()
+                    .encodeToString(OBJECT_MAPPER.writeValueAsBytes(object));
+        } catch (JsonProcessingException e) {
+            throw new IllegalArgumentException("The given Json object value: "
+                    + object + " cannot be transformed to a String", e);
+        }
     }
 
     public static <T> T deserialize(Cookie cookie, Class<T> cls) {
         byte[] decodedBytes = Base64.getUrlDecoder().decode(cookie.getValue());
-        try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(decodedBytes)) {
-            @Override
-            protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-                String name = desc.getName();
-                if (!cls.getName().equals(name)) {
-                    throw new ClassNotFoundException("Class not allowed for deserialization: " + name);
-                }
-                return super.resolveClass(desc);
-            }
-        }) {
-
-            return cls.cast(ois.readObject());
-        } catch (Exception e) {
-            log.debug("Failed to deserialize class from cookie.", e.getCause());
-            return null;
+        try {
+            return OBJECT_MAPPER.readValue(decodedBytes, cls);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("The given string value: "
+                    + Arrays.toString(decodedBytes) + " cannot be transformed to Json object", e);
         }
     }
 }

application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java

@@ -19,9 +19,13 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasTenantId;
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -44,6 +48,7 @@ public class CustomerUserPermissions extends AbstractPermissions {
         put(Resource.RPC, rpcPermissionChecker);
         put(Resource.DEVICE_PROFILE, profilePermissionChecker);
         put(Resource.ASSET_PROFILE, profilePermissionChecker);
+        put(Resource.TB_RESOURCE, customerResourcePermissionChecker);
     }
 
     private static final PermissionChecker customerAlarmPermissionChecker = new PermissionChecker() {
@@ -95,6 +100,26 @@ public class CustomerUserPermissions extends AbstractPermissions {
 
             };
 
+    private static final PermissionChecker customerResourcePermissionChecker =
+            new PermissionChecker<TbResourceId, TbResourceInfo>() {
+
+                @Override
+                @SuppressWarnings("unchecked")
+                public boolean hasPermission(SecurityUser user, Operation operation, TbResourceId resourceId, TbResourceInfo resource) {
+                    if (operation != Operation.READ) {
+                        return false;
+                    }
+                    if (resource.getResourceType() == null || !resource.getResourceType().isCustomerAccess()) {
+                        return false;
+                    }
+                    if (resource.getTenantId() == null || resource.getTenantId().isNullUid()) {
+                        return true;
+                    }
+                    return user.getTenantId().equals(resource.getTenantId());
+                }
+
+            };
+
     private static final PermissionChecker customerDashboardPermissionChecker =
             new PermissionChecker.GenericPermissionChecker<DashboardId, DashboardInfo>(Operation.READ, Operation.READ_ATTRIBUTES, Operation.READ_TELEMETRY) {
 

application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java

@@ -31,7 +31,6 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
@@ -63,6 +62,8 @@ import org.thingsboard.server.common.data.query.EntityListFilter;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.trigger.DeviceActivityTrigger;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
@@ -70,12 +71,10 @@ import org.thingsboard.server.common.stats.TbApiUsageReportClient;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.sql.query.EntityQueryRepository;
-import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.util.DbTypeInfoComponent;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.discovery.PartitionService;
-import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.partition.AbstractPartitionBasedService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
@@ -158,6 +157,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
     private final EntityQueryRepository entityQueryRepository;
     private final DbTypeInfoComponent dbTypeInfoComponent;
     private final TbApiUsageReportClient apiUsageReportClient;
+    private final NotificationRuleProcessor notificationRuleProcessor;
     @Autowired @Lazy
     private TelemetrySubscriptionService tsSubService;
 
@@ -254,8 +254,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
             state.setLastActivityTime(lastReportedActivity);
             if (!state.isActive()) {
                 state.setActive(true);
-                save(deviceId, ACTIVITY_STATE, true);
-                pushRuleEngineMessage(stateData, ACTIVITY_EVENT);
+                onDeviceActivityStatusChange(deviceId, true, stateData);
             }
         } else {
             log.debug("updateActivityState - fetched state IN NULL for device {}, lastReportedActivity {}", deviceId, lastReportedActivity);
@@ -491,9 +490,8 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
                     state.setActive(false);
                     state.setLastInactivityAlarmTime(ts);
-                    save(deviceId, ACTIVITY_STATE, false);
+                    onDeviceActivityStatusChange(deviceId, false, stateData);
                     save(deviceId, INACTIVITY_ALARM_TIME, ts);
-                    pushRuleEngineMessage(stateData, INACTIVITY_EVENT);
                 } else {
                     cleanupEntity(deviceId);
                 }
@@ -533,6 +531,19 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         }
     }
 
+    private void onDeviceActivityStatusChange(DeviceId deviceId, boolean active, DeviceStateData stateData) {
+        save(deviceId, ACTIVITY_STATE, active);
+        pushRuleEngineMessage(stateData, active ? ACTIVITY_EVENT : INACTIVITY_EVENT);
+        TbMsgMetaData metaData = stateData.getMetaData();
+        notificationRuleProcessor.process(DeviceActivityTrigger.builder()
+                .tenantId(stateData.getTenantId()).customerId(stateData.getCustomerId())
+                .deviceId(deviceId).active(active)
+                .deviceName(metaData.getValue("deviceName"))
+                .deviceType(metaData.getValue("deviceType"))
+                .deviceLabel(metaData.getValue("deviceLabel"))
+                .build());
+    }
+
     private boolean cleanDeviceStateIfBelongsExternalPartition(TenantId tenantId, final DeviceId deviceId) {
         TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, tenantId, deviceId);
         boolean cleanup = !partitionedEntities.containsKey(tpi);

application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java

@@ -52,7 +52,7 @@ import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.stats.TbApiUsageReportClient;
 import org.thingsboard.server.dao.alarm.AlarmOperationResult;
 import org.thingsboard.server.dao.alarm.AlarmService;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.entitiy.alarm.TbAlarmCommentService;
 import org.thingsboard.server.service.subscription.TbSubscriptionUtils;

application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java

@@ -29,7 +29,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.UpdateMessage;
 import org.thingsboard.server.common.msg.notification.trigger.NewPlatformVersionTrigger;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 

application/src/main/resources/logback.xml

@@ -51,6 +51,9 @@
     <!-- MQTT transport debug -->
     <!--    <logger name="org.thingsboard.server.transport.mqtt.MqttTransportHandler" level="DEBUG" /> -->
 
+    <!-- Device actor message processor debug -->
+    <!--    <logger name="org.thingsboard.server.actors.device.DeviceActorMessageProcessor" level="DEBUG" />-->
+
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
 
     <root level="INFO">

application/src/main/resources/templates/mail_config_templates.json

@@ -0,0 +1,52 @@
+[
+  {
+    "providerId": "SENDGRID",
+    "smtpProtocol": "SMTPS",
+    "smtpHost": "smtp.sendgrid.net",
+    "smtpPort": 465,
+    "timeout": 10000,
+    "enableTls": true,
+    "tlsVersion": "TLSv1.2",
+    "authorizationUri": null,
+    "accessTokenUri": null,
+    "scope": [
+      ""
+    ],
+    "helpLink": null,
+    "name": "SendGrid"
+  },
+  {
+    "providerId": "GOOGLE",
+    "smtpProtocol": "SMTPS",
+    "smtpHost": "smtp.gmail.com",
+    "smtpPort": 465,
+    "timeout": 10000,
+    "enableTls": true,
+    "tlsVersion": "TLSv1.2",
+    "authorizationUri": "https://accounts.google.com/o/oauth2/v2/auth?prompt=consent&access_type=offline",
+    "accessTokenUri": "https://oauth2.googleapis.com/token",
+    "scope": [
+      "https://mail.google.com/"
+    ],
+    "helpLink": "https://support.google.com/googleapi/answer/6158849",
+    "name": "Google"
+  },
+  {
+    "providerId": "OFFICE_365",
+    "smtpProtocol": "SMTP",
+    "smtpHost": "smtp.office365.com",
+    "smtpPort": 587,
+    "timeout": 10000,
+    "enableTls": true,
+    "tlsVersion": "TLSv1.2",
+    "authorizationUri": "https://login.microsoftonline.com/%s/oauth2/v2.0/authorize",
+    "accessTokenUri": "https://login.microsoftonline.com/%s/oauth2/v2.0/token",
+    "scope": [
+      "https://outlook.office365.com/SMTP.Send",
+      "offline_access",
+      "openid"
+    ],
+    "helpLink": "https://learn.microsoft.com/en-us/exchange/client-developer/legacy-protocols/how-to-authenticate-an-imap-pop-smtp-application-by-using-oauth",
+    "name": "Office 365"
+  }
+]

application/src/main/resources/thingsboard.yml

@@ -135,6 +135,10 @@ security:
     path: "${SECURITY_JAVA_CACERTS_PATH:${java.home}/lib/security/cacerts}"
     password: "${SECURITY_JAVA_CACERTS_PASSWORD:changeit}"
 
+mail:
+  oauth2:
+    refreshTokenCheckingInterval: "${REFRESH_TOKEN_EXPIRATION_CHECKING_INTERVAL:86400}" # Number of seconds (1 day).
+
 # Usage statistics parameters
 usage:
   stats:
@@ -159,7 +163,7 @@ ui:
   # Help parameters
   help:
     # Base url for UI help assets
-    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.5}"
+    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.5.1}"
 
 database:
   ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # Max number of DB queries generated by single API call to fetch telemetry records
@@ -502,7 +506,7 @@ cache:
 spring.data.redis.repositories.enabled: false
 
 redis:
-  # standalone or cluster
+  # standalone or cluster or sentinel
   connection:
     type: "${REDIS_CONNECTION_TYPE:standalone}"
   standalone:
@@ -522,6 +526,16 @@ redis:
     nodes: "${REDIS_NODES:}"
     # Maximum number of redirects to follow when executing commands across the cluster.
     max-redirects: "${REDIS_MAX_REDIRECTS:12}"
+    # if set false will be used pool config build from values of the pool config section
+    useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
+  sentinel:
+    # name of master node
+    master: "${REDIS_MASTER:}"
+    # comma-separated list of "host:port" pairs of sentinels
+    sentinels: "${REDIS_SENTINELS:}"
+    # password to authenticate with sentinel
+    password: "${REDIS_SENTINEL_PASSWORD:}"
+    # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
   # db index
   db: "${REDIS_DB:0}"
@@ -1261,6 +1275,11 @@ vc:
 
 notification_system:
   thread_pool_size: "${TB_NOTIFICATION_SYSTEM_THREAD_POOL_SIZE:10}"
+  rules:
+    trigger_types_configs:
+      NEW_PLATFORM_VERSION:
+        # In milliseconds, infinitely by default
+        deduplication_duration: "${NEW_PLATFORM_VERSION_NOTIFICATION_RULE_DEDUPLICATION_DURATION:0}"
 
 management:
   endpoints:

application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java

@@ -264,7 +264,7 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
         int cntTime = 1;
         testNotificationMsgToEdgeServiceTime(entityId, tenantId, actionType, cntTime);
         testLogEntityAction(entity, originatorId, tenantId, customerId, userId, userName, actionType, cntTime, additionalInfo);
-        tesPushMsgToCoreTime(cntTime);
+        testPushMsgToCoreTime(cntTime);
         Mockito.reset(tbClusterService, auditLogService);
     }
 
@@ -363,13 +363,13 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
                 Mockito.any(entityId.getClass()), Mockito.any(ComponentLifecycleEvent.class));
     }
 
-    private void tesPushMsgToCoreTime(int cntTime) {
+    private void testPushMsgToCoreTime(int cntTime) {
         Mockito.verify(tbClusterService, times(cntTime)).pushMsgToCore(Mockito.any(ToDeviceActorNotificationMsg.class), Mockito.isNull());
     }
 
     protected void testLogEntityAction(HasName entity, EntityId originatorId, TenantId tenantId,
-                                     CustomerId customerId, UserId userId, String userName,
-                                     ActionType actionType, int cntTime, Object... additionalInfo) {
+                                       CustomerId customerId, UserId userId, String userName,
+                                       ActionType actionType, int cntTime, Object... additionalInfo) {
         ArgumentMatcher<HasName> matcherEntityEquals = entity == null ? Objects::isNull : argument -> argument.toString().equals(entity.toString());
         ArgumentMatcher<EntityId> matcherOriginatorId = argument -> argument.equals(originatorId);
         ArgumentMatcher<CustomerId> matcherCustomerId = customerId == null ?
@@ -380,10 +380,10 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
                 actionType, cntTime, extractMatcherAdditionalInfo(additionalInfo));
     }
 
-    private void testLogEntityActionEntityEqClass(HasName entity, EntityId originatorId, TenantId tenantId,
-                                                  CustomerId customerId, UserId userId, String userName,
-                                                  ActionType actionType, int cntTime, Object... additionalInfo) {
-        ArgumentMatcher<HasName> matcherEntityEquals = argument -> argument.getClass().equals(entity.getClass());
+    protected void testLogEntityActionEntityEqClass(HasName entity, EntityId originatorId, TenantId tenantId,
+                                                    CustomerId customerId, UserId userId, String userName,
+                                                    ActionType actionType, int cntTime, Object... additionalInfo) {
+        ArgumentMatcher<HasName> matcherEntityEquals = argument -> entity.getClass().isAssignableFrom(argument.getClass());
         ArgumentMatcher<EntityId> matcherOriginatorId = argument -> argument.equals(originatorId);
         ArgumentMatcher<CustomerId> matcherCustomerId = customerId == null ?
                 argument -> argument.getClass().equals(CustomerId.class) : argument -> argument.equals(customerId);
@@ -600,8 +600,8 @@ public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
         return fieldName + " length must be equal or less than 255";
     }
 
-    protected String msgErrorNoFound(String entityClassName, String assetIdStr) {
-        return entityClassName + " with id [" + assetIdStr + "] is not found";
+    protected String msgErrorNoFound(String entityClassName, String entityIdStr) {
+        return entityClassName + " with id [" + entityIdStr + "] is not found";
     }
 
     private String entityClassToEntityTypeName(HasName entity) {

application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java

@@ -166,6 +166,8 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     private static final String CUSTOMER_USER_PASSWORD = "customer";
 
     protected static final String DIFFERENT_CUSTOMER_USER_EMAIL = "testdifferentcustomer@thingsboard.org";
+
+    protected static final String DIFFERENT_TENANT_CUSTOMER_USER_EMAIL = "testdifferenttenantcustomer@thingsboard.org";
     private static final String DIFFERENT_CUSTOMER_USER_PASSWORD = "diffcustomer";
 
     /**
@@ -191,9 +193,13 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     protected CustomerId customerId;
     protected TenantId differentTenantId;
     protected CustomerId differentCustomerId;
+
+    protected CustomerId differentTenantCustomerId;
     protected UserId customerUserId;
     protected UserId differentCustomerUserId;
 
+    protected UserId differentTenantCustomerUserId;
+
     @SuppressWarnings("rawtypes")
     private HttpMessageConverter mappingJackson2HttpMessageConverter;
 
@@ -365,7 +371,9 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
     protected Tenant savedDifferentTenant;
     protected User savedDifferentTenantUser;
     private Customer savedDifferentCustomer;
+    private Customer savedDifferentTenantCustomer;
     protected User differentCustomerUser;
+    protected User differentTenantCustomerUser;
 
     protected void loginDifferentTenant() throws Exception {
         if (savedDifferentTenant != null) {
@@ -407,6 +415,24 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         }
     }
 
+    protected void loginDifferentTenantCustomer() throws Exception {
+        if (savedDifferentTenantCustomer != null) {
+            login(savedDifferentTenantCustomer.getEmail(), CUSTOMER_USER_PASSWORD);
+        } else {
+            createDifferentTenantCustomer();
+
+            loginDifferentTenant();
+            differentTenantCustomerUser = new User();
+            differentTenantCustomerUser.setAuthority(Authority.CUSTOMER_USER);
+            differentTenantCustomerUser.setTenantId(savedDifferentTenantCustomer.getTenantId());
+            differentTenantCustomerUser.setCustomerId(savedDifferentTenantCustomer.getId());
+            differentTenantCustomerUser.setEmail(DIFFERENT_TENANT_CUSTOMER_USER_EMAIL);
+
+            differentTenantCustomerUser = createUserAndLogin(differentTenantCustomerUser, DIFFERENT_CUSTOMER_USER_PASSWORD);
+            differentTenantCustomerUserId = differentTenantCustomerUser.getId();
+        }
+    }
+
     protected void createDifferentCustomer() throws Exception {
         loginTenantAdmin();
 
@@ -419,6 +445,18 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         resetTokens();
     }
 
+    protected void createDifferentTenantCustomer() throws Exception {
+        loginDifferentTenant();
+
+        Customer customer = new Customer();
+        customer.setTitle("Different tenant customer");
+        savedDifferentTenantCustomer = doPost("/api/customer", customer, Customer.class);
+        Assert.assertNotNull(savedDifferentTenantCustomer);
+        differentTenantCustomerId = savedDifferentTenantCustomer.getId();
+
+        resetTokens();
+    }
+
     protected void deleteDifferentTenant() throws Exception {
         if (savedDifferentTenant != null) {
             loginSysAdmin();
@@ -601,6 +639,13 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         return mockMvc.perform(getRequest);
     }
 
+    protected ResultActions doGet(String urlTemplate, HttpHeaders httpHeaders, Object... urlVariables) throws Exception {
+        MockHttpServletRequestBuilder getRequest = get(urlTemplate, urlVariables);
+        getRequest.headers(httpHeaders);
+        setJwtToken(getRequest);
+        return mockMvc.perform(getRequest);
+    }
+
     protected <T> T doGet(String urlTemplate, Class<T> responseClass, Object... urlVariables) throws Exception {
         return readResponse(doGet(urlTemplate, urlVariables).andExpect(status().isOk()), responseClass);
     }

application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java

@@ -46,6 +46,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @Slf4j
@@ -104,7 +105,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
 
         AlarmComment createdComment = createAlarmComment(alarm.getId());
 
-        testLogEntityAction(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ADDED_COMMENT, 1, createdComment);
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.ADDED_COMMENT, 1, createdComment);
     }
 
     @Test
@@ -116,7 +117,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         AlarmComment createdComment = createAlarmComment(alarm.getId());
         Assert.assertEquals(AlarmCommentType.OTHER, createdComment.getType());
 
-        testLogEntityAction(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ADDED_COMMENT, 1, createdComment);
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.ADDED_COMMENT, 1, createdComment);
     }
 
     @Test
@@ -135,7 +136,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         Assert.assertEquals("true", updatedAlarmComment.getComment().get("edited").asText());
         Assert.assertNotNull(updatedAlarmComment.getComment().get("editedOn"));
 
-        testLogEntityAction(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.UPDATED_COMMENT, 1, savedComment);
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.UPDATED_COMMENT, 1, savedComment);
     }
 
     @Test
@@ -154,7 +155,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         Assert.assertEquals("true", updatedAlarmComment.getComment().get("edited").asText());
         Assert.assertNotNull(updatedAlarmComment.getComment().get("editedOn"));
 
-        testLogEntityAction(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.UPDATED_COMMENT, 1, updatedAlarmComment);
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.UPDATED_COMMENT, 1, updatedAlarmComment);
     }
 
     @Test
@@ -169,8 +170,8 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         savedComment.setComment(newComment);
 
         doPost("/api/alarm/" + alarm.getId() + "/comment", savedComment)
-                .andExpect(status().isForbidden())
-                .andExpect(statusReason(containsString(msgErrorPermission)));
+                .andExpect(status().isNotFound())
+                .andExpect(statusReason(equalTo(msgErrorNoFound("Alarm", alarm.getId().toString()))));
 
         testNotifyEntityNever(alarm.getId(), savedComment);
     }
@@ -209,7 +210,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
                 .comment(JacksonUtil.newObjectNode().put("text", String.format("User %s deleted his comment",
                         CUSTOMER_USER_EMAIL)))
                 .build();
-        testLogEntityAction(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
     }
 
     @Test
@@ -228,7 +229,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
                 .comment(JacksonUtil.newObjectNode().put("text", String.format("User %s deleted his comment",
                         TENANT_ADMIN_EMAIL)))
                 .build();
-        testLogEntityAction(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
     }
 
     @Test
@@ -355,16 +356,18 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         Assert.assertTrue("Created alarm doesn't match the found one!", equals);
     }
 
-    private AlarmComment createAlarmComment(AlarmId alarmId, String text)  {
+    private AlarmComment createAlarmComment(AlarmId alarmId, String text) {
         AlarmComment alarmComment = AlarmComment.builder()
                 .comment(JacksonUtil.newObjectNode().set("text", new TextNode(text)))
                 .build();
 
         return saveAlarmComment(alarmId, alarmComment);
     }
-    private AlarmComment createAlarmComment(AlarmId alarmId)  {
+
+    private AlarmComment createAlarmComment(AlarmId alarmId) {
         return createAlarmComment(alarmId, "Please take a look");
     }
+
     private AlarmComment saveAlarmComment(AlarmId alarmId, AlarmComment alarmComment) {
         alarmComment = doPost("/api/alarm/" + alarmId + "/comment", alarmComment, AlarmComment.class);
         Assert.assertNotNull(alarmComment);

application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright © 2016-2023 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.controller;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.junit.Assert;
+import org.junit.Test;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.queue.ProcessingStrategy;
+import org.thingsboard.server.common.data.queue.ProcessingStrategyType;
+import org.thingsboard.server.common.data.queue.Queue;
+import org.thingsboard.server.common.data.queue.SubmitStrategy;
+import org.thingsboard.server.common.data.queue.SubmitStrategyType;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@DaoSqlTest
+public class BaseQueueControllerTest extends AbstractControllerTest {
+
+    @Test
+    public void testQueueWithServiceTypeRE() throws Exception {
+        loginSysAdmin();
+
+        // create queue
+        Queue queue = new Queue();
+        queue.setName("qwerty");
+        queue.setTopic("tb_rule_engine.qwerty");
+        queue.setPollInterval(25);
+        queue.setPartitions(10);
+        queue.setTenantId(TenantId.SYS_TENANT_ID);
+        queue.setConsumerPerPartition(false);
+        queue.setPackProcessingTimeout(2000);
+        SubmitStrategy submitStrategy = new SubmitStrategy();
+        submitStrategy.setType(SubmitStrategyType.SEQUENTIAL_BY_ORIGINATOR);
+        queue.setSubmitStrategy(submitStrategy);
+        ProcessingStrategy processingStrategy = new ProcessingStrategy();
+        processingStrategy.setType(ProcessingStrategyType.RETRY_ALL);
+        processingStrategy.setRetries(3);
+        processingStrategy.setFailurePercentage(0.7);
+        processingStrategy.setPauseBetweenRetries(3);
+        processingStrategy.setMaxPauseBetweenRetries(5);
+        queue.setProcessingStrategy(processingStrategy);
+
+        // create queue
+        Queue queue2 = new Queue();
+        queue2.setName("qwerty2");
+        queue2.setTopic("tb_rule_engine.qwerty2");
+        queue2.setPollInterval(25);
+        queue2.setPartitions(10);
+        queue2.setTenantId(TenantId.SYS_TENANT_ID);
+        queue2.setConsumerPerPartition(false);
+        queue2.setPackProcessingTimeout(2000);
+        submitStrategy.setType(SubmitStrategyType.SEQUENTIAL_BY_ORIGINATOR);
+        queue2.setSubmitStrategy(submitStrategy);
+        processingStrategy.setType(ProcessingStrategyType.RETRY_ALL);
+        processingStrategy.setRetries(3);
+        processingStrategy.setFailurePercentage(0.7);
+        processingStrategy.setPauseBetweenRetries(3);
+        processingStrategy.setMaxPauseBetweenRetries(5);
+        queue2.setProcessingStrategy(processingStrategy);
+
+        Queue savedQueue = doPost("/api/queues?serviceType=" + "TB-RULE-ENGINE", queue, Queue.class);
+        Queue savedQueue2 = doPost("/api/queues?serviceType=" + "TB_RULE_ENGINE", queue2, Queue.class);
+
+        PageLink pageLink = new PageLink(10);
+        PageData<Queue> pageData;
+        pageData = doGetTypedWithPageLink("/api/queues?serviceType=TB-RULE-ENGINE&", new TypeReference<>() {
+        }, pageLink);
+        Assert.assertFalse(pageData.getData().isEmpty());
+        doDelete("/api/queues/" + savedQueue.getUuidId())
+                .andExpect(status().isOk());
+
+        pageData = doGetTypedWithPageLink("/api/queues?serviceType=TB_RULE_ENGINE&", new TypeReference<>() {
+        }, pageLink);
+        Assert.assertFalse(pageData.getData().isEmpty());
+        doDelete("/api/queues/" + savedQueue2.getUuidId())
+                .andExpect(status().isOk());
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.notification;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.util.Pair;
@@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.NotificationRequestId;
 import org.thingsboard.server.common.data.id.NotificationTargetId;
 import org.thingsboard.server.common.data.id.NotificationTemplateId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.notification.Notification;
@@ -43,6 +45,7 @@ import org.thingsboard.server.common.data.notification.settings.NotificationSett
 import org.thingsboard.server.common.data.notification.targets.NotificationTarget;
 import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.targets.platform.UserListFilter;
+import org.thingsboard.server.common.data.notification.targets.platform.UsersFilter;
 import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.NotificationTemplate;
@@ -54,6 +57,10 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.controller.AbstractControllerTest;
 import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.notification.NotificationRequestService;
+import org.thingsboard.server.dao.notification.NotificationRuleService;
+import org.thingsboard.server.dao.notification.NotificationTargetService;
+import org.thingsboard.server.dao.notification.NotificationTemplateService;
 
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -72,21 +79,40 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
 
     @MockBean
     protected SlackService slackService;
-
     @Autowired
     protected MailService mailService;
 
+    @Autowired
+    protected NotificationRuleService notificationRuleService;
+    @Autowired
+    protected NotificationTemplateService notificationTemplateService;
+    @Autowired
+    protected NotificationTargetService notificationTargetService;
+    @Autowired
+    protected NotificationRequestService notificationRequestService;
+
     public static final String DEFAULT_NOTIFICATION_SUBJECT = "Just a test";
     public static final NotificationType DEFAULT_NOTIFICATION_TYPE = NotificationType.GENERAL;
 
+    @After
+    public void afterEach() {
+        notificationRequestService.deleteNotificationRequestsByTenantId(TenantId.SYS_TENANT_ID);
+        notificationRuleService.deleteNotificationRulesByTenantId(TenantId.SYS_TENANT_ID);
+        notificationTemplateService.deleteNotificationTemplatesByTenantId(TenantId.SYS_TENANT_ID);
+        notificationTargetService.deleteNotificationTargetsByTenantId(TenantId.SYS_TENANT_ID);
+    }
+
     protected NotificationTarget createNotificationTarget(UserId... usersIds) {
-        NotificationTarget notificationTarget = new NotificationTarget();
-        notificationTarget.setTenantId(tenantId);
-        notificationTarget.setName("Users " + List.of(usersIds));
-        PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
         UserListFilter filter = new UserListFilter();
         filter.setUsersIds(DaoUtil.toUUIDs(List.of(usersIds)));
-        targetConfig.setUsersFilter(filter);
+        return createNotificationTarget(filter);
+    }
+
+    protected NotificationTarget createNotificationTarget(UsersFilter usersFilter) {
+        NotificationTarget notificationTarget = new NotificationTarget();
+        notificationTarget.setName(usersFilter.toString());
+        PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
+        targetConfig.setUsersFilter(usersFilter);
         notificationTarget.setConfiguration(targetConfig);
         return saveNotificationTarget(notificationTarget);
     }

application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java

@@ -17,12 +17,14 @@ package org.thingsboard.server.service.notification;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.BooleanNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.function.ThrowingRunnable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.data.util.Pair;
+import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -31,10 +33,15 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.UpdateMessage;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
+import org.thingsboard.server.common.data.alarm.AlarmComment;
+import org.thingsboard.server.common.data.alarm.AlarmCommentType;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceConfiguration;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceTransportConfiguration;
+import org.thingsboard.server.common.data.device.data.DeviceData;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
@@ -42,6 +49,8 @@ import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileAlarm;
 import org.thingsboard.server.common.data.device.profile.SimpleAlarmConditionSpec;
+import org.thingsboard.server.common.data.id.AlarmId;
+import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.notification.Notification;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 import org.thingsboard.server.common.data.notification.NotificationRequest;
@@ -52,8 +61,11 @@ import org.thingsboard.server.common.data.notification.rule.DefaultNotificationR
 import org.thingsboard.server.common.data.notification.rule.EscalatedNotificationRuleRecipientsConfig;
 import org.thingsboard.server.common.data.notification.rule.NotificationRule;
 import org.thingsboard.server.common.data.notification.rule.NotificationRuleInfo;
+import org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig;
+import org.thingsboard.server.common.data.notification.rule.trigger.AlarmCommentNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.AlarmNotificationRuleTriggerConfig.AlarmAction;
+import org.thingsboard.server.common.data.notification.rule.trigger.DeviceActivityNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.EntitiesLimitNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.EntityActionNotificationRuleTriggerConfig;
 import org.thingsboard.server.common.data.notification.rule.trigger.NewPlatformVersionNotificationRuleTriggerConfig;
@@ -68,13 +80,16 @@ import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.common.msg.notification.trigger.NewPlatformVersionTrigger;
+import org.thingsboard.server.dao.notification.DefaultNotifications;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.util.limits.LimitedApi;
 import org.thingsboard.server.dao.util.limits.RateLimitService;
-import org.thingsboard.server.queue.notification.NotificationRuleProcessor;
+import org.thingsboard.server.service.notification.rule.cache.DefaultNotificationRulesCache;
+import org.thingsboard.server.service.state.DeviceStateService;
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 
 import java.util.ArrayList;
@@ -94,8 +109,15 @@ import static org.assertj.core.api.Assertions.offset;
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
 import static org.awaitility.Awaitility.await;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig.Action.ASSIGNED;
+import static org.thingsboard.server.common.data.notification.rule.trigger.AlarmAssignmentNotificationRuleTriggerConfig.Action.UNASSIGNED;
+import static org.thingsboard.server.common.data.notification.rule.trigger.DeviceActivityNotificationRuleTriggerConfig.DeviceEvent.ACTIVE;
+import static org.thingsboard.server.common.data.notification.rule.trigger.DeviceActivityNotificationRuleTriggerConfig.DeviceEvent.INACTIVE;
 
 @DaoSqlTest
+@TestPropertySource(properties = {
+        "transport.http.enabled=true"
+})
 public class NotificationRuleApiTest extends AbstractNotificationApiTest {
 
     @SpyBean
@@ -108,6 +130,12 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
     private RuleChainService ruleChainService;
     @Autowired
     private NotificationRuleProcessor notificationRuleProcessor;
+    @Autowired
+    private DefaultNotifications defaultNotifications;
+    @Autowired
+    private DefaultNotificationRulesCache notificationRulesCache;
+    @Autowired
+    private DeviceStateService deviceStateService;
 
     @Before
     public void beforeEach() throws Exception {
@@ -297,7 +325,9 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
         notification = getWsClient().getLastDataUpdate().getUpdate();
         assertThat(notification.getSubject()).isEqualTo("critical alarm '" + alarmType + "' is CLEARED_UNACK");
 
-        assertThat(findNotificationRequests(EntityType.ALARM).getData()).filteredOn(NotificationRequest::isScheduled).isEmpty();
+        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(findNotificationRequests(EntityType.ALARM).getData()).filteredOn(NotificationRequest::isScheduled).isEmpty();
+        });
     }
 
     @Test
@@ -370,6 +400,122 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
         });
     }
 
+    @Test
+    public void testNotificationRuleProcessing_alarmAssignment() throws Exception {
+        AlarmAssignmentNotificationRuleTriggerConfig triggerConfig = AlarmAssignmentNotificationRuleTriggerConfig.builder()
+                .alarmTypes(Set.of("test"))
+                .notifyOn(Set.of(ASSIGNED, UNASSIGNED))
+                .build();
+        NotificationTarget target = createNotificationTarget(tenantAdminUserId);
+        String template = "${userEmail} ${action} alarm on ${alarmOriginatorEntityType} '${alarmOriginatorName}'. Assignee: ${assigneeEmail}";
+        createNotificationRule(triggerConfig, "Test", template, target.getId());
+
+        Device device = createDevice("Device A", "123");
+        Alarm alarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(device.getId())
+                .cleared(false)
+                .acknowledged(false)
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test")
+                .startTs(System.currentTimeMillis())
+                .build();
+        alarm = doPost("/api/alarm", alarm, Alarm.class);
+        AlarmId alarmId = alarm.getId();
+
+        checkNotificationAfter(() -> {
+            doPost("/api/alarm/" + alarmId + "/assign/" + tenantAdminUserId).andExpect(status().isOk());
+        }, notification -> {
+            assertThat(notification.getText()).isEqualTo(
+                    TENANT_ADMIN_EMAIL + " assigned alarm on Device 'Device A'. Assignee: " + TENANT_ADMIN_EMAIL
+            );
+        });
+
+        checkNotificationAfter(() -> {
+            doDelete("/api/alarm/" + alarmId + "/assign").andExpect(status().isOk());
+        }, notification -> {
+            assertThat(notification.getText()).isEqualTo(
+                    TENANT_ADMIN_EMAIL + " unassigned alarm on Device 'Device A'. Assignee: "
+            );
+        });
+    }
+
+    @Test
+    public void testNotificationRuleProcessing_alarmComment() throws Exception {
+        AlarmCommentNotificationRuleTriggerConfig triggerConfig = AlarmCommentNotificationRuleTriggerConfig.builder()
+                .alarmTypes(Set.of("test"))
+                .onlyUserComments(true)
+                .notifyOnCommentUpdate(true)
+                .build();
+        NotificationTarget target = createNotificationTarget(tenantAdminUserId);
+        String template = "${userEmail} ${action} comment on alarm ${alarmType}: ${comment}";
+        createNotificationRule(triggerConfig, "Test", template, target.getId());
+
+        Device device = createDevice("Device A", "123");
+        Alarm alarm = Alarm.builder()
+                .tenantId(tenantId)
+                .originator(device.getId())
+                .cleared(false)
+                .acknowledged(false)
+                .severity(AlarmSeverity.CRITICAL)
+                .type("test")
+                .startTs(System.currentTimeMillis())
+                .build();
+        alarm = doPost("/api/alarm", alarm, Alarm.class);
+        AlarmId alarmId = alarm.getId();
+
+        AlarmComment comment = checkNotificationAfter(() -> {
+            return doPost("/api/alarm/" + alarmId + "/comment",
+                    AlarmComment.builder()
+                            .type(AlarmCommentType.OTHER)
+                            .comment(JacksonUtil.newObjectNode()
+                                    .put("text", "this is bad"))
+                            .build(), AlarmComment.class);
+        }, (notification, r) -> {
+            assertThat(notification.getText()).isEqualTo(
+                    TENANT_ADMIN_EMAIL + " added comment on alarm test: this is bad"
+            );
+        });
+
+        checkNotificationAfter(() -> {
+            ((ObjectNode) comment.getComment()).put("text", "this is very bad");
+            doPost("/api/alarm/" + alarmId + "/comment", comment);
+        }, notification -> {
+            assertThat(notification.getText()).isEqualTo(
+                    TENANT_ADMIN_EMAIL + " updated comment on alarm test: this is very bad"
+            );
+        });
+    }
+
+    @Test
+    public void testNotificationRuleProcessing_deviceActivity() throws Exception {
+        DeviceActivityNotificationRuleTriggerConfig triggerConfig = DeviceActivityNotificationRuleTriggerConfig.builder()
+                .notifyOn(Set.of(ACTIVE, INACTIVE))
+                .build();
+        NotificationTarget target = createNotificationTarget(tenantAdminUserId);
+        String template = "Device ${deviceName} (${deviceLabel}) of type ${deviceType} is now ${eventType}";
+        createNotificationRule(triggerConfig, "Test", template, target.getId());
+
+        Device device = new Device();
+        device.setName("A");
+        device.setLabel("Test Device A");
+        device.setType("test");
+        DeviceData deviceData = new DeviceData();
+        deviceData.setTransportConfiguration(new DefaultDeviceTransportConfiguration());
+        deviceData.setConfiguration(new DefaultDeviceConfiguration());
+        device.setDeviceData(deviceData);
+        device = doPost("/api/device", device, Device.class);
+        DeviceId deviceId = device.getId();
+
+        checkNotificationAfter(() -> {
+            deviceStateService.onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
+        }, notification -> {
+            assertThat(notification.getText()).isEqualTo(
+                    "Device A (Test Device A) of type test is now active"
+            );
+        });
+    }
+
     @Test
     public void testNotificationRuleInfo() throws Exception {
         NotificationDeliveryMethod[] deliveryMethods = {NotificationDeliveryMethod.WEB, NotificationDeliveryMethod.EMAIL};
@@ -444,7 +590,7 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
     }
 
     @Test
-    public void testNotificationsDeduplication() throws Exception {
+    public void testNotificationsDeduplication_newPlatformVersion() throws Exception {
         loginSysAdmin();
         NewPlatformVersionNotificationRuleTriggerConfig triggerConfig = new NewPlatformVersionNotificationRuleTriggerConfig();
         createNotificationRule(triggerConfig, "Test", "Test", createNotificationTarget(tenantAdminUserId).getId());
@@ -477,6 +623,7 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
         triggerConfig.setEntityTypes(Set.of(EntityType.DEVICE));
         triggerConfig.setCreated(true);
         NotificationRule rule = createNotificationRule(triggerConfig, "Created", "Created", createNotificationTarget(tenantAdminUserId).getId());
+        notificationRulesCache.evict(tenantId);
 
         assertThat(getMyNotifications(false, 100)).size().isZero();
         createDevice("Device 1", "default", "111");
@@ -487,6 +634,7 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
 
         rule.setEnabled(false);
         saveNotificationRule(rule);
+        notificationRulesCache.evict(tenantId);
 
         createDevice("Device 2", "default", "222");
         TimeUnit.SECONDS.sleep(5);
@@ -494,7 +642,7 @@ public class NotificationRuleApiTest extends AbstractNotificationApiTest {
 
         rule.setEnabled(true);
         saveNotificationRule(rule);
-        TimeUnit.SECONDS.sleep(2); // for rule update event to reach rules cache
+        notificationRulesCache.evict(tenantId);
 
         createDevice("Device 3", "default", "333");
         await().atMost(30, TimeUnit.SECONDS)

application/src/test/java/org/thingsboard/server/service/security/auth/oauth2/CookieUtilsTest.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright © 2016-2023 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.service.security.auth.oauth2;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.thingsboard.server.service.security.auth.oauth2.HttpCookieOAuth2AuthorizationRequestRepository.OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME;
+
+public class CookieUtilsTest {
+
+    @Test
+    public void serializeDeserializeOAuth2AuthorizationRequestTest() {
+        HttpCookieOAuth2AuthorizationRequestRepository cookieRequestRepo = new HttpCookieOAuth2AuthorizationRequestRepository();
+        HttpServletRequest servletRequest = Mockito.mock(HttpServletRequest.class);
+
+        Map<String, Object> additionalParameters = new LinkedHashMap<>();
+        additionalParameters.put("param1", "value1");
+        additionalParameters.put("param2", "value2");
+        var request = OAuth2AuthorizationRequest.authorizationCode()
+                .authorizationUri("testUri").clientId("testId")
+                .scope("read", "write")
+                .additionalParameters(additionalParameters).build();
+
+
+        Cookie cookie = new Cookie(OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, CookieUtils.serialize(request));
+        Mockito.when(servletRequest.getCookies()).thenReturn(new Cookie[]{cookie});
+
+        OAuth2AuthorizationRequest deserializedRequest = cookieRequestRepo.loadAuthorizationRequest(servletRequest);
+
+        assertNotNull(deserializedRequest);
+        assertEquals(request.getGrantType(), deserializedRequest.getGrantType());
+        assertEquals(request.getAuthorizationUri(), deserializedRequest.getAuthorizationUri());
+        assertEquals(request.getClientId(), deserializedRequest.getClientId());
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/security/auth/oauth2/HttpCookieOAuth2AuthorizationRequestRepositoryTest.java

@@ -1,66 +0,0 @@
-/**
- * Copyright © 2016-2023 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.service.security.auth.oauth2;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import static org.junit.Assert.assertEquals;
-import static org.thingsboard.server.service.security.auth.oauth2.HttpCookieOAuth2AuthorizationRequestRepository.OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME;
-
-public class HttpCookieOAuth2AuthorizationRequestRepositoryTest {
-
-    private static final String SERIALIZED_ATTACK_STRING =
-            "rO0ABXNyAHVvcmcudGhpbmdzYm9hcmQuc2VydmVyLnNlcnZpY2Uuc2VjdXJpdHkuYXV0aC5vYXV0aDIuSHR0cENvb2tpZU9BdXRoMkF1dGhvcml6YXRpb25SZXF1ZXN0UmVwb3NpdG9yeVRlc3QkTWFsaWNpb3VzQ2xhc3MAAAAAAAAAAAIAAHhw";
-
-    private static int maliciousMethodInvocationCounter;
-
-    @Before
-    public void resetInvocationCounter() {
-        maliciousMethodInvocationCounter = 0;
-    }
-
-    @Test
-    public void whenLoadAuthorizationRequest_thenMaliciousMethodNotInvoked() {
-        HttpCookieOAuth2AuthorizationRequestRepository cookieRequestRepo = new HttpCookieOAuth2AuthorizationRequestRepository();
-        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-        Cookie cookie = new Cookie(OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME, SERIALIZED_ATTACK_STRING);
-        Mockito.when(request.getCookies()).thenReturn(new Cookie[]{cookie});
-
-        cookieRequestRepo.loadAuthorizationRequest(request);
-
-        assertEquals(0, maliciousMethodInvocationCounter);
-    }
-
-    private static class MaliciousClass implements Serializable {
-        private static final long serialVersionUID = 0L;
-
-        public void maliciousMethod() {
-            maliciousMethodInvocationCounter++;
-        }
-
-        private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-            maliciousMethod();
-        }
-    }
-}

application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java

@@ -29,12 +29,11 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.query.EntityData;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.msg.notification.NotificationRuleProcessor;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.queue.discovery.PartitionService;
-import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 
 import java.util.Map;
 import java.util.UUID;
@@ -42,6 +41,7 @@ import java.util.UUID;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -69,7 +69,7 @@ public class DefaultDeviceStateServiceTest {
 
     @Before
     public void setUp() {
-        service = spy(new DefaultDeviceStateService(deviceService, attributesService, tsService, clusterService, partitionService, null, null, null));
+        service = spy(new DefaultDeviceStateService(deviceService, attributesService, tsService, clusterService, partitionService, null, null, null, mock(NotificationRuleProcessor.class)));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/transport/coap/CoapTestCallback.java

@@ -21,25 +21,14 @@ import org.eclipse.californium.core.CoapHandler;
 import org.eclipse.californium.core.CoapResponse;
 import org.eclipse.californium.core.coap.CoAP;
 
-import java.util.concurrent.CountDownLatch;
-
 @Slf4j
 @Data
 public class CoapTestCallback implements CoapHandler {
 
-    protected final CountDownLatch latch;
     protected Integer observe;
     protected byte[] payloadBytes;
     protected CoAP.ResponseCode responseCode;
 
-    public CoapTestCallback() {
-        this.latch = new CountDownLatch(1);
-    }
-
-    public CoapTestCallback(int subscribeCount) {
-        this.latch = new CountDownLatch(subscribeCount);
-    }
-
     public Integer getObserve() {
         return observe;
     }
@@ -57,7 +46,6 @@ public class CoapTestCallback implements CoapHandler {
         observe = response.getOptions().getObserve();
         payloadBytes = response.getPayload();
         responseCode = response.getCode();
-        latch.countDown();
     }
 
     @Override

application/src/test/java/org/thingsboard/server/transport/coap/attributes/AbstractCoapAttributesIntegrationTest.java

@@ -232,7 +232,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         }
 
         client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
-        CoapTestCallback callbackCoap = new CoapTestCallback(1);
+        CoapTestCallback callbackCoap = new CoapTestCallback();
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
         String awaitAlias = "await Json Test Subscribe To AttributesUpdates (client.getObserveRelation)";
@@ -279,7 +279,7 @@ public abstract class AbstractCoapAttributesIntegrationTest extends AbstractCoap
         }
 
         client = new CoapTestClient(accessToken, FeatureType.ATTRIBUTES);
-        CoapTestCallback callbackCoap = new CoapTestCallback(1);
+        CoapTestCallback callbackCoap = new CoapTestCallback();
 
         String awaitAlias = "await Proto Test Subscribe To Attributes Updates (add attributes)";
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);

application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java

@@ -41,7 +41,6 @@ import org.thingsboard.server.transport.coap.AbstractCoapIntegrationTest;
 import org.thingsboard.server.transport.coap.CoapTestCallback;
 import org.thingsboard.server.transport.coap.CoapTestClient;
 
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
@@ -74,17 +73,16 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
 
     protected void processOneWayRpcTest(boolean protobuf) throws Exception {
         client = new CoapTestClient(accessToken, FeatureType.RPC);
-        CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, 1, true, protobuf);
+        CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, true, protobuf);
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
         String awaitAlias = "await One Way Rpc (client.getObserveRelation)";
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 .until(() -> CoAP.ResponseCode.VALID.equals(callbackCoap.getResponseCode()) &&
-                        callbackCoap.getObserve() != null &&
-                        0 == callbackCoap.getObserve().intValue());
+                        callbackCoap.getObserve() != null && 0 == callbackCoap.getObserve());
         validateCurrentStateNotification(callbackCoap);
-        int expectedObserveCountAfterGpioRequest = callbackCoap.getObserve().intValue() + 1;
+        int expectedObserveAfterRpcProcessed = callbackCoap.getObserve() + 1;
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
         String deviceId = savedDevice.getId().getId().toString();
         String result = doPostAsync("/api/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
@@ -92,8 +90,7 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
-                        callbackCoap.getObserve() != null &&
-                        expectedObserveCountAfterGpioRequest == callbackCoap.getObserve().intValue());
+                        callbackCoap.getObserve() != null && expectedObserveAfterRpcProcessed == callbackCoap.getObserve());
         validateOneWayStateChangedNotification(callbackCoap, result);
 
         observeRelation.proactiveCancel();
@@ -102,7 +99,7 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
 
     protected void processTwoWayRpcTest(String expectedResponseResult, boolean protobuf) throws Exception {
         client = new CoapTestClient(accessToken, FeatureType.RPC);
-        CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, 1, false, protobuf);
+        CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, false, protobuf);
 
         CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap);
         String awaitAlias = "await Two Way Rpc (client.getObserveRelation)";
@@ -110,29 +107,29 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 .until(() -> CoAP.ResponseCode.VALID.equals(callbackCoap.getResponseCode()) &&
                         callbackCoap.getObserve() != null &&
-                        0 == callbackCoap.getObserve().intValue());
+                        0 == callbackCoap.getObserve());
         validateCurrentStateNotification(callbackCoap);
 
         String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"26\",\"value\": 1}}";
         String deviceId = savedDevice.getId().getId().toString();
-        int expectedObserveCountAfterGpioRequest1 = callbackCoap.getObserve().intValue() + 1;
+        int expectedObserveCountAfterGpioRequest1 = callbackCoap.getObserve() + 1;
         String actualResult = doPostAsync("/api/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
         awaitAlias = "await Two Way Rpc (setGpio(method, params, value) first";
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
                         callbackCoap.getObserve() != null &&
-                        expectedObserveCountAfterGpioRequest1 == callbackCoap.getObserve().intValue());
+                        expectedObserveCountAfterGpioRequest1 == callbackCoap.getObserve());
         validateTwoWayStateChangedNotification(callbackCoap, expectedResponseResult, actualResult);
 
-        int expectedObserveCountAfterGpioRequest2 = callbackCoap.getObserve().intValue() + 1;
+        int expectedObserveCountAfterGpioRequest2 = callbackCoap.getObserve() + 1;
         actualResult = doPostAsync("/api/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
         awaitAlias = "await Two Way Rpc (setGpio(method, params, value) first";
         await(awaitAlias)
                 .atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS)
                 .until(() -> CoAP.ResponseCode.CONTENT.equals(callbackCoap.getResponseCode()) &&
                         callbackCoap.getObserve() != null &&
-                        expectedObserveCountAfterGpioRequest2 == callbackCoap.getObserve().intValue());
+                        expectedObserveCountAfterGpioRequest2 == callbackCoap.getObserve());
 
         validateTwoWayStateChangedNotification(callbackCoap, expectedResponseResult, actualResult);
 
@@ -140,24 +137,24 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
         assertTrue(observeRelation.isCanceled());
     }
 
-    protected void processOnLoadResponse(CoapResponse response, CoapTestClient client, Integer observe, CountDownLatch latch) {
+    protected void processOnLoadResponse(CoapResponse response, CoapTestClient client) {
         JsonNode responseJson = JacksonUtil.fromBytes(response.getPayload());
-        client.setURI(CoapTestClient.getFeatureTokenUrl(accessToken, FeatureType.RPC, responseJson.get("id").asInt()));
+        int requestId = responseJson.get("id").asInt();
+        client.setURI(CoapTestClient.getFeatureTokenUrl(accessToken, FeatureType.RPC, requestId));
         client.postMethod(new CoapHandler() {
             @Override
             public void onLoad(CoapResponse response) {
-                log.warn("Command Response Ack: {}, {}", response.getCode(), response.getResponseText());
-                latch.countDown();
+                log.warn("RPC {} command response ack: {}", requestId, response.getCode());
             }
 
             @Override
             public void onError() {
-                log.warn("Command Response Ack Error, No connect");
+                log.warn("RPC {} command response ack error, no connect", requestId);
             }
         }, DEVICE_RESPONSE, MediaTypeRegistry.APPLICATION_JSON);
     }
 
-    protected void processOnLoadProtoResponse(CoapResponse response, CoapTestClient client, Integer observe, CountDownLatch latch) {
+    protected void processOnLoadProtoResponse(CoapResponse response, CoapTestClient client) {
         ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = getProtoTransportPayloadConfiguration();
         ProtoFileElement rpcRequestProtoFileElement = DynamicProtoUtils.getProtoFileElement(protoTransportPayloadConfiguration.getDeviceRpcRequestProtoSchema());
         DynamicSchema rpcRequestProtoSchema = DynamicProtoUtils.getDynamicSchema(rpcRequestProtoFileElement, ProtoTransportPayloadConfiguration.RPC_REQUEST_PROTO_SCHEMA);
@@ -180,13 +177,12 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
             client.postMethod(new CoapHandler() {
                 @Override
                 public void onLoad(CoapResponse response) {
-                    log.warn("Command Response Ack: {}", response.getCode());
-                    latch.countDown();
+                    log.warn("RPC {} command response ack: {}", requestId, response.getCode());
                 }
 
                 @Override
                 public void onError() {
-                    log.warn("Command Response Ack Error, No connect");
+                    log.warn("RPC {} command response ack error, no connect", requestId);
                 }
             }, rpcResponseMsg.toByteArray(), MediaTypeRegistry.APPLICATION_JSON);
         } catch (InvalidProtocolBufferException e) {
@@ -226,8 +222,7 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
         private final boolean isOneWayRpc;
         private final boolean protobuf;
 
-        TestCoapCallbackForRPC(CoapTestClient client, int subscribeCount, boolean isOneWayRpc, boolean protobuf) {
-            super(subscribeCount);
+        TestCoapCallbackForRPC(CoapTestClient client, boolean isOneWayRpc, boolean protobuf) {
             this.client = client;
             this.isOneWayRpc = isOneWayRpc;
             this.protobuf = protobuf;
@@ -241,12 +236,10 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC
             if (observe != null) {
                 if (!isOneWayRpc && observe > 0) {
                     if (!protobuf){
-                        processOnLoadResponse(response, client, observe, latch);
+                        processOnLoadResponse(response, client);
                     } else {
-                        processOnLoadProtoResponse(response, client, observe, latch);
+                        processOnLoadProtoResponse(response, client);
                     }
-                } else {
-                    latch.countDown();
                 }
             }
         }

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/MqttTestCallback.java

@@ -32,7 +32,6 @@ public class MqttTestCallback implements MqttCallback {
     protected final CountDownLatch deliveryLatch;
     protected int qoS;
     protected byte[] payloadBytes;
-    protected String awaitSubTopic;
     protected boolean pubAckReceived;
 
     public MqttTestCallback() {
@@ -45,12 +44,6 @@ public class MqttTestCallback implements MqttCallback {
         this.deliveryLatch = new CountDownLatch(1);
     }
 
-    public MqttTestCallback(String awaitSubTopic) {
-        this.subscribeLatch = new CountDownLatch(1);
-        this.deliveryLatch = new CountDownLatch(1);
-        this.awaitSubTopic = awaitSubTopic;
-    }
-
     @Override
     public void connectionLost(Throwable throwable) {
         log.warn("connectionLost: ", throwable);
@@ -59,23 +52,10 @@ public class MqttTestCallback implements MqttCallback {
 
     @Override
     public void messageArrived(String requestTopic, MqttMessage mqttMessage) {
-        if (awaitSubTopic == null) {
-            log.warn("messageArrived on topic: {}", requestTopic);
-            qoS = mqttMessage.getQos();
-            payloadBytes = mqttMessage.getPayload();
-            subscribeLatch.countDown();
-        } else {
-            messageArrivedOnAwaitSubTopic(requestTopic, mqttMessage);
-        }
-    }
-
-    protected void messageArrivedOnAwaitSubTopic(String requestTopic, MqttMessage mqttMessage) {
-        log.warn("messageArrived on topic: {}, awaitSubTopic: {}", requestTopic, awaitSubTopic);
-        if (awaitSubTopic.equals(requestTopic)) {
-            qoS = mqttMessage.getQos();
-            payloadBytes = mqttMessage.getPayload();
-            subscribeLatch.countDown();
-        }
+        log.warn("messageArrived on topic: {}", requestTopic);
+        qoS = mqttMessage.getQos();
+        payloadBytes = mqttMessage.getPayload();
+        subscribeLatch.countDown();
     }
 
     @Override

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/MqttTestSubscribeOnTopicCallback.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2023 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.transport.mqtt.mqttv3;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+
+@Data
+@Slf4j
+@EqualsAndHashCode(callSuper = true)
+public class MqttTestSubscribeOnTopicCallback extends MqttTestCallback {
+
+    protected final String awaitSubTopic;
+
+    public MqttTestSubscribeOnTopicCallback(String awaitSubTopic) {
+        super();
+        this.awaitSubTopic = awaitSubTopic;
+    }
+
+    @Override
+    public void messageArrived(String requestTopic, MqttMessage mqttMessage) {
+        log.warn("messageArrived on topic: {}, awaitSubTopic: {}", requestTopic, awaitSubTopic);
+        if (awaitSubTopic.equals(requestTopic)) {
+            qoS = mqttMessage.getQos();
+            payloadBytes = mqttMessage.getPayload();
+            subscribeLatch.countDown();
+        }
+    }
+
+}

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/attributes/AbstractMqttAttributesIntegrationTest.java

@@ -45,6 +45,7 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.service.ws.telemetry.cmd.v2.EntityDataUpdate;
 import org.thingsboard.server.transport.mqtt.AbstractMqttIntegrationTest;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestCallback;
+import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestSubscribeOnTopicCallback;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestClient;
 
 import java.util.ArrayList;
@@ -358,7 +359,7 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
 
         String update = getWsClient().waitForUpdate();
         assertThat(update).as("ws update received").isNotBlank();
-        MqttTestCallback callback = new MqttTestCallback(attrSubTopic.replace("+", "1"));
+        MqttTestCallback callback = new MqttTestSubscribeOnTopicCallback(attrSubTopic.replace("+", "1"));
         client.setCallback(callback);
         String payloadStr = "{\"clientKeys\":\"" + clientKeysStr + "\", \"sharedKeys\":\"" + sharedKeysStr + "\"}";
         client.publishAndWait(attrReqTopicPrefix + "1", payloadStr.getBytes());
@@ -389,7 +390,7 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
 
         String update = getWsClient().waitForUpdate();
         assertThat(update).as("ws update received").isNotBlank();
-        MqttTestCallback callback = new MqttTestCallback(attrSubTopic.replace("+", "1"));
+        MqttTestCallback callback = new MqttTestSubscribeOnTopicCallback(attrSubTopic.replace("+", "1"));
         client.setCallback(callback);
         TransportApiProtos.AttributesRequest.Builder attributesRequestBuilder = TransportApiProtos.AttributesRequest.newBuilder();
         attributesRequestBuilder.setClientKeys(clientKeysStr);
@@ -448,14 +449,14 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
         client.subscribeAndWait(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC, MqttQoS.AT_LEAST_ONCE);
         //RequestAttributes does not make any subscriptions in device actor
 
-        MqttTestCallback clientAttributesCallback = new MqttTestCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
+        MqttTestCallback clientAttributesCallback = new MqttTestSubscribeOnTopicCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
         client.setCallback(clientAttributesCallback);
         String csKeysStr = "[\"clientStr\", \"clientBool\", \"clientDbl\", \"clientLong\", \"clientJson\"]";
         String csRequestPayloadStr = "{\"id\": 1, \"device\": \"" + deviceName + "\", \"client\": true, \"keys\": " + csKeysStr + "}";
         client.publishAndWait(GATEWAY_ATTRIBUTES_REQUEST_TOPIC, csRequestPayloadStr.getBytes());
         validateJsonResponseGateway(clientAttributesCallback, deviceName, CLIENT_ATTRIBUTES_PAYLOAD);
 
-        MqttTestCallback sharedAttributesCallback = new MqttTestCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
+        MqttTestCallback sharedAttributesCallback = new MqttTestSubscribeOnTopicCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
         client.setCallback(sharedAttributesCallback);
         String shKeysStr = "[\"sharedStr\", \"sharedBool\", \"sharedDbl\", \"sharedLong\", \"sharedJson\"]";
         String shRequestPayloadStr = "{\"id\": 1, \"device\": \"" + deviceName + "\", \"client\": false, \"keys\": " + shKeysStr + "}";
@@ -502,13 +503,13 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
         client.subscribeAndWait(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC, MqttQoS.AT_LEAST_ONCE);
         awaitForDeviceActorToReceiveSubscription(device.getId(), FeatureType.ATTRIBUTES, 1);
 
-        MqttTestCallback clientAttributesCallback = new MqttTestCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
+        MqttTestCallback clientAttributesCallback = new MqttTestSubscribeOnTopicCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
         client.setCallback(clientAttributesCallback);
         TransportApiProtos.GatewayAttributesRequestMsg gatewayAttributesRequestMsg = getGatewayAttributesRequestMsg(deviceName, clientKeysList, true);
         client.publishAndWait(GATEWAY_ATTRIBUTES_REQUEST_TOPIC, gatewayAttributesRequestMsg.toByteArray());
         validateProtoClientResponseGateway(clientAttributesCallback, deviceName);
 
-        MqttTestCallback sharedAttributesCallback = new MqttTestCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
+        MqttTestCallback sharedAttributesCallback = new MqttTestSubscribeOnTopicCallback(GATEWAY_ATTRIBUTES_RESPONSE_TOPIC);
         client.setCallback(sharedAttributesCallback);
         gatewayAttributesRequestMsg = getGatewayAttributesRequestMsg(deviceName, sharedKeysList, false);
         client.publishAndWait(GATEWAY_ATTRIBUTES_REQUEST_TOPIC, gatewayAttributesRequestMsg.toByteArray());

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/client/AbstractMqttClientConnectionTest.java

@@ -34,7 +34,7 @@ public abstract class AbstractMqttClientConnectionTest extends AbstractMqttInteg
         try {
             client.connectAndWait("wrongAccessToken");
         } catch (MqttException e) {
-            Assert.assertEquals(MqttException.REASON_CODE_FAILED_AUTHENTICATION, e.getReasonCode());
+            Assert.assertEquals(MqttException.REASON_CODE_NOT_AUTHORIZED, e.getReasonCode());
         }
     }
 

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/credentials/BasicMqttCredentialsTest.java

@@ -124,7 +124,7 @@ public class BasicMqttCredentialsTest extends AbstractMqttIntegrationTest {
             mqttTestClient.connectAndWait(USER_NAME3, "WRONG PASSWORD");
             Assert.fail(); // This should not happens, because we have a wrong password
         } catch (MqttException e) {
-            Assert.assertEquals(4, e.getReasonCode()); // 4 - Reason code for bad username or password in MQTT v3
+            Assert.assertEquals(5, e.getReasonCode()); // 4 - Reason code not authorized in MQTT v3
         }
         Assertions.assertThrows(MqttException.class, () -> {
             testTelemetryIsNotDelivered(clientIdAndUserNameAndPasswordDevice3, mqttTestClient);

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/provision/MqttProvisionJsonDeviceTest.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.transport.mqtt.AbstractMqttIntegrationTest;
 import org.thingsboard.server.transport.mqtt.MqttTestConfigProperties;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestCallback;
+import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestSubscribeOnTopicCallback;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestClient;
 
 import java.util.concurrent.TimeUnit;
@@ -270,7 +271,7 @@ public class MqttProvisionJsonDeviceTest extends AbstractMqttIntegrationTest {
         String provisionRequestMsg = createTestProvisionMessage(deviceCredentials);
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait("provision");
-        MqttTestCallback onProvisionCallback = new MqttTestCallback(DEVICE_PROVISION_RESPONSE_TOPIC);
+        MqttTestCallback onProvisionCallback = new MqttTestSubscribeOnTopicCallback(DEVICE_PROVISION_RESPONSE_TOPIC);
         client.setCallback(onProvisionCallback);
         client.subscribe(DEVICE_PROVISION_RESPONSE_TOPIC, MqttQoS.AT_MOST_ONCE);
         client.publishAndWait(DEVICE_PROVISION_REQUEST_TOPIC, provisionRequestMsg.getBytes());

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/provision/MqttProvisionProtoDeviceTest.java

@@ -43,6 +43,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509Ce
 import org.thingsboard.server.transport.mqtt.AbstractMqttIntegrationTest;
 import org.thingsboard.server.transport.mqtt.MqttTestConfigProperties;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestCallback;
+import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestSubscribeOnTopicCallback;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestClient;
 
 import java.util.concurrent.TimeUnit;
@@ -269,7 +270,7 @@ public class MqttProvisionProtoDeviceTest extends AbstractMqttIntegrationTest {
     protected byte[] createMqttClientAndPublish(byte[] provisionRequestMsg) throws Exception {
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait("provision");
-        MqttTestCallback onProvisionCallback = new MqttTestCallback(DEVICE_PROVISION_RESPONSE_TOPIC);
+        MqttTestCallback onProvisionCallback = new MqttTestSubscribeOnTopicCallback(DEVICE_PROVISION_RESPONSE_TOPIC);
         client.setCallback(onProvisionCallback);
         client.subscribe(DEVICE_PROVISION_RESPONSE_TOPIC, MqttQoS.AT_MOST_ONCE);
         client.publishAndWait(DEVICE_PROVISION_REQUEST_TOPIC, provisionRequestMsg);

application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/rpc/AbstractMqttServerSideRpcIntegrationTest.java

@@ -41,6 +41,7 @@ import org.thingsboard.server.common.msg.session.FeatureType;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.transport.mqtt.AbstractMqttIntegrationTest;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestCallback;
+import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestSubscribeOnTopicCallback;
 import org.thingsboard.server.transport.mqtt.mqttv3.MqttTestClient;
 
 import java.util.ArrayList;
@@ -81,7 +82,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
     protected void processOneWayRpcTest(String rpcSubTopic) throws Exception {
         MqttTestClient client = new MqttTestClient();
         client.connectAndWait(accessToken);
-        MqttTestCallback callback = new MqttTestCallback(rpcSubTopic.replace("+", "0"));
+        MqttTestCallback callback = new MqttTestSubscribeOnTopicCallback(rpcSubTopic.replace("+", "0"));
         client.setCallback(callback);
         subscribeAndWait(client, rpcSubTopic, savedDevice.getId(), FeatureType.RPC);
 
@@ -221,7 +222,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         );
         assertNotNull(savedDevice);
 
-        MqttTestCallback  callback = new MqttTestCallback(GATEWAY_RPC_TOPIC);
+        MqttTestCallback  callback = new MqttTestSubscribeOnTopicCallback(GATEWAY_RPC_TOPIC);
         client.setCallback(callback);
         subscribeAndCheckSubscription(client, GATEWAY_RPC_TOPIC, savedDevice.getId(), FeatureType.RPC);
 
@@ -320,7 +321,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         }
     }
 
-    protected class MqttTestRpcJsonCallback extends MqttTestCallback {
+    protected class MqttTestRpcJsonCallback extends MqttTestSubscribeOnTopicCallback {
 
         private final MqttTestClient client;
 
@@ -330,7 +331,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         }
 
         @Override
-        protected void messageArrivedOnAwaitSubTopic(String requestTopic, MqttMessage mqttMessage) {
+        public void messageArrived(String requestTopic, MqttMessage mqttMessage) {
             log.warn("messageArrived on topic: {}, awaitSubTopic: {}", requestTopic, awaitSubTopic);
             if (awaitSubTopic.equals(requestTopic)) {
                 qoS = mqttMessage.getQos();
@@ -349,9 +350,10 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
                 subscribeLatch.countDown();
             }
         }
+
     }
 
-    protected class MqttTestRpcProtoCallback extends MqttTestCallback {
+    protected class MqttTestRpcProtoCallback extends MqttTestSubscribeOnTopicCallback {
 
         private final MqttTestClient client;
 
@@ -361,7 +363,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
         }
 
         @Override
-        protected void messageArrivedOnAwaitSubTopic(String requestTopic, MqttMessage mqttMessage) {
+        public void messageArrived(String requestTopic, MqttMessage mqttMessage) {
             log.warn("messageArrived on topic: {}, awaitSubTopic: {}", requestTopic, awaitSubTopic);
             if (awaitSubTopic.equals(requestTopic)) {
                 qoS = mqttMessage.getQos();
@@ -380,6 +382,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
                 subscribeLatch.countDown();
             }
         }
+
     }
 
     protected byte[] processProtoMessageArrived(String requestTopic, MqttMessage mqttMessage) throws MqttException, InvalidProtocolBufferException {
@@ -446,7 +449,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractM
 
         @Override
         public void messageArrived(String requestTopic, MqttMessage mqttMessage) {
-            log.warn("messageArrived on topic: {}, awaitSubTopic: {}", requestTopic, awaitSubTopic);
+            log.warn("messageArrived on topic: {}", requestTopic);
             expected.add(new String(mqttMessage.getPayload()));
             String responseTopic = requestTopic.replace("request", "response");
             qoS = mqttMessage.getQos();

application/src/test/resources/logback-test.xml

@@ -28,6 +28,12 @@
     <logger name="org.thingsboard.server.transport.lwm2m.server" level="INFO"/>
     <logger name="org.eclipse.californium.core" level="INFO"/>
 
+    <!-- Coap client context debug for the test scope -->
+    <!--    <logger name="org.thingsboard.server.transport.coap.client.DefaultCoapClientContext" level="TRACE" />-->
+
+    <!-- Device actor message processor debug for the test scope -->
+    <!--    <logger name="org.thingsboard.server.actors.device.DeviceActorMessageProcessor" level="DEBUG" />-->
+
     <root level="WARN">
         <appender-ref ref="console"/>
     </root>

common/cache/src/main/java/org/thingsboard/server/cache/TBRedisCacheConfiguration.java

@@ -26,14 +26,19 @@ import org.springframework.core.convert.converter.ConverterRegistry;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisNode;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.util.Assert;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.EntityId;
 import redis.clients.jedis.JedisPoolConfig;
 
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 @Configuration
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis")
@@ -41,6 +46,9 @@ import java.time.Duration;
 @Data
 public abstract class TBRedisCacheConfiguration {
 
+    private static final String COMMA = ",";
+    private static final String COLON = ":";
+
     @Value("${redis.evictTtlInMs:60000}")
     private int evictTtlInMs;
 
@@ -126,4 +134,19 @@ public abstract class TBRedisCacheConfiguration {
         poolConfig.setBlockWhenExhausted(blockWhenExhausted);
         return poolConfig;
     }
+
+    protected List<RedisNode> getNodes(String nodes) {
+        List<RedisNode> result;
+        if (StringUtils.isBlank(nodes)) {
+            result = Collections.emptyList();
+        } else {
+            result = new ArrayList<>();
+            for (String hostPort : nodes.split(COMMA)) {
+                String host = hostPort.split(COLON)[0];
+                int port = Integer.parseInt(hostPort.split(COLON)[1]);
+                result.add(new RedisNode(host, port));
+            }
+        }
+        return result;
+    }
 }

common/cache/src/main/java/org/thingsboard/server/cache/TBRedisClusterConfiguration.java

@@ -20,22 +20,13 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
-import org.springframework.data.redis.connection.RedisNode;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.thingsboard.server.common.data.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 @Configuration
 @ConditionalOnMissingBean(TbCaffeineCacheConfiguration.class)
 @ConditionalOnProperty(prefix = "redis.connection", value = "type", havingValue = "cluster")
 public class TBRedisClusterConfiguration extends TBRedisCacheConfiguration {
 
-    private static final String COMMA = ",";
-    private static final String COLON = ":";
-
     @Value("${redis.cluster.nodes:}")
     private String clusterNodes;
 
@@ -59,19 +50,4 @@ public class TBRedisClusterConfiguration extends TBRedisCacheConfiguration {
             return new JedisConnectionFactory(clusterConfiguration, buildPoolConfig());
         }
     }
-
-    private List<RedisNode> getNodes(String nodes) {
-        List<RedisNode> result;
-        if (StringUtils.isBlank(nodes)) {
-            result = Collections.emptyList();
-        } else {
-            result = new ArrayList<>();
-            for (String hostPort : nodes.split(COMMA)) {
-                String host = hostPort.split(COLON)[0];
-                Integer port = Integer.valueOf(hostPort.split(COLON)[1]);
-                result.add(new RedisNode(host, port));
-            }
-        }
-        return result;
-    }
-}
+}

common/cache/src/main/java/org/thingsboard/server/cache/TBRedisSentinelConfiguration.java

@@ -0,0 +1,62 @@
+/**
+ * Copyright © 2016-2023 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.cache;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisSentinelConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+
+@Configuration
+@ConditionalOnMissingBean(TbCaffeineCacheConfiguration.class)
+@ConditionalOnProperty(prefix = "redis.connection", value = "type", havingValue = "sentinel")
+public class TBRedisSentinelConfiguration extends TBRedisCacheConfiguration {
+
+    @Value("${redis.sentinel.master:}")
+    private String master;
+
+    @Value("${redis.sentinel.sentinels:}")
+    private String sentinels;
+
+    @Value("${redis.sentinel.password:}")
+    private String sentinelPassword;
+
+    @Value("${redis.sentinel.useDefaultPoolConfig:true}")
+    private boolean useDefaultPoolConfig;
+
+    @Value("${redis.db:}")
+    private Integer database;
+
+    @Value("${redis.password:}")
+    private String password;
+
+    public JedisConnectionFactory loadFactory() {
+        RedisSentinelConfiguration redisSentinelConfiguration = new RedisSentinelConfiguration();
+        redisSentinelConfiguration.setMaster(master);
+        redisSentinelConfiguration.setSentinels(getNodes(sentinels));
+        redisSentinelConfiguration.setSentinelPassword(sentinelPassword);
+        redisSentinelConfiguration.setPassword(password);
+        redisSentinelConfiguration.setDatabase(database);
+        if (useDefaultPoolConfig) {
+            return new JedisConnectionFactory(redisSentinelConfiguration);
+        } else {
+            return new JedisConnectionFactory(redisSentinelConfiguration, buildPoolConfig());
+        }
+    }
+
+}

common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java

@@ -19,6 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.TbResourceInfoFilter;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -39,9 +40,9 @@ public interface ResourceService extends EntityDaoService {
 
     ListenableFuture<TbResourceInfo> findResourceInfoByIdAsync(TenantId tenantId, TbResourceId resourceId);
 
-    PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink);
+    PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink);
 
-    PageData<TbResourceInfo> findTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink);
+    PageData<TbResourceInfo> findTenantResourcesByTenantId(TbResourceInfoFilter filter, PageLink pageLink);
 
     List<TbResource> findTenantResourcesByResourceTypeAndObjectIds(TenantId tenantId, ResourceType lwm2mModel, String[] objectIds);
 

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

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.thingsboard.server.common.data.id.IdBased;
 import org.thingsboard.server.common.data.id.UUIDBased;
 
@@ -23,6 +24,7 @@ import java.io.Serializable;
 public abstract class BaseData<I extends UUIDBased> extends IdBased<I> implements Serializable {
 
     private static final long serialVersionUID = 5422817607129962637L;
+    public static final ObjectMapper mapper = new ObjectMapper();
     
     protected long createdTime;
     

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

@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -36,7 +37,6 @@ import java.util.function.Supplier;
 @Slf4j
 public abstract class BaseDataWithAdditionalInfo<I extends UUIDBased> extends BaseData<I> implements HasAdditionalInfo {
 
-    public static final ObjectMapper mapper = new ObjectMapper();
     @NoXss
     private transient JsonNode additionalInfo;
     @JsonIgnore

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

@@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.validation.Length;
 import org.thingsboard.server.common.data.validation.NoXss;
 
 @EqualsAndHashCode(callSuper = true)
-public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> implements HasEmail {
+public abstract class ContactBased<I extends UUIDBased> extends BaseDataWithAdditionalInfo<I> implements HasEmail {
 
     private static final long serialVersionUID = 5047448057830660988L;
 

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

@@ -164,11 +164,6 @@ public class Customer extends ContactBased<CustomerId> implements HasTenantId, E
         return title;
     }
 
-    @Override
-    public String getSearchText() {
-        return getTitle();
-    }
-
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();

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

@@ -30,7 +30,7 @@ import java.util.Objects;
 import java.util.Set;
 
 @ApiModel
-public class DashboardInfo extends SearchTextBased<DashboardId> implements HasName, HasTenantId, HasTitle {
+public class DashboardInfo extends BaseData<DashboardId> implements HasName, HasTenantId, HasTitle {
 
     private TenantId tenantId;
     @NoXss
@@ -186,11 +186,6 @@ public class DashboardInfo extends SearchTextBased<DashboardId> implements HasNa
         return title;
     }
 
-    @Override
-    public String getSearchText() {
-        return getTitle();
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;

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

@@ -36,14 +36,12 @@ import javax.validation.Valid;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.mapper;
-
 @ApiModel
 @Data
 @ToString(exclude = {"image", "profileDataBytes"})
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
-public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements HasName, HasTenantId, HasOtaPackage, HasRuleEngineProfile, ExportableEntity<DeviceProfileId> {
+public class DeviceProfile extends BaseData<DeviceProfileId> implements HasName, HasTenantId, HasOtaPackage, HasRuleEngineProfile, ExportableEntity<DeviceProfileId> {
 
     private static final long serialVersionUID = 6998485460273302018L;
 
@@ -139,11 +137,6 @@ public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements H
         return super.getCreatedTime();
     }
 
-    @Override
-    public String getSearchText() {
-        return getName();
-    }
-
     @ApiModelProperty(position = 5, value = "Used to mark the default profile. Default profile is used when the device profile is not specified during device creation.")
     public boolean isDefault() {
         return isDefault;

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

@@ -35,7 +35,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class EntityView extends SearchTextBasedWithAdditionalInfo<EntityViewId>
+public class EntityView extends BaseDataWithAdditionalInfo<EntityViewId>
         implements HasName, HasTenantId, HasCustomerId, ExportableEntity<EntityViewId> {
 
     private static final long serialVersionUID = 5582010124562018986L;
@@ -82,11 +82,6 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo<EntityViewId>
         this.externalId = entityView.getExternalId();
     }
 
-    @Override
-    public String getSearchText() {
-        return getName() /*What the ...*/;
-    }
-
     @ApiModelProperty(position = 4, value = "JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id.", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @Override
     public CustomerId getCustomerId() {

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

@@ -34,7 +34,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @Slf4j
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo<OtaPackageId> implements HasName, HasTenantId, HasTitle {
+public class OtaPackageInfo extends BaseDataWithAdditionalInfo<OtaPackageId> implements HasName, HasTenantId, HasTitle {
 
     private static final long serialVersionUID = 3168391583570815419L;
 
@@ -118,11 +118,6 @@ public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo<OtaPackage
         return super.getCreatedTime();
     }
 
-    @Override
-    public String getSearchText() {
-        return title;
-    }
-
     @Override
     @JsonIgnore
     public String getName() {

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

@@ -15,6 +15,21 @@
  */
 package org.thingsboard.server.common.data;
 
+import lombok.Getter;
+
 public enum ResourceType {
-    LWM2M_MODEL, JKS, PKCS_12
+    LWM2M_MODEL("application/xml", false),
+    JKS("application/x-java-keystore", false),
+    PKCS_12("application/x-pkcs12", false),
+    JS_MODULE("application/javascript", true);
+
+    @Getter
+    private final String mediaType;
+    @Getter
+    private final boolean customerAccess;
+
+    ResourceType(String mediaType, boolean customerAccess) {
+        this.mediaType = mediaType;
+        this.customerAccess = customerAccess;
+    }
 }

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

@@ -1,40 +0,0 @@
-/**
- * Copyright © 2016-2023 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.common.data;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.thingsboard.server.common.data.id.UUIDBased;
-
-public abstract class SearchTextBased<I extends UUIDBased> extends BaseData<I> {
-
-    private static final long serialVersionUID = -539812997348227609L;
-    
-    public SearchTextBased() {
-        super();
-    }
-
-    public SearchTextBased(I id) {
-        super(id);
-    }
-    
-    public SearchTextBased(SearchTextBased<I> searchTextBased) {
-        super(searchTextBased);
-    }
-    
-    @JsonIgnore
-    public abstract String getSearchText(); 
-
-}

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

@@ -1,108 +0,0 @@
-/**
- * Copyright © 2016-2023 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.common.data;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.server.common.data.id.UUIDBased;
-import org.thingsboard.server.common.data.validation.NoXss;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-/**
- * Created by ashvayka on 19.02.18.
- */
-@Slf4j
-public abstract class SearchTextBasedWithAdditionalInfo<I extends UUIDBased> extends SearchTextBased<I> implements HasAdditionalInfo {
-
-    public static final ObjectMapper mapper = new ObjectMapper();
-    @NoXss
-    private transient JsonNode additionalInfo;
-    @JsonIgnore
-    private byte[] additionalInfoBytes;
-
-    public SearchTextBasedWithAdditionalInfo() {
-        super();
-    }
-
-    public SearchTextBasedWithAdditionalInfo(I id) {
-        super(id);
-    }
-
-    public SearchTextBasedWithAdditionalInfo(SearchTextBasedWithAdditionalInfo<I> searchTextBased) {
-        super(searchTextBased);
-        setAdditionalInfo(searchTextBased.getAdditionalInfo());
-    }
-
-    @Override
-    public JsonNode getAdditionalInfo() {
-        return getJson(() -> additionalInfo, () -> additionalInfoBytes);
-    }
-
-    public void setAdditionalInfo(JsonNode addInfo) {
-        setJson(addInfo, json -> this.additionalInfo = json, bytes -> this.additionalInfoBytes = bytes);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (!super.equals(o)) return false;
-        SearchTextBasedWithAdditionalInfo<?> that = (SearchTextBasedWithAdditionalInfo<?>) o;
-        return Arrays.equals(additionalInfoBytes, that.additionalInfoBytes);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), additionalInfoBytes);
-    }
-
-    public static JsonNode getJson(Supplier<JsonNode> jsonData, Supplier<byte[]> binaryData) {
-        JsonNode json = jsonData.get();
-        if (json != null) {
-            return json;
-        } else {
-            byte[] data = binaryData.get();
-            if (data != null) {
-                try {
-                    return mapper.readTree(new ByteArrayInputStream(data));
-                } catch (IOException e) {
-                    log.warn("Can't deserialize json data: ", e);
-                    return null;
-                }
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public static void setJson(JsonNode json, Consumer<JsonNode> jsonConsumer, Consumer<byte[]> bytesConsumer) {
-        jsonConsumer.accept(json);
-        try {
-            bytesConsumer.accept(mapper.writeValueAsBytes(json));
-        } catch (JsonProcessingException e) {
-            log.warn("Can't serialize json data: ", e);
-        }
-    }
-}

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

@@ -24,6 +24,9 @@ import java.util.Base64;
 import static org.apache.commons.lang3.StringUtils.repeat;
 
 public class StringUtils {
+
+    private static final int DEFAULT_TOKEN_LENGTH = 8;
+
     public static final SecureRandom RANDOM = new SecureRandom();
 
     public static final String EMPTY = "";
@@ -205,4 +208,8 @@ public class StringUtils {
         return encoder.encodeToString(bytes);
     }
 
+    public static String generateSafeToken() {
+        return generateSafeToken(DEFAULT_TOKEN_LENGTH);
+    }
+
 }

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

@@ -74,6 +74,8 @@ public class TbResource extends TbResourceInfo {
         builder.append(fileName);
         builder.append(", data=");
         builder.append(data);
+        builder.append(", hashCode=");
+        builder.append(getEtag());
         builder.append("]");
         return builder.toString();
     }

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

@@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @Slf4j
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class TbResourceInfo extends SearchTextBased<TbResourceId> implements HasName, HasTenantId {
+public class TbResourceInfo extends BaseData<TbResourceId> implements HasName, HasTenantId {
 
     private static final long serialVersionUID = 7282664529021651736L;
 
@@ -48,6 +48,8 @@ public class TbResourceInfo extends SearchTextBased<TbResourceId> implements Has
     private String resourceKey;
     @ApiModelProperty(position = 7, value = "Resource search text.", example = "19_1.0:binaryappdatacontainer", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     private String searchText;
+    @ApiModelProperty(position = 8, value = "Resource etag.", example = "33a64df551425fcc55e4d42a148795d9f25f89d4", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    private String etag;
 
     public TbResourceInfo() {
         super();
@@ -64,6 +66,7 @@ public class TbResourceInfo extends SearchTextBased<TbResourceId> implements Has
         this.resourceType = resourceInfo.getResourceType();
         this.resourceKey = resourceInfo.getResourceKey();
         this.searchText = resourceInfo.getSearchText();
+        this.etag = resourceInfo.getEtag();
     }
 
     @ApiModelProperty(position = 1, value = "JSON object with the Resource Id. " +
@@ -87,7 +90,7 @@ public class TbResourceInfo extends SearchTextBased<TbResourceId> implements Has
         return title;
     }
 
-    @Override
+    @JsonIgnore
     public String getSearchText() {
         return searchText != null ? searchText : title;
     }
@@ -107,6 +110,8 @@ public class TbResourceInfo extends SearchTextBased<TbResourceId> implements Has
         builder.append(resourceType);
         builder.append(", resourceKey=");
         builder.append(resourceKey);
+        builder.append(", hashCode=");
+        builder.append(etag);
         builder.append("]");
         return builder.toString();
     }

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

@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016-2023 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.common.data;
+
+import lombok.Builder;
+import lombok.Data;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@Builder
+public class TbResourceInfoFilter {
+
+    private TenantId tenantId;
+    private ResourceType resourceType;
+
+}

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

@@ -96,11 +96,6 @@ public class Tenant extends ContactBased<TenantId> implements HasTenantId, HasTi
         this.tenantProfileId = tenantProfileId;
     }
 
-    @Override
-    public String getSearchText() {
-        return getTitle();
-    }
-
     @ApiModelProperty(position = 1, value = "JSON object with the tenant Id. " +
             "Specify this field to update the tenant. " +
             "Referencing non-existing tenant Id will cause error. " +

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

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,17 +34,17 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Optional;
 
-import static org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo.mapper;
-
 @ApiModel
 @Data
 @ToString(exclude = {"profileDataBytes"})
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
-public class TenantProfile extends SearchTextBased<TenantProfileId> implements HasName {
+public class TenantProfile extends BaseData<TenantProfileId> implements HasName {
 
     private static final long serialVersionUID = 3021989561267192281L;
 
+    public static final ObjectMapper mapper = new ObjectMapper();
+
     @NoXss
     @Length(fieldName = "name")
     @ApiModelProperty(position = 3, value = "Name of the tenant profile", example = "High Priority Tenants")
@@ -93,11 +94,6 @@ public class TenantProfile extends SearchTextBased<TenantProfileId> implements H
         return super.getCreatedTime();
     }
 
-    @Override
-    public String getSearchText() {
-        return getName();
-    }
-
     @Override
     public String getName() {
         return name;

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

@@ -34,7 +34,7 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
-public class User extends SearchTextBasedWithAdditionalInfo<UserId> implements HasName, HasTenantId, HasCustomerId, NotificationRecipient {
+public class User extends BaseDataWithAdditionalInfo<UserId> implements HasName, HasTenantId, HasCustomerId, NotificationRecipient {
 
     private static final long serialVersionUID = 8250339805336035966L;
 
@@ -162,11 +162,6 @@ public class User extends SearchTextBasedWithAdditionalInfo<UserId> implements H
         return super.getAdditionalInfo();
     }
 
-    @Override
-    public String getSearchText() {
-        return getEmail();
-    }
-
     @JsonIgnore
     public String getTitle() {
         return getTitle(email, firstName, lastName);

common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java

@@ -21,11 +21,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasLabel;
 import org.thingsboard.server.common.data.HasTenantId;
-import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -37,7 +37,7 @@ import java.util.Optional;
 
 @ApiModel
 @EqualsAndHashCode(callSuper = true)
-public class Asset extends SearchTextBasedWithAdditionalInfo<AssetId> implements HasLabel, HasTenantId, HasCustomerId, ExportableEntity<AssetId> {
+public class Asset extends BaseDataWithAdditionalInfo<AssetId> implements HasLabel, HasTenantId, HasCustomerId, ExportableEntity<AssetId> {
 
     private static final long serialVersionUID = 2807343040519543363L;
 
@@ -158,12 +158,6 @@ public class Asset extends SearchTextBasedWithAdditionalInfo<AssetId> implements
         this.assetProfileId = assetProfileId;
     }
 
-
-    @Override
-    public String getSearchText() {
-        return getName();
-    }
-
     @ApiModelProperty(position = 9, value = "Additional parameters of the asset", dataType = "com.fasterxml.jackson.databind.JsonNode")
     @Override
     public JsonNode getAdditionalInfo() {

common/data/src/main/java/org/thingsboard/server/common/data/asset/AssetProfile.java

@@ -21,11 +21,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.BaseData;
+import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasRuleEngineProfile;
 import org.thingsboard.server.common.data.HasTenantId;
-import org.thingsboard.server.common.data.SearchTextBased;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -38,7 +39,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @ToString(exclude = {"image"})
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
-public class AssetProfile extends SearchTextBased<AssetProfileId> implements HasName, HasTenantId, HasRuleEngineProfile, ExportableEntity<AssetProfileId> {
+public class AssetProfile extends BaseData<AssetProfileId> implements HasName, HasTenantId, HasRuleEngineProfile, ExportableEntity<AssetProfileId> {
 
     private static final long serialVersionUID = 6998485460273302018L;
 
@@ -112,11 +113,6 @@ public class AssetProfile extends SearchTextBased<AssetProfileId> implements Has
         return super.getCreatedTime();
     }
 
-    @Override
-    public String getSearchText() {
-        return getName();
-    }
-
     @ApiModelProperty(position = 5, value = "Used to mark the default profile. Default profile is used when the asset profile is not specified during asset creation.")
     public boolean isDefault(){
         return isDefault;

common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java

@@ -20,10 +20,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
 import lombok.ToString;
+import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasLabel;
 import org.thingsboard.server.common.data.HasTenantId;
-import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -35,7 +35,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @EqualsAndHashCode(callSuper = true)
 @ToString
 @Setter
-public class Edge extends SearchTextBasedWithAdditionalInfo<EdgeId> implements HasLabel, HasTenantId, HasCustomerId {
+public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel, HasTenantId, HasCustomerId {
 
     private static final long serialVersionUID = 4934987555236873728L;
 
@@ -137,11 +137,6 @@ public class Edge extends SearchTextBasedWithAdditionalInfo<EdgeId> implements H
         return this.label;
     }
 
-    @Override
-    public String getSearchText() {
-        return getName();
-    }
-
     @ApiModelProperty(position = 9, required = true, value = "Edge routing key ('username') to authorize on cloud")
     public String getRoutingKey() {
         return this.routingKey;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION", allowableValues = "NOTIFICATION")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationRequestId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION_REQUEST", allowableValues = "NOTIFICATION_REQUEST")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_REQUEST;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationRuleId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION_RULE", allowableValues = "NOTIFICATION_RULE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_RULE;