MM-15021: Adding new builtin system schema for Guests (#10601)
* MM-15021: Adding new builtin system schema for Guests * Fixing tests * Setting properly the permissions * Adding guests to sampledata * Restrict more roles updates in the app layer for guests * Adding comment to explain that permissions migration must go at the end * Setting the default guest role for custom scheme during migration * Fixing import and export * Creating scheme guest roles on migration * Fixing tests * Fixing tests * Fixing tests
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
987360f325
Коммит
584ec68755
@@ -144,6 +144,14 @@ func (me *TestHelper) CreateTeam() *model.Team {
|
||||
}
|
||||
|
||||
func (me *TestHelper) CreateUser() *model.User {
|
||||
return me.CreateUserOrGuest(false)
|
||||
}
|
||||
|
||||
func (me *TestHelper) CreateGuest() *model.User {
|
||||
return me.CreateUserOrGuest(true)
|
||||
}
|
||||
|
||||
func (me *TestHelper) CreateUserOrGuest(guest bool) *model.User {
|
||||
id := model.NewId()
|
||||
|
||||
user := &model.User{
|
||||
@@ -156,11 +164,20 @@ func (me *TestHelper) CreateUser() *model.User {
|
||||
|
||||
utils.DisableDebugLogForTest()
|
||||
var err *model.AppError
|
||||
if user, err = me.App.CreateUser(user); err != nil {
|
||||
mlog.Error(err.Error())
|
||||
if guest {
|
||||
if user, err = me.App.CreateGuest(user); err != nil {
|
||||
mlog.Error(err.Error())
|
||||
|
||||
time.Sleep(time.Second)
|
||||
panic(err)
|
||||
time.Sleep(time.Second)
|
||||
panic(err)
|
||||
}
|
||||
} else {
|
||||
if user, err = me.App.CreateUser(user); err != nil {
|
||||
mlog.Error(err.Error())
|
||||
|
||||
time.Sleep(time.Second)
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
utils.EnableDebugLogForTest()
|
||||
return user
|
||||
@@ -316,8 +333,10 @@ func (me *TestHelper) CreateScheme() (*model.Scheme, []*model.Role) {
|
||||
roleNames := []string{
|
||||
scheme.DefaultTeamAdminRole,
|
||||
scheme.DefaultTeamUserRole,
|
||||
scheme.DefaultTeamGuestRole,
|
||||
scheme.DefaultChannelAdminRole,
|
||||
scheme.DefaultChannelUserRole,
|
||||
scheme.DefaultChannelGuestRole,
|
||||
}
|
||||
|
||||
var roles []*model.Role
|
||||
|
||||
Ссылка в новой задаче
Block a user