Fixing websocket and team store issues when leaving team (#4412)

api/team.go

@@ -347,6 +347,12 @@ func LeaveTeam(team *model.Team, user *model.User) *model.AppError {
 		}
 	}
 
+	// Send the websocket message before we actually do the remove so the user being removed gets it.
+	message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_LEAVE_TEAM, team.Id, "", "", nil)
+	message.Add("user_id", user.Id)
+	message.Add("team_id", team.Id)
+	Publish(message)
+
 	teamMember.Roles = ""
 	teamMember.DeleteAt = model.GetMillis()
 
@@ -361,10 +367,6 @@ func LeaveTeam(team *model.Team, user *model.User) *model.AppError {
 	RemoveAllSessionsForUserId(user.Id)
 	InvalidateCacheForUser(user.Id)
 
-	message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_LEAVE_TEAM, team.Id, "", "", nil)
-	message.Add("user_id", user.Id)
-	go Publish(message)
-
 	return nil
 }
 

webapp/actions/websocket_actions.jsx

@@ -211,10 +211,10 @@ function handleNewUserEvent(msg) {
 
 function handleLeaveTeamEvent(msg) {
     if (UserStore.getCurrentId() === msg.data.user_id) {
-        TeamStore.removeMyTeamMember(msg.broadcast.team_id);
+        TeamStore.removeMyTeamMember(msg.data.team_id);
 
         // if they are on the team being removed redirect them to the root
-        if (TeamStore.getCurrentId() === msg.broadcast.team_id) {
+        if (TeamStore.getCurrentId() === msg.data.team_id) {
             TeamStore.setCurrentId('');
             Client.setTeamId('');
             browserHistory.push('/');

webapp/stores/team_store.jsx

@@ -176,11 +176,9 @@ class TeamStoreClass extends EventEmitter {
     }
 
     removeMyTeamMember(teamId) {
-        for (var index in this.my_team_members) {
-            if (this.my_team_members.hasOwnProperty(index)) {
-                if (this.my_team_members[index].team_id === teamId) {
-                    Reflect.deleteProperty(this.my_team_members, index);
-                }
+        for (let i = 0; i < this.my_team_members.length; i++) {
+            if (this.my_team_members[i].team_id === teamId) {
+                this.my_team_members.splice(i, 1);
             }
         }
     }