Added user updated msg

application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.service.edge.rpc.constructor.AssetUpdateMsgConstru
 import org.thingsboard.server.service.edge.rpc.constructor.DashboardUpdateMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.DeviceUpdateMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.constructor.EntityViewUpdateMsgConstructor;
+import org.thingsboard.server.service.edge.rpc.constructor.UserUpdateMsgConstructor;
 import org.thingsboard.server.service.edge.rpc.init.InitEdgeService;
 import org.thingsboard.server.service.edge.rpc.constructor.RuleChainUpdateMsgConstructor;
 import org.thingsboard.server.service.queue.TbClusterService;
@@ -120,6 +121,10 @@ public class EdgeContextComponent {
     @Autowired
     private DashboardUpdateMsgConstructor dashboardUpdateMsgConstructor;
 
+    @Lazy
+    @Autowired
+    private UserUpdateMsgConstructor userUpdateMsgConstructor;
+
     @Lazy
     @Autowired
     private EdgeEventStorageSettings edgeEventStorageSettings;

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java

@@ -349,6 +349,10 @@ public final class EdgeGrpcSession implements Closeable {
                 Alarm alarm = objectMapper.readValue(entry.getData(), Alarm.class);
                 onAlarmUpdated(msgType, alarm);
                 break;
+            case USER:
+                User user = objectMapper.readValue(entry.getData(), User.class);
+                onUserUpdated(msgType, user);
+                break;
         }
     }
 
@@ -405,7 +409,7 @@ public final class EdgeGrpcSession implements Closeable {
 
     private void onRuleChainUpdated(UpdateMsgType msgType, RuleChain ruleChain) {
         EntityUpdateMsg entityUpdateMsg = EntityUpdateMsg.newBuilder()
-                .setRuleChainUpdateMsg(ctx.getRuleChainUpdateMsgConstructor().constructRuleChainUpdatedMsg(edge, msgType, ruleChain))
+                .setRuleChainUpdateMsg(ctx.getRuleChainUpdateMsgConstructor().constructRuleChainUpdatedMsg(edge.getRootRuleChainId(), msgType, ruleChain))
                 .build();
         outputStream.onNext(ResponseMsg.newBuilder()
                 .setEntityUpdateMsg(entityUpdateMsg)
@@ -443,6 +447,15 @@ public final class EdgeGrpcSession implements Closeable {
                 .build());
     }
 
+    private void onUserUpdated(UpdateMsgType msgType, User user) {
+        EntityUpdateMsg entityUpdateMsg = EntityUpdateMsg.newBuilder()
+                .setUserUpdateMsg(ctx.getUserUpdateMsgConstructor().constructUserUpdatedMsg(msgType, user))
+                .build();
+        outputStream.onNext(ResponseMsg.newBuilder()
+                .setEntityUpdateMsg(entityUpdateMsg)
+                .build());
+    }
+
     private UpdateMsgType getResponseMsgType(String msgType) {
         if (msgType.equals(SessionMsgType.POST_TELEMETRY_REQUEST.name()) ||
                 msgType.equals(SessionMsgType.POST_ATTRIBUTES_REQUEST.name()) ||

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

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.rule.NodeConnectionInfo;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo;
@@ -42,13 +43,13 @@ public class RuleChainUpdateMsgConstructor {
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
-    public RuleChainUpdateMsg constructRuleChainUpdatedMsg(Edge edge, UpdateMsgType msgType, RuleChain ruleChain) {
+    public RuleChainUpdateMsg constructRuleChainUpdatedMsg(RuleChainId edgeRootRuleChainId, UpdateMsgType msgType, RuleChain ruleChain) {
         RuleChainUpdateMsg.Builder builder = RuleChainUpdateMsg.newBuilder()
                 .setMsgType(msgType)
                 .setIdMSB(ruleChain.getId().getId().getMostSignificantBits())
                 .setIdLSB(ruleChain.getId().getId().getLeastSignificantBits())
                 .setName(ruleChain.getName())
-                .setRoot(ruleChain.getId().equals(edge.getRootRuleChainId()))
+                .setRoot(ruleChain.getId().equals(edgeRootRuleChainId))
                 .setDebugMode(ruleChain.isDebugMode())
                 .setConfiguration(JacksonUtil.toString(ruleChain.getConfiguration()));
         if (ruleChain.getFirstRuleNodeId() != null) {

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

@@ -0,0 +1,62 @@
+/**
+ * Copyright © 2016-2020 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.edge.rpc.constructor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.util.mapping.JacksonUtil;
+import org.thingsboard.server.gen.edge.UpdateMsgType;
+import org.thingsboard.server.gen.edge.UserUpdateMsg;
+
+@Component
+@Slf4j
+public class UserUpdateMsgConstructor {
+
+    @Autowired
+    private UserService userService;
+
+    public UserUpdateMsg constructUserUpdatedMsg(UpdateMsgType msgType, User user) {
+        UserUpdateMsg.Builder builder = UserUpdateMsg.newBuilder()
+                .setMsgType(msgType)
+                .setEmail(user.getEmail())
+                .setAuthority(user.getAuthority().name())
+                .setEnabled(false);
+        if (user.getFirstName() != null) {
+            builder.setFirstName(user.getFirstName());
+        }
+        if (user.getLastName() != null) {
+            builder.setLastName(user.getLastName());
+        }
+        if (user.getAdditionalInfo() != null) {
+            builder.setAdditionalInfo(JacksonUtil.toString(user.getAdditionalInfo()));
+        }
+        if (user.getAdditionalInfo() != null) {
+            builder.setAdditionalInfo(JacksonUtil.toString(user.getAdditionalInfo()));
+        }
+        if (msgType.equals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE) ||
+                msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE)) {
+            UserCredentials userCredentials = userService.findUserCredentialsByUserId(user.getTenantId(), user.getId());
+            if (userCredentials != null) {
+                builder.setEnabled(userCredentials.isEnabled()).setPassword(userCredentials.getPassword());
+            }
+        }
+        return builder.build();
+    }
+}

common/edge-api/src/main/proto/edge.proto

@@ -220,17 +220,13 @@ message CustomerUpdateMsg {
 
 message UserUpdateMsg {
   UpdateMsgType msgType = 1;
-  int64 idMSB = 2;
+  string email = 2;
-  int64 idLSB = 3;
+  string authority = 3;
-  int64 customerIdMSB = 4;
+  string firstName = 4;
-  int64 customerIdLSB = 5;
+  string lastName = 5;
-  string email = 7;
+  string additionalInfo = 6;
-  string authority = 8;
+  bool enabled = 7;
-  string firstName = 9;
+  string password = 8;
-  string lastName = 10;
-  string additionalInfo = 11;
-  bool enabled = 12;
-  string password = 13;
 }
 
 message RuleChainMetadataRequestMsg {