From 70144962522a5d8db1c46cbd93d83e64b8ca778b Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 8 Oct 2015 09:48:45 -0400 Subject: Fixing ability to dynamicly update members list. --- api/channel.go | 204 ++++++++++----------- api/web_socket_test.go | 7 +- web/react/components/channel_header.jsx | 4 +- .../components/removed_from_channel_modal.jsx | 8 +- web/react/components/sidebar.jsx | 2 +- 5 files changed, 111 insertions(+), 114 deletions(-) diff --git a/api/channel.go b/api/channel.go index 0d22d7c00..603cec6a5 100644 --- a/api/channel.go +++ b/api/channel.go @@ -26,11 +26,11 @@ func InitChannel(r *mux.Router) { sr.Handle("/update_notify_props", ApiUserRequired(updateNotifyProps)).Methods("POST") sr.Handle("/{id:[A-Za-z0-9]+}/", ApiUserRequiredActivity(getChannel, false)).Methods("GET") sr.Handle("/{id:[A-Za-z0-9]+}/extra_info", ApiUserRequired(getChannelExtraInfo)).Methods("GET") - sr.Handle("/{id:[A-Za-z0-9]+}/join", ApiUserRequired(joinChannel)).Methods("POST") - sr.Handle("/{id:[A-Za-z0-9]+}/leave", ApiUserRequired(leaveChannel)).Methods("POST") + sr.Handle("/{id:[A-Za-z0-9]+}/join", ApiUserRequired(join)).Methods("POST") + sr.Handle("/{id:[A-Za-z0-9]+}/leave", ApiUserRequired(leave)).Methods("POST") sr.Handle("/{id:[A-Za-z0-9]+}/delete", ApiUserRequired(deleteChannel)).Methods("POST") - sr.Handle("/{id:[A-Za-z0-9]+}/add", ApiUserRequired(addChannelMember)).Methods("POST") - sr.Handle("/{id:[A-Za-z0-9]+}/remove", ApiUserRequired(removeChannelMember)).Methods("POST") + sr.Handle("/{id:[A-Za-z0-9]+}/add", ApiUserRequired(addMember)).Methods("POST") + sr.Handle("/{id:[A-Za-z0-9]+}/remove", ApiUserRequired(removeMember)).Methods("POST") sr.Handle("/{id:[A-Za-z0-9]+}/update_last_viewed_at", ApiUserRequired(updateLastViewedAt)).Methods("POST") } @@ -329,7 +329,7 @@ func getChannelCounts(c *Context, w http.ResponseWriter, r *http.Request) { } } -func joinChannel(c *Context, w http.ResponseWriter, r *http.Request) { +func join(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) channelId := params["id"] @@ -360,43 +360,62 @@ func JoinChannel(c *Context, channelId string, role string) { channel := cresult.Data.(*model.Channel) user := uresult.Data.(*model.User) - if !c.HasPermissionsToTeam(channel.TeamId, "joinChannel") { - return - } - - if channel.DeleteAt > 0 { - c.Err = model.NewAppError("joinChannel", "The channel has been archived or deleted", "") - c.Err.StatusCode = http.StatusBadRequest + if !c.HasPermissionsToTeam(channel.TeamId, "join") { return } if channel.Type == model.CHANNEL_OPEN { - cm := &model.ChannelMember{ChannelId: channel.Id, UserId: c.Session.UserId, - Roles: role, NotifyProps: model.GetDefaultChannelNotifyProps()} - - if cmresult := <-Srv.Store.Channel().SaveMember(cm); cmresult.Err != nil { - c.Err = cmresult.Err - return - } - - post := &model.Post{ChannelId: channel.Id, Message: fmt.Sprintf( - `User %v has joined this channel.`, - user.Username), Type: model.POST_JOIN_LEAVE} - if _, err := CreatePost(c, post, false); err != nil { - l4g.Error("Failed to post join message %v", err) - c.Err = model.NewAppError("joinChannel", "Failed to send join request", "") + if _, err := AddUserToChannel(user, channel); err != nil { + c.Err = err return } - - UpdateChannelAccessCacheAndForget(c.Session.TeamId, c.Session.UserId, channel.Id) + PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(`User %v has joined this channel.`, user.Username)) } else { - c.Err = model.NewAppError("joinChannel", "You do not have the appropriate permissions", "") + c.Err = model.NewAppError("join", "You do not have the appropriate permissions", "") c.Err.StatusCode = http.StatusForbidden return } } } +func PostUserAddRemoveMessageAndForget(c *Context, channelId string, message string) { + go func() { + post := &model.Post{ + ChannelId: channelId, + Message: message, + Type: model.POST_JOIN_LEAVE, + } + if _, err := CreatePost(c, post, false); err != nil { + l4g.Error("Failed to post join/leave message %v", err) + } + }() +} + +func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelMember, *model.AppError) { + if channel.DeleteAt > 0 { + return nil, model.NewAppError("AddUserToChannel", "The channel has been archived or deleted", "") + } + + if channel.Type != model.CHANNEL_OPEN && channel.Type != model.CHANNEL_PRIVATE { + return nil, model.NewAppError("AddUserToChannel", "Can not add user to this channel type", "") + } + + newMember := &model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps()} + if cmresult := <-Srv.Store.Channel().SaveMember(newMember); cmresult.Err != nil { + l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, cmresult.Err) + return nil, model.NewAppError("AddUserToChannel", "Failed to add user to channel", "") + } + + go func() { + UpdateChannelAccessCache(channel.TeamId, user.Id, channel.Id) + + message := model.NewMessage(channel.TeamId, channel.Id, user.Id, model.ACTION_USER_ADDED) + PublishAndForget(message) + }() + + return newMember, nil +} + func JoinDefaultChannels(user *model.User, channelRole string) *model.AppError { // We don't call JoinChannel here since c.Session is not populated on user creation @@ -427,7 +446,7 @@ func JoinDefaultChannels(user *model.User, channelRole string) *model.AppError { return err } -func leaveChannel(c *Context, w http.ResponseWriter, r *http.Request) { +func leave(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) id := params["id"] @@ -445,24 +464,18 @@ func leaveChannel(c *Context, w http.ResponseWriter, r *http.Request) { channel := cresult.Data.(*model.Channel) user := uresult.Data.(*model.User) - if !c.HasPermissionsToTeam(channel.TeamId, "leaveChannel") { - return - } - - if channel.DeleteAt > 0 { - c.Err = model.NewAppError("leaveChannel", "The channel has been archived or deleted", "") - c.Err.StatusCode = http.StatusBadRequest + if !c.HasPermissionsToTeam(channel.TeamId, "leave") { return } if channel.Type == model.CHANNEL_DIRECT { - c.Err = model.NewAppError("leaveChannel", "Cannot leave a direct message channel", "") + c.Err = model.NewAppError("leave", "Cannot leave a direct message channel", "") c.Err.StatusCode = http.StatusForbidden return } if channel.Name == model.DEFAULT_CHANNEL { - c.Err = model.NewAppError("leaveChannel", "Cannot leave the default channel "+model.DEFAULT_CHANNEL, "") + c.Err = model.NewAppError("leave", "Cannot leave the default channel "+model.DEFAULT_CHANNEL, "") c.Err.StatusCode = http.StatusForbidden return } @@ -472,16 +485,9 @@ func leaveChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } - UpdateChannelAccessCacheAndForget(c.Session.TeamId, c.Session.UserId, channel.Id) + RemoveUserFromChannel(c.Session.UserId, c.Session.UserId, channel) - post := &model.Post{ChannelId: channel.Id, Message: fmt.Sprintf( - `%v has left the channel.`, - user.Username), Type: model.POST_JOIN_LEAVE} - if _, err := CreatePost(c, post, false); err != nil { - l4g.Error("Failed to post leave message %v", err) - c.Err = model.NewAppError("leaveChannel", "Failed to send leave message", "") - return - } + PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(`%v has left the channel.`, user.Username)) result := make(map[string]string) result["id"] = channel.Id @@ -656,7 +662,7 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) { } } -func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { +func addMember(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) id := params["id"] @@ -664,7 +670,7 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { userId := data["user_id"] if len(userId) != 26 { - c.SetInvalidParam("addChannelMember", "user_id") + c.SetInvalidParam("addMember", "user_id") return } @@ -674,55 +680,35 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { nuc := Srv.Store.User().Get(userId) // Only need to be a member of the channel to add a new member - if !c.HasPermissionsToChannel(cchan, "addChannelMember") { + if !c.HasPermissionsToChannel(cchan, "addMember") { return } if nresult := <-nuc; nresult.Err != nil { - c.Err = model.NewAppError("addChannelMember", "Failed to find user to be added", "") + c.Err = model.NewAppError("addMember", "Failed to find user to be added", "") return } else if cresult := <-sc; cresult.Err != nil { - c.Err = model.NewAppError("addChannelMember", "Failed to find channel", "") + c.Err = model.NewAppError("addMember", "Failed to find channel", "") return } else { channel := cresult.Data.(*model.Channel) nUser := nresult.Data.(*model.User) - if channel.DeleteAt > 0 { - c.Err = model.NewAppError("updateChannel", "The channel has been archived or deleted", "") - c.Err.StatusCode = http.StatusBadRequest - return - } - if oresult := <-ouc; oresult.Err != nil { - c.Err = model.NewAppError("addChannelMember", "Failed to find user doing the adding", "") + c.Err = model.NewAppError("addMember", "Failed to find user doing the adding", "") return } else { oUser := oresult.Data.(*model.User) - cm := &model.ChannelMember{ChannelId: channel.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps()} - - if cmresult := <-Srv.Store.Channel().SaveMember(cm); cmresult.Err != nil { - l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", userId, id, cmresult.Err) - c.Err = model.NewAppError("addChannelMember", "Failed to add user to channel", "") + cm, err := AddUserToChannel(nUser, channel) + if err != nil { + c.Err = err return } c.LogAudit("name=" + channel.Name + " user_id=" + userId) - go func() { - post := &model.Post{ChannelId: id, Message: fmt.Sprintf( - `%v added to the channel by %v`, - nUser.Username, oUser.Username), Type: model.POST_JOIN_LEAVE} - if _, err := CreatePost(c, post, false); err != nil { - l4g.Error("Failed to post add member to channel message, err=%v", err) - } - - UpdateChannelAccessCache(c.Session.TeamId, userId, channel.Id) - message := model.NewMessage(c.Session.TeamId, channel.Id, userId, model.ACTION_USER_ADDED) - - PublishAndForget(message) - }() + PostUserAddRemoveMessageAndForget(c, channel.Id, fmt.Sprintf(`%v added to the channel by %v`, nUser.Username, oUser.Username)) <-Srv.Store.Channel().UpdateLastViewedAt(id, oUser.Id) w.Write([]byte(cm.ToJson())) @@ -730,20 +716,20 @@ func addChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { } } -func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { +func removeMember(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) - id := params["id"] + channelId := params["id"] data := model.MapFromJson(r.Body) - userId := data["user_id"] + userIdToRemove := data["user_id"] - if len(userId) != 26 { - c.SetInvalidParam("addChannelMember", "user_id") + if len(userIdToRemove) != 26 { + c.SetInvalidParam("removeMember", "user_id") return } - sc := Srv.Store.Channel().Get(id) - cmc := Srv.Store.Channel().GetMember(id, c.Session.UserId) + sc := Srv.Store.Channel().Get(channelId) + cmc := Srv.Store.Channel().GetMember(channelId, c.Session.UserId) if cresult := <-sc; cresult.Err != nil { c.Err = cresult.Err @@ -753,48 +739,52 @@ func removeChannelMember(c *Context, w http.ResponseWriter, r *http.Request) { return } else { channel := cresult.Data.(*model.Channel) - channelMember := cmcresult.Data.(model.ChannelMember) + removerChannelMember := cmcresult.Data.(model.ChannelMember) - if !c.HasPermissionsToTeam(channel.TeamId, "removeChannelMember") { + if !c.HasPermissionsToTeam(channel.TeamId, "removeMember") { return } - if !strings.Contains(channelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !strings.Contains(c.Session.Roles, model.ROLE_TEAM_ADMIN) { + if !strings.Contains(removerChannelMember.Roles, model.CHANNEL_ROLE_ADMIN) && !c.IsTeamAdmin() { c.Err = model.NewAppError("updateChannel", "You do not have the appropriate permissions ", "") c.Err.StatusCode = http.StatusForbidden return } - if channel.DeleteAt > 0 { - c.Err = model.NewAppError("updateChannel", "The channel has been archived or deleted", "") - c.Err.StatusCode = http.StatusBadRequest + if err := RemoveUserFromChannel(userIdToRemove, c.Session.UserId, channel); err != nil { + c.Err = model.NewAppError("updateChannel", "Unable to remove user.", err.Message) return } - if cmresult := <-Srv.Store.Channel().RemoveMember(id, userId); cmresult.Err != nil { - c.Err = cmresult.Err - return - } - - c.LogAudit("name=" + channel.Name + " user_id=" + userId) - - go func() { - UpdateChannelAccessCache(c.Session.TeamId, userId, id) - - message := model.NewMessage(c.Session.TeamId, "", userId, model.ACTION_USER_REMOVED) - message.Add("channel_id", id) - message.Add("remover", c.Session.UserId) - PublishAndForget(message) - }() + c.LogAudit("name=" + channel.Name + " user_id=" + userIdToRemove) result := make(map[string]string) result["channel_id"] = channel.Id - result["removed_user_id"] = userId + result["removed_user_id"] = userIdToRemove w.Write([]byte(model.MapToJson(result))) } } +func RemoveUserFromChannel(userIdToRemove string, removerUserId string, channel *model.Channel) *model.AppError { + if channel.DeleteAt > 0 { + return model.NewAppError("updateChannel", "The channel has been archived or deleted", "") + } + + if cmresult := <-Srv.Store.Channel().RemoveMember(channel.Id, userIdToRemove); cmresult.Err != nil { + return cmresult.Err + } + + UpdateChannelAccessCacheAndForget(channel.TeamId, userIdToRemove, channel.Id) + + message := model.NewMessage(channel.TeamId, "", userIdToRemove, model.ACTION_USER_REMOVED) + message.Add("channel_id", channel.Id) + message.Add("remover", removerUserId) + PublishAndForget(message) + + return nil +} + func updateNotifyProps(c *Context, w http.ResponseWriter, r *http.Request) { data := model.MapFromJson(r.Body) diff --git a/api/web_socket_test.go b/api/web_socket_test.go index 49a4c6870..7523d0e77 100644 --- a/api/web_socket_test.go +++ b/api/web_socket_test.go @@ -55,12 +55,17 @@ func TestSocket(t *testing.T) { time.Sleep(300 * time.Millisecond) Client.Must(Client.JoinChannel(channel1.Id)) - // Read the join channel message that gets generated + // Read the user_added message that gets generated var rmsg model.Message if err := c2.ReadJSON(&rmsg); err != nil { t.Fatal(err) } + // Read the second user_added message that gets generated + if err := c2.ReadJSON(&rmsg); err != nil { + t.Fatal(err) + } + // Test sending message without a channelId m := model.NewMessage("", "", "", model.ACTION_TYPING) m.Add("RootId", model.NewId()) diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index f15974d35..92f60ea86 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -58,7 +58,9 @@ export default class ChannelHeader extends React.Component { $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}}); } onSocketChange(msg) { - if (msg.action === 'new_user') { + if (msg.action === 'new_user' || + msg.action === 'user_added' || + (msg.action === 'user_removed' && msg.user_id !== UserStore.getCurrentId())) { AsyncClient.getChannelExtraInfo(true); } } diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx index b7ec85457..4cbb8fc82 100644 --- a/web/react/components/removed_from_channel_modal.jsx +++ b/web/react/components/removed_from_channel_modal.jsx @@ -26,13 +26,13 @@ export default class RemovedFromChannelModal extends React.Component { BrowserStore.removeItem('channel-removed-state'); } + var townSquare = ChannelStore.getByName('town-square'); + setTimeout(() => utils.switchChannel(townSquare), 1); + this.setState(newState); } handleClose() { - var townSquare = ChannelStore.getByName('town-square'); - utils.switchChannel(townSquare); - this.setState({channelName: '', remover: ''}); } @@ -98,4 +98,4 @@ export default class RemovedFromChannelModal extends React.Component { return
; } -} \ No newline at end of file +} diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 88eaed335..e2eb92121 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -262,7 +262,7 @@ export default class Sidebar extends React.Component { if (msg.user_id === UserStore.getCurrentId()) { AsyncClient.getChannels(true); - if (msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) { + if (msg.props.remover !== msg.user_id && msg.props.channel_id === ChannelStore.getCurrentId() && $('#removed_from_channel').length > 0) { var sentState = {}; sentState.channelName = ChannelStore.getCurrent().display_name; sentState.remover = UserStore.getProfile(msg.props.remover).username; -- cgit v1.2.3-1-g7c22