refactoring

application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionRef.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.ws;
 
 import lombok.Builder;
 import lombok.Data;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
 import java.net.InetSocketAddress;
@@ -39,6 +40,10 @@ public class WebSocketSessionRef {
     private final WebSocketSessionType sessionType;
     private final AtomicInteger sessionSubIdSeq = new AtomicInteger();
 
+    public TenantId getTenantId() {
+        return securityCtx != null ? securityCtx.getTenantId() : TenantId.SYS_TENANT_ID;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java

@@ -242,7 +242,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
 
     @Override
     public void handleUnsubCmd(WebSocketSessionRef sessionRef, UnsubscribeCmd cmd) {
-        localSubscriptionService.cancelSubscription(sessionRef.getSecurityCtx().getTenantId(), sessionRef.getSessionId(), cmd.getCmdId());
+        localSubscriptionService.cancelSubscription(sessionRef.getTenantId(), sessionRef.getSessionId(), cmd.getCmdId());
     }
 
     private void sendUpdate(String sessionId, CmdUpdate update) {