IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-14757/14758: Restricts deleting team and channel members if the team or channel is group constrained. (#10553)

Browse Source 
* MM-14757/14758: Update APIs to reject removals from group-constrained teams.

* MM-14757/14758: Tests API changes.

* MM-14757/14758: Allow users to leave channals and teams.

* MM-14757/14758: Updates translation key order.

* MM-14757/14758: Adds user to team before setting it to group-constrained b/c of new add restrictions.
This commit is contained in:
Martin Kraft
2019-04-12 10:15:46 -04:00
committed by GitHub
parent f93ba3cd23
commit 100433f4cc
5 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api4/channel_test.go
View File

@@ -2228,6 +2228,20 @@ func TestRemoveChannelMember(t *testing.T) {
_, resp = Client.RemoveUserFromChannel(privateChannel.Id, user2.Id)
CheckNoError(t, resp)
_, resp = th.SystemAdminClient.AddChannelMember(privateChannel.Id, th.SystemAdminUser.Id)
CheckNoError(t, resp)
// If the channel is group-constrained the user cannot be removed
privateChannel.GroupConstrained = model.NewBool(true)
_, err := th.App.UpdateChannel(privateChannel)
require.Nil(t, err)
_, resp = Client.RemoveUserFromChannel(privateChannel.Id, user2.Id)
require.Equal(t, "api.channel.remove_member.group_constrained.app_error", resp.Error.Id)
// If the channel is group-constrained user can remove self
_, resp = th.SystemAdminClient.RemoveUserFromChannel(privateChannel.Id, th.SystemAdminUser.Id)
CheckNoError(t, resp)
// Test on preventing removal of user from a direct channel
directChannel, resp := Client.CreateDirectChannel(user1.Id, user2.Id)
CheckNoError(t, resp)