[MM-35222] Fix DoGuestRolesCreationMigration (#17523)

* Set guest role based on scope

* Fix team scheme

* Fix scope
Этот коммит содержится в:
Claudio Costa
2021-04-29 09:13:42 +02:00
коммит произвёл GitHub
родитель 3c162999a5
Коммит d1e38fa74b

Просмотреть файл

@@ -191,19 +191,21 @@ func (a *App) DoGuestRolesCreationMigration() {
}
for _, scheme := range schemes {
if scheme.DefaultTeamGuestRole == "" || scheme.DefaultChannelGuestRole == "" {
// Team Guest Role
teamGuestRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Team Guest Role for Scheme %s", scheme.Name),
Permissions: roles[model.TEAM_GUEST_ROLE_ID].Permissions,
SchemeManaged: true,
}
if scheme.Scope == model.SCHEME_SCOPE_TEAM {
// Team Guest Role
teamGuestRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Team Guest Role for Scheme %s", scheme.Name),
Permissions: roles[model.TEAM_GUEST_ROLE_ID].Permissions,
SchemeManaged: true,
}
if savedRole, err := a.Srv().Store.Role().Save(teamGuestRole); err != nil {
mlog.Critical("Failed to create new guest role for custom scheme.", mlog.Err(err))
allSucceeded = false
} else {
scheme.DefaultTeamGuestRole = savedRole.Name
if savedRole, err := a.Srv().Store.Role().Save(teamGuestRole); err != nil {
mlog.Critical("Failed to create new guest role for custom scheme.", mlog.Err(err))
allSucceeded = false
} else {
scheme.DefaultTeamGuestRole = savedRole.Name
}
}
// Channel Guest Role