From 0c4078b6b05b4b436c459c4f58faa5302ace8e12 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 5 Jun 2018 12:41:03 +0100 Subject: MM-9730 & MM-9729: Missing Server PRs (#8908) * MM-9730: API endpoint to update scheme-derived roles of TeamMembers. * MM-9729: API to update scheme-derived roles of ChannelMembers. --- app/channel.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'app/channel.go') diff --git a/app/channel.go b/app/channel.go index 55a5008d4..7637e9d21 100644 --- a/app/channel.go +++ b/app/channel.go @@ -540,6 +540,30 @@ func (a *App) UpdateChannelMemberRoles(channelId string, userId string, newRoles return member, nil } +func (a *App) UpdateChannelMemberSchemeRoles(channelId string, userId string, isSchemeUser bool, isSchemeAdmin bool) (*model.ChannelMember, *model.AppError) { + member, err := a.GetChannelMember(channelId, userId) + if err != nil { + return nil, err + } + + member.SchemeAdmin = isSchemeAdmin + member.SchemeUser = isSchemeUser + + // If the migration is not completed, we also need to check the default channel_admin/channel_user roles are not present in the roles field. + if err = a.IsPhase2MigrationCompleted(); err != nil { + member.ExplicitRoles = RemoveRoles([]string{model.CHANNEL_USER_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID}, member.ExplicitRoles) + } + + if result := <-a.Srv.Store.Channel().UpdateMember(member); result.Err != nil { + return nil, result.Err + } else { + member = result.Data.(*model.ChannelMember) + } + + a.InvalidateCacheForUser(userId) + return member, nil +} + func (a *App) UpdateChannelMemberNotifyProps(data map[string]string, channelId string, userId string) (*model.ChannelMember, *model.AppError) { var member *model.ChannelMember var err *model.AppError -- cgit v1.2.3-1-g7c22