diff options
author | George Goldberg <george@gberg.me> | 2018-06-05 12:41:03 +0100 |
---|---|---|
committer | Martin Kraft <mkraft@users.noreply.github.com> | 2018-06-05 07:41:03 -0400 |
commit | 0c4078b6b05b4b436c459c4f58faa5302ace8e12 (patch) | |
tree | 031c363a10b730afcb33b36023f925f8993ced02 /app/channel.go | |
parent | 2c75247c97d0277944975deb9595b5f82a80e91e (diff) | |
download | chat-0c4078b6b05b4b436c459c4f58faa5302ace8e12.tar.gz chat-0c4078b6b05b4b436c459c4f58faa5302ace8e12.tar.bz2 chat-0c4078b6b05b4b436c459c4f58faa5302ace8e12.zip |
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.
Diffstat (limited to 'app/channel.go')
-rw-r--r-- | app/channel.go | 24 |
1 files changed, 24 insertions, 0 deletions
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 |