From 667db6e10c7bf4d3856a1f94eaad34d9e03352c1 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 26 Sep 2016 13:41:50 -0400 Subject: Cleaning up some old code from the permissions system change (#4090) --- store/sql_channel_store.go | 124 ---------------------------------------- store/sql_channel_store_test.go | 91 +---------------------------- store/store.go | 4 -- 3 files changed, 2 insertions(+), 217 deletions(-) (limited to 'store') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index c0f9bddf0..99a36b1cd 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -730,130 +730,6 @@ func (s SqlChannelStore) PermanentDeleteMembersByUser(userId string) StoreChanne return storeChannel } -func (s SqlChannelStore) CheckPermissionsToNoTeam(channelId string, userId string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - count, err := s.GetReplica().SelectInt( - `SELECT - COUNT(0) - FROM - Channels, - ChannelMembers - WHERE - Channels.Id = ChannelMembers.ChannelId - AND Channels.DeleteAt = 0 - AND ChannelMembers.ChannelId = :ChannelId - AND ChannelMembers.UserId = :UserId`, - map[string]interface{}{"ChannelId": channelId, "UserId": userId}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.CheckPermissionsTo", "store.sql_channel.check_permissions.app_error", nil, "channel_id="+channelId+", user_id="+userId+", "+err.Error()) - } else { - result.Data = count - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (s SqlChannelStore) CheckPermissionsTo(teamId string, channelId string, userId string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - count, err := s.GetReplica().SelectInt( - `SELECT - COUNT(0) - FROM - Channels, - ChannelMembers - WHERE - Channels.Id = ChannelMembers.ChannelId - AND (Channels.TeamId = :TeamId OR Channels.TeamId = '') - AND Channels.DeleteAt = 0 - AND ChannelMembers.ChannelId = :ChannelId - AND ChannelMembers.UserId = :UserId`, - map[string]interface{}{"TeamId": teamId, "ChannelId": channelId, "UserId": userId}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.CheckPermissionsTo", "store.sql_channel.check_permissions.app_error", nil, "channel_id="+channelId+", user_id="+userId+", "+err.Error()) - } else { - result.Data = count - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (s SqlChannelStore) CheckPermissionsToByName(teamId string, channelName string, userId string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - channelId, err := s.GetReplica().SelectStr( - `SELECT - Channels.Id - FROM - Channels, - ChannelMembers - WHERE - Channels.Id = ChannelMembers.ChannelId - AND (Channels.TeamId = :TeamId OR Channels.TeamId = '') - AND Channels.Name = :Name - AND Channels.DeleteAt = 0 - AND ChannelMembers.UserId = :UserId`, - map[string]interface{}{"TeamId": teamId, "Name": channelName, "UserId": userId}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.CheckPermissionsToByName", "store.sql_channel.check_permissions_by_name.app_error", nil, "channel_id="+channelName+", user_id="+userId+", "+err.Error()) - } else { - result.Data = channelId - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - -func (s SqlChannelStore) CheckOpenChannelPermissions(teamId string, channelId string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - count, err := s.GetReplica().SelectInt( - `SELECT - COUNT(0) - FROM - Channels - WHERE - Channels.Id = :ChannelId - AND Channels.TeamId = :TeamId - AND Channels.Type = :ChannelType`, - map[string]interface{}{"ChannelId": channelId, "TeamId": teamId, "ChannelType": model.CHANNEL_OPEN}) - if err != nil { - result.Err = model.NewLocAppError("SqlChannelStore.CheckOpenChannelPermissions", "store.sql_channel.check_open_channel_permissions.app_error", nil, "channel_id="+channelId+", "+err.Error()) - } else { - result.Data = count - } - - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} - func (s SqlChannelStore) SetLastViewedAt(channelId string, userId string, newLastViewedAt int64) StoreChannel { storeChannel := make(StoreChannel, 1) diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go index 6a567f470..519fdea6a 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -4,9 +4,10 @@ package store import ( - "github.com/mattermost/platform/model" "testing" "time" + + "github.com/mattermost/platform/model" ) func TestChannelStoreSave(t *testing.T) { @@ -442,94 +443,6 @@ func TestChannelDeleteMemberStore(t *testing.T) { } } -func TestChannelStorePermissionsTo(t *testing.T) { - Setup() - - o1 := model.Channel{} - o1.TeamId = model.NewId() - o1.DisplayName = "Channel1" - o1.Name = "a" + model.NewId() + "b" - o1.Type = model.CHANNEL_OPEN - Must(store.Channel().Save(&o1)) - - m1 := model.ChannelMember{} - m1.ChannelId = o1.Id - m1.UserId = model.NewId() - m1.NotifyProps = model.GetDefaultChannelNotifyProps() - Must(store.Channel().SaveMember(&m1)) - - count := (<-store.Channel().CheckPermissionsTo(o1.TeamId, o1.Id, m1.UserId)).Data.(int64) - if count != 1 { - t.Fatal("should have permissions") - } - - count = (<-store.Channel().CheckPermissionsToNoTeam(o1.Id, m1.UserId)).Data.(int64) - if count != 1 { - t.Fatal("should have permissions") - } - - count = (<-store.Channel().CheckPermissionsTo("junk", o1.Id, m1.UserId)).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } - - count = (<-store.Channel().CheckPermissionsTo(o1.TeamId, "junk", m1.UserId)).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } - - count = (<-store.Channel().CheckPermissionsToNoTeam("junk", m1.UserId)).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } - - count = (<-store.Channel().CheckPermissionsTo(o1.TeamId, o1.Id, "junk")).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } - - count = (<-store.Channel().CheckPermissionsToNoTeam(o1.Id, "junk")).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } - - channelId := (<-store.Channel().CheckPermissionsToByName(o1.TeamId, o1.Name, m1.UserId)).Data.(string) - if channelId != o1.Id { - t.Fatal("should have permissions") - } - - channelId = (<-store.Channel().CheckPermissionsToByName(o1.TeamId, "missing", m1.UserId)).Data.(string) - if channelId != "" { - t.Fatal("should not have permissions") - } -} - -func TestChannelStoreOpenChannelPermissionsTo(t *testing.T) { - Setup() - - o1 := model.Channel{} - o1.TeamId = model.NewId() - o1.DisplayName = "Channel1" - o1.Name = "a" + model.NewId() + "b" - o1.Type = model.CHANNEL_OPEN - Must(store.Channel().Save(&o1)) - - count := (<-store.Channel().CheckOpenChannelPermissions(o1.TeamId, o1.Id)).Data.(int64) - if count != 1 { - t.Fatal("should have permissions") - } - - count = (<-store.Channel().CheckOpenChannelPermissions("junk", o1.Id)).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } - - count = (<-store.Channel().CheckOpenChannelPermissions(o1.TeamId, "junk")).Data.(int64) - if count != 0 { - t.Fatal("shouldn't have permissions") - } -} - func TestChannelStoreGetChannels(t *testing.T) { Setup() diff --git a/store/store.go b/store/store.go index 620a99ff3..fbe415986 100644 --- a/store/store.go +++ b/store/store.go @@ -95,10 +95,6 @@ type ChannelStore interface { RemoveMember(channelId string, userId string) StoreChannel PermanentDeleteMembersByUser(userId string) StoreChannel GetExtraMembers(channelId string, limit int) StoreChannel - CheckPermissionsTo(teamId string, channelId string, userId string) StoreChannel - CheckPermissionsToNoTeam(channelId string, userId string) StoreChannel - CheckOpenChannelPermissions(teamId string, channelId string) StoreChannel - CheckPermissionsToByName(teamId string, channelName string, userId string) StoreChannel UpdateLastViewedAt(channelId string, userId string) StoreChannel SetLastViewedAt(channelId string, userId string, newLastViewedAt int64) StoreChannel IncrementMentionCount(channelId string, userId string) StoreChannel -- cgit v1.2.3-1-g7c22