From fc158fce907b602bbde3babfadfd1a04d1dde31e Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Mon, 25 Jun 2018 14:34:59 +0100 Subject: MM-10570: Make permissions reset command clear custom role assignments. (#8976) --- store/storetest/channel_store.go | 60 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'store/storetest/channel_store.go') diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index eea79d42f..ecec7fab9 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -55,6 +55,7 @@ func TestChannelStore(t *testing.T, ss store.Store) { t.Run("GetChannelsByScheme", func(t *testing.T) { testChannelStoreGetChannelsByScheme(t, ss) }) t.Run("MigrateChannelMembers", func(t *testing.T) { testChannelStoreMigrateChannelMembers(t, ss) }) t.Run("ResetAllChannelSchemes", func(t *testing.T) { testResetAllChannelSchemes(t, ss) }) + t.Run("ClearAllCustomRoleAssignments", func(t *testing.T) { testChannelStoreClearAllCustomRoleAssignments(t, ss) }) } @@ -2358,3 +2359,62 @@ func testResetAllChannelSchemes(t *testing.T, ss store.Store) { assert.Equal(t, "", *c1.SchemeId) assert.Equal(t, "", *c2.SchemeId) } + +func testChannelStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) { + c := &model.Channel{ + TeamId: model.NewId(), + DisplayName: "Name", + Name: model.NewId(), + Type: model.CHANNEL_OPEN, + } + + c = (<-ss.Channel().Save(c, 100)).Data.(*model.Channel) + + m1 := &model.ChannelMember{ + ChannelId: c.Id, + UserId: model.NewId(), + NotifyProps: model.GetDefaultChannelNotifyProps(), + ExplicitRoles: "channel_user channel_admin system_user_access_token", + } + m2 := &model.ChannelMember{ + ChannelId: c.Id, + UserId: model.NewId(), + NotifyProps: model.GetDefaultChannelNotifyProps(), + ExplicitRoles: "channel_user custom_role channel_admin another_custom_role", + } + m3 := &model.ChannelMember{ + ChannelId: c.Id, + UserId: model.NewId(), + NotifyProps: model.GetDefaultChannelNotifyProps(), + ExplicitRoles: "channel_user", + } + m4 := &model.ChannelMember{ + ChannelId: c.Id, + UserId: model.NewId(), + NotifyProps: model.GetDefaultChannelNotifyProps(), + ExplicitRoles: "custom_only", + } + + store.Must(ss.Channel().SaveMember(m1)) + store.Must(ss.Channel().SaveMember(m2)) + store.Must(ss.Channel().SaveMember(m3)) + store.Must(ss.Channel().SaveMember(m4)) + + require.Nil(t, (<-ss.Channel().ClearAllCustomRoleAssignments()).Err) + + r1 := <-ss.Channel().GetMember(m1.ChannelId, m1.UserId) + require.Nil(t, r1.Err) + assert.Equal(t, m1.ExplicitRoles, r1.Data.(*model.ChannelMember).Roles) + + r2 := <-ss.Channel().GetMember(m2.ChannelId, m2.UserId) + require.Nil(t, r2.Err) + assert.Equal(t, "channel_user channel_admin", r2.Data.(*model.ChannelMember).Roles) + + r3 := <-ss.Channel().GetMember(m3.ChannelId, m3.UserId) + require.Nil(t, r3.Err) + assert.Equal(t, m3.ExplicitRoles, r3.Data.(*model.ChannelMember).Roles) + + r4 := <-ss.Channel().GetMember(m4.ChannelId, m4.UserId) + require.Nil(t, r4.Err) + assert.Equal(t, "", r4.Data.(*model.ChannelMember).Roles) +} -- cgit v1.2.3-1-g7c22