summaryrefslogtreecommitdiffstats
path: root/app/team.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/team.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/team.go')
-rw-r--r--app/team.go76
1 files changed, 57 insertions, 19 deletions
diff --git a/app/team.go b/app/team.go
index 47e28f2ed..3b30816be 100644
--- a/app/team.go
+++ b/app/team.go
@@ -141,17 +141,31 @@ func (a *App) sendTeamEvent(team *model.Team, event string) {
a.Publish(message)
}
+func (a *App) GetSchemeRolesForTeam(teamId string) (string, string, *model.AppError) {
+ var team *model.Team
+ var err *model.AppError
+
+ if team, err = a.GetTeam(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.DefaultTeamUserRole, scheme.DefaultTeamAdminRole, nil
+ }
+ }
+
+ return model.TEAM_USER_ROLE_ID, model.TEAM_ADMIN_ROLE_ID, nil
+}
+
func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles string) (*model.TeamMember, *model.AppError) {
var member *model.TeamMember
- if result := <-a.Srv.Store.Team().GetTeamsForUser(userId); result.Err != nil {
+ if result := <-a.Srv.Store.Team().GetMember(teamId, userId); result.Err != nil {
return nil, result.Err
} else {
- members := result.Data.([]*model.TeamMember)
- for _, m := range members {
- if m.TeamId == teamId {
- member = m
- }
- }
+ member = result.Data.(*model.TeamMember)
}
if member == nil {
@@ -159,14 +173,42 @@ func (a *App) UpdateTeamMemberRoles(teamId string, userId string, newRoles strin
return nil, err
}
- if err := a.CheckRolesExist(strings.Fields(newRoles)); err != nil {
+ schemeUserRole, schemeAdminRole, err := a.GetSchemeRolesForTeam(teamId)
+ 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("UpdateTeamMemberRoles", "api.channel.update_team_member_roles.scheme_role.app_error", nil, "role_name="+roleName, http.StatusBadRequest)
+ }
+ }
+ }
+
+ member.ExplicitRoles = strings.Join(newExplicitRoles, " ")
if result := <-a.Srv.Store.Team().UpdateMember(member); result.Err != nil {
return nil, result.Err
+ } else {
+ member = result.Data.(*model.TeamMember)
}
a.ClearSessionCacheForUser(userId)
@@ -292,13 +334,13 @@ func (a *App) AddUserToTeamByInviteId(inviteId string, userId string) (*model.Te
// 3. a pointer to an AppError if something went wrong.
func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMember, bool, *model.AppError) {
tm := &model.TeamMember{
- TeamId: team.Id,
- UserId: user.Id,
- Roles: model.TEAM_USER_ROLE_ID,
+ TeamId: team.Id,
+ UserId: user.Id,
+ SchemeUser: true,
}
if team.Email == user.Email {
- tm.Roles = model.TEAM_USER_ROLE_ID + " " + model.TEAM_ADMIN_ROLE_ID
+ tm.SchemeAdmin = true
}
if etmr := <-a.Srv.Store.Team().GetMember(team.Id, user.Id); etmr.Err == nil {
@@ -342,14 +384,10 @@ func (a *App) JoinUserToTeam(team *model.Team, user *model.User, userRequestorId
return uua.Err
}
- channelRole := model.CHANNEL_USER_ROLE_ID
-
- if team.Email == user.Email {
- channelRole = model.CHANNEL_USER_ROLE_ID + " " + model.CHANNEL_ADMIN_ROLE_ID
- }
+ shouldBeAdmin := team.Email == user.Email
// Soft error if there is an issue joining the default channels
- if err := a.JoinDefaultChannels(team.Id, user, channelRole, userRequestorId); err != nil {
+ if err := a.JoinDefaultChannels(team.Id, user, shouldBeAdmin, userRequestorId); err != nil {
l4g.Error(utils.T("api.user.create_user.joining.error"), user.Id, team.Id, err)
}