summaryrefslogtreecommitdiffstats
path: root/app/channel.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2018-04-20 19:49:13 +0100
committerMartin Kraft <mkraft@users.noreply.github.com>2018-04-20 14:49:13 -0400
commitcd55c44c8fd8f61cdb7cbfb57a588be82c7aa0ab (patch)
tree2979276d03b5bca72b549d7576eab104ceefd495 /app/channel.go
parent853445dc2ea68f765faa04ad14618b04f1081c43 (diff)
downloadchat-cd55c44c8fd8f61cdb7cbfb57a588be82c7aa0ab.tar.gz
chat-cd55c44c8fd8f61cdb7cbfb57a588be82c7aa0ab.tar.bz2
chat-cd55c44c8fd8f61cdb7cbfb57a588be82c7aa0ab.zip
MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)
* Add Scheme model and stub store. * Port ChannelStore to be Scheme aware. * Make almost all the API/APP layer work with ChannelSchemes. Only thing still hacky is UpdateChannelMemberRoles(). * Add basic SchemeStore implementation. * Migrate UpdateChannelMemberRoles properly and fix tests. * Update store tests and mocks so they work. * Include creating default roles in Scheme create store function. * Implement role deletion and start scheme deletion. * Only use non-deleted roles for authorization. * Add GetByScheme method to Team store. * Add GetChannelsByScheme. * Update store mocks. * Implement scheme deletion in the store. * Rename is valid function. * Add offset and limit to queries to fetch teams and channels by scheme. * Fix queries. * Implement scheme awareness in Team store and add a migration. * Tidy up ChannelStore mapping functions and add exhaustive unit tests. * Add all missing i18n. * Proper tests for TeamStore internal functions and fix them. * Make additional TeamMember fields nullable. * Make new ChannelMember fields nullable. * Create new nullable columns without defaults. * Make new fields in large tables nullalble. * Fix empty list of TeamMembers. * Deduplicate SQL queries. * Fix spelling. * Fix review comment. * More review fixes. * More review fixes.
Diffstat (limited to 'app/channel.go')
-rw-r--r--app/channel.go80
1 files changed, 72 insertions, 8 deletions
diff --git a/app/channel.go b/app/channel.go
index 76eb4d337..c63023fb3 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -32,7 +32,7 @@ func (a *App) CreateDefaultChannels(teamId string) ([]*model.Channel, *model.App
return channels, nil
}
-func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole string, userRequestorId string) *model.AppError {
+func (a *App) JoinDefaultChannels(teamId string, user *model.User, shouldBeAdmin bool, userRequestorId string) *model.AppError {
var err *model.AppError = nil
var requestor *model.User
@@ -52,7 +52,8 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole s
cm := &model.ChannelMember{
ChannelId: townSquare.Id,
UserId: user.Id,
- Roles: channelRole,
+ SchemeUser: true,
+ SchemeAdmin: shouldBeAdmin,
NotifyProps: model.GetDefaultChannelNotifyProps(),
}
@@ -85,7 +86,8 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole s
cm := &model.ChannelMember{
ChannelId: offTopic.Id,
UserId: user.Id,
- Roles: channelRole,
+ SchemeUser: true,
+ SchemeAdmin: shouldBeAdmin,
NotifyProps: model.GetDefaultChannelNotifyProps(),
}
@@ -166,7 +168,8 @@ func (a *App) CreateChannel(channel *model.Channel, addMember bool) (*model.Chan
cm := &model.ChannelMember{
ChannelId: sc.Id,
UserId: channel.CreatorId,
- Roles: model.CHANNEL_USER_ROLE_ID + " " + model.CHANNEL_ADMIN_ROLE_ID,
+ SchemeUser: true,
+ SchemeAdmin: true,
NotifyProps: model.GetDefaultChannelNotifyProps(),
}
@@ -322,7 +325,7 @@ func (a *App) createGroupChannel(userIds []string, creatorId string) (*model.Cha
UserId: user.Id,
ChannelId: group.Id,
NotifyProps: model.GetDefaultChannelNotifyProps(),
- Roles: model.CHANNEL_USER_ROLE_ID,
+ SchemeUser: true,
}
if result := <-a.Srv.Store.Channel().SaveMember(cm); result.Err != nil {
@@ -432,6 +435,39 @@ func (a *App) PatchChannel(channel *model.Channel, patch *model.ChannelPatch, us
return channel, err
}
+func (a *App) GetSchemeRolesForChannel(channelId string) (string, string, *model.AppError) {
+ var channel *model.Channel
+ var err *model.AppError
+
+ if channel, err = a.GetChannel(channelId); err != nil {
+ return "", "", err
+ }
+
+ if channel.SchemeId != nil && len(*channel.SchemeId) != 0 {
+ if scheme, err := a.GetScheme(*channel.SchemeId); err != nil {
+ return "", "", err
+ } else {
+ return scheme.DefaultChannelUserRole, scheme.DefaultChannelAdminRole, nil
+ }
+ }
+
+ var team *model.Team
+
+ if team, err = a.GetTeam(channel.TeamId); err != nil {
+ return "", "", err
+ }
+
+ if team.SchemeId != nil && len(*team.SchemeId) != 0 {
+ if scheme, err := a.GetScheme(*team.SchemeId); err != nil {
+ return "", "", err
+ } else {
+ return scheme.DefaultChannelUserRole, scheme.DefaultChannelAdminRole, nil
+ }
+ }
+
+ return model.CHANNEL_USER_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID, nil
+}
+
func (a *App) UpdateChannelMemberRoles(channelId string, userId string, newRoles string) (*model.ChannelMember, *model.AppError) {
var member *model.ChannelMember
var err *model.AppError
@@ -439,14 +475,42 @@ func (a *App) UpdateChannelMemberRoles(channelId string, userId string, newRoles
return nil, err
}
- if err := a.CheckRolesExist(strings.Fields(newRoles)); err != nil {
+ schemeUserRole, schemeAdminRole, err := a.GetSchemeRolesForChannel(channelId)
+ if err != nil {
return nil, err
}
- member.Roles = newRoles
+ var newExplicitRoles []string
+ member.SchemeUser = false
+ member.SchemeAdmin = false
+
+ for _, roleName := range strings.Fields(newRoles) {
+ if role, err := a.GetRoleByName(roleName); err != nil {
+ err.StatusCode = http.StatusBadRequest
+ return nil, err
+ } else if !role.SchemeManaged {
+ // The role is not scheme-managed, so it's OK to apply it to the explicit roles field.
+ newExplicitRoles = append(newExplicitRoles, roleName)
+ } else {
+ // The role is scheme-managed, so need to check if it is part of the scheme for this channel or not.
+ switch roleName {
+ case schemeAdminRole:
+ member.SchemeAdmin = true
+ case schemeUserRole:
+ member.SchemeUser = true
+ default:
+ // If not part of the scheme for this channel, then it is not allowed to apply it as an explicit role.
+ return nil, model.NewAppError("UpdateChannelMemberRoles", "api.channel.update_channel_member_roles.scheme_role.app_error", nil, "role_name="+roleName, http.StatusBadRequest)
+ }
+ }
+ }
+
+ member.ExplicitRoles = strings.Join(newExplicitRoles, " ")
if result := <-a.Srv.Store.Channel().UpdateMember(member); result.Err != nil {
return nil, result.Err
+ } else {
+ member = result.Data.(*model.ChannelMember)
}
a.InvalidateCacheForUser(userId)
@@ -591,7 +655,7 @@ func (a *App) addUserToChannel(user *model.User, channel *model.Channel, teamMem
ChannelId: channel.Id,
UserId: user.Id,
NotifyProps: model.GetDefaultChannelNotifyProps(),
- Roles: model.CHANNEL_USER_ROLE_ID,
+ SchemeUser: true,
}
if result := <-a.Srv.Store.Channel().SaveMember(newMember); result.Err != nil {
l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, result.Err)