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 | |
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')
-rw-r--r-- | app/channel.go | 24 | ||||
-rw-r--r-- | app/role.go | 24 | ||||
-rw-r--r-- | app/team.go | 27 |
3 files changed, 73 insertions, 2 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 diff --git a/app/role.go b/app/role.go index c9278e0bd..72cf43fe7 100644 --- a/app/role.go +++ b/app/role.go @@ -4,9 +4,9 @@ package app import ( - "reflect" - "net/http" + "reflect" + "strings" "github.com/mattermost/mattermost-server/model" ) @@ -90,3 +90,23 @@ func (a *App) sendUpdatedRoleEvent(role *model.Role) { a.Publish(message) }) } + +func RemoveRoles(rolesToRemove []string, roles string) string { + roleList := strings.Fields(roles) + newRoles := make([]string, 0) + + for _, role := range roleList { + shouldRemove := false + for _, roleToRemove := range rolesToRemove { + if role == roleToRemove { + shouldRemove = true + break + } + } + if !shouldRemove { + newRoles = append(newRoles, role) + } + } + + return strings.Join(newRoles, " ") +} diff --git a/app/team.go b/app/team.go index 2833e2eed..d6245b6df 100644 --- a/app/team.go +++ b/app/team.go @@ -237,6 +237,33 @@ func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles strin return member, nil } +func (a *App) UpdateTeamMemberSchemeRoles(teamId string, userId string, isSchemeUser bool, isSchemeAdmin bool) (*model.TeamMember, *model.AppError) { + member, err := a.GetTeamMember(teamId, 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 team_admin/team_user roles are not present in the roles field. + if err = a.IsPhase2MigrationCompleted(); err != nil { + member.ExplicitRoles = RemoveRoles([]string{model.TEAM_USER_ROLE_ID, model.TEAM_ADMIN_ROLE_ID}, member.ExplicitRoles) + } + + if result := <-a.Srv.Store.Team().UpdateMember(member); result.Err != nil { + return nil, result.Err + } else { + member = result.Data.(*model.TeamMember) + } + + a.ClearSessionCacheForUser(userId) + + a.sendUpdatedMemberRoleEvent(userId, member) + + return member, nil +} + func (a *App) sendUpdatedMemberRoleEvent(userId string, member *model.TeamMember) { message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_MEMBERROLE_UPDATED, "", "", userId, nil) message.Add("member", member.ToJson()) |