MM-10640 Set EnableUserCreation to true by default (#8815)
* Set EnableUserCreation to true by default * Fix argument type to FormatBool * Convert EnableUserCreation instances to pointer * Convert to boolean in tests also * Set value of pointer to be false * Convert remaining EnableUserCreation instances to pointer
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
c6cbce6100
Коммит
d3ead7dc85
@@ -563,7 +563,7 @@ func signupWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if !c.App.Config().TeamSettings.EnableUserCreation {
|
if !*c.App.Config().TeamSettings.EnableUserCreation {
|
||||||
utils.RenderWebError(w, r, http.StatusBadRequest, url.Values{
|
utils.RenderWebError(w, r, http.StatusBadRequest, url.Values{
|
||||||
"message": []string{utils.T("api.oauth.singup_with_oauth.disabled.app_error")},
|
"message": []string{utils.T("api.oauth.singup_with_oauth.disabled.app_error")},
|
||||||
}, c.App.AsymmetricSigningKey())
|
}, c.App.AsymmetricSigningKey())
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ func TestCreateUser(t *testing.T) {
|
|||||||
CheckBadRequestStatus(t, resp)
|
CheckBadRequestStatus(t, resp)
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = false })
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = false })
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = false })
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableUserCreation = false })
|
||||||
|
|
||||||
user2 := &model.User{Email: th.GenerateTestEmail(), Password: "Password1", Username: GenerateTestUsername()}
|
user2 := &model.User{Email: th.GenerateTestEmail(), Password: "Password1", Username: GenerateTestUsername()}
|
||||||
_, resp = AdminClient.CreateUser(user2)
|
_, resp = AdminClient.CreateUser(user2)
|
||||||
@@ -170,13 +170,13 @@ func TestCreateUserWithToken(t *testing.T) {
|
|||||||
<-th.App.Srv.Store.Token().Save(token)
|
<-th.App.Srv.Store.Token().Save(token)
|
||||||
defer th.App.DeleteToken(token)
|
defer th.App.DeleteToken(token)
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = false })
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableUserCreation = false })
|
||||||
|
|
||||||
_, resp := Client.CreateUserWithToken(&user, token.Token)
|
_, resp := Client.CreateUserWithToken(&user, token.Token)
|
||||||
CheckNotImplementedStatus(t, resp)
|
CheckNotImplementedStatus(t, resp)
|
||||||
CheckErrorMessage(t, resp, "api.user.create_user.signup_email_disabled.app_error")
|
CheckErrorMessage(t, resp, "api.user.create_user.signup_email_disabled.app_error")
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = true })
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableUserCreation = true })
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("EnableOpenServerDisable", func(t *testing.T) {
|
t.Run("EnableOpenServerDisable", func(t *testing.T) {
|
||||||
@@ -270,7 +270,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
|||||||
t.Run("EnableUserCreationDisable", func(t *testing.T) {
|
t.Run("EnableUserCreationDisable", func(t *testing.T) {
|
||||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = false })
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableUserCreation = false })
|
||||||
|
|
||||||
inviteId := th.BasicTeam.InviteId
|
inviteId := th.BasicTeam.InviteId
|
||||||
|
|
||||||
@@ -278,7 +278,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
|||||||
CheckNotImplementedStatus(t, resp)
|
CheckNotImplementedStatus(t, resp)
|
||||||
CheckErrorMessage(t, resp, "api.user.create_user.signup_email_disabled.app_error")
|
CheckErrorMessage(t, resp, "api.user.create_user.signup_email_disabled.app_error")
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = true })
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableUserCreation = true })
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("EnableOpenServerDisable", func(t *testing.T) {
|
t.Run("EnableOpenServerDisable", func(t *testing.T) {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ func (me *InvitePeopleProvider) GetTrigger() string {
|
|||||||
|
|
||||||
func (me *InvitePeopleProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Command {
|
func (me *InvitePeopleProvider) GetCommand(a *App, T goi18n.TranslateFunc) *model.Command {
|
||||||
autoComplete := true
|
autoComplete := true
|
||||||
if !a.Config().EmailSettings.SendEmailNotifications || !a.Config().TeamSettings.EnableUserCreation {
|
if !a.Config().EmailSettings.SendEmailNotifications || !*a.Config().TeamSettings.EnableUserCreation {
|
||||||
autoComplete = false
|
autoComplete = false
|
||||||
}
|
}
|
||||||
return &model.Command{
|
return &model.Command{
|
||||||
@@ -45,7 +45,7 @@ func (me *InvitePeopleProvider) DoCommand(a *App, args *model.CommandArgs, messa
|
|||||||
return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.email_off")}
|
return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.email_off")}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !a.Config().TeamSettings.EnableUserCreation {
|
if !*a.Config().TeamSettings.EnableUserCreation {
|
||||||
return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.invite_off")}
|
return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL, Text: args.T("api.command.invite_people.invite_off")}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ func (a *App) trackConfig() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{
|
a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{
|
||||||
"enable_user_creation": cfg.TeamSettings.EnableUserCreation,
|
"enable_user_creation": *cfg.TeamSettings.EnableUserCreation,
|
||||||
"enable_team_creation": *cfg.TeamSettings.EnableTeamCreation,
|
"enable_team_creation": *cfg.TeamSettings.EnableTeamCreation,
|
||||||
"restrict_team_invite": *cfg.TeamSettings.RestrictTeamInvite,
|
"restrict_team_invite": *cfg.TeamSettings.RestrictTeamInvite,
|
||||||
"restrict_public_channel_creation": *cfg.TeamSettings.RestrictPublicChannelCreation,
|
"restrict_public_channel_creation": *cfg.TeamSettings.RestrictPublicChannelCreation,
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ func (a *App) CreateUserFromSignup(user *model.User) (*model.User, *model.AppErr
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) IsUserSignUpAllowed() *model.AppError {
|
func (a *App) IsUserSignUpAllowed() *model.AppError {
|
||||||
if !a.Config().EmailSettings.EnableSignUpWithEmail || !a.Config().TeamSettings.EnableUserCreation {
|
if !a.Config().EmailSettings.EnableSignUpWithEmail || !*a.Config().TeamSettings.EnableUserCreation {
|
||||||
err := model.NewAppError("IsUserSignUpAllowed", "api.user.create_user.signup_email_disabled.app_error", nil, "", http.StatusNotImplemented)
|
err := model.NewAppError("IsUserSignUpAllowed", "api.user.create_user.signup_email_disabled.app_error", nil, "", http.StatusNotImplemented)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -250,7 +250,7 @@ func (a *App) createUser(user *model.User) (*model.User, *model.AppError) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.User, *model.AppError) {
|
func (a *App) CreateOAuthUser(service string, userData io.Reader, teamId string) (*model.User, *model.AppError) {
|
||||||
if !a.Config().TeamSettings.EnableUserCreation {
|
if !*a.Config().TeamSettings.EnableUserCreation {
|
||||||
return nil, model.NewAppError("CreateOAuthUser", "api.user.create_user.disabled.app_error", nil, "", http.StatusNotImplemented)
|
return nil, model.NewAppError("CreateOAuthUser", "api.user.create_user.disabled.app_error", nil, "", http.StatusNotImplemented)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ func TestCreateOAuthUser(t *testing.T) {
|
|||||||
|
|
||||||
th.App.PermanentDeleteUser(user)
|
th.App.PermanentDeleteUser(user)
|
||||||
|
|
||||||
th.App.Config().TeamSettings.EnableUserCreation = false
|
*th.App.Config().TeamSettings.EnableUserCreation = false
|
||||||
|
|
||||||
_, err = th.App.CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id)
|
_, err = th.App.CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
|||||||
@@ -980,7 +980,7 @@ type TeamSettings struct {
|
|||||||
SiteName string
|
SiteName string
|
||||||
MaxUsersPerTeam *int
|
MaxUsersPerTeam *int
|
||||||
EnableTeamCreation *bool
|
EnableTeamCreation *bool
|
||||||
EnableUserCreation bool
|
EnableUserCreation *bool
|
||||||
EnableOpenServer *bool
|
EnableOpenServer *bool
|
||||||
RestrictCreationToDomains string
|
RestrictCreationToDomains string
|
||||||
EnableCustomBrand *bool
|
EnableCustomBrand *bool
|
||||||
@@ -1111,6 +1111,11 @@ func (s *TeamSettings) SetDefaults() {
|
|||||||
if s.EnableTeamCreation == nil {
|
if s.EnableTeamCreation == nil {
|
||||||
s.EnableTeamCreation = NewBool(true)
|
s.EnableTeamCreation = NewBool(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if s.EnableUserCreation == nil {
|
||||||
|
s.EnableUserCreation = NewBool(true)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ClientRequirements struct {
|
type ClientRequirements struct {
|
||||||
|
|||||||
@@ -448,7 +448,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
|
|||||||
props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/")
|
props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/")
|
||||||
props["SiteName"] = c.TeamSettings.SiteName
|
props["SiteName"] = c.TeamSettings.SiteName
|
||||||
props["EnableTeamCreation"] = strconv.FormatBool(*c.TeamSettings.EnableTeamCreation)
|
props["EnableTeamCreation"] = strconv.FormatBool(*c.TeamSettings.EnableTeamCreation)
|
||||||
props["EnableUserCreation"] = strconv.FormatBool(c.TeamSettings.EnableUserCreation)
|
props["EnableUserCreation"] = strconv.FormatBool(*c.TeamSettings.EnableUserCreation)
|
||||||
props["EnableOpenServer"] = strconv.FormatBool(*c.TeamSettings.EnableOpenServer)
|
props["EnableOpenServer"] = strconv.FormatBool(*c.TeamSettings.EnableOpenServer)
|
||||||
props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage
|
props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage
|
||||||
props["RestrictTeamInvite"] = *c.TeamSettings.RestrictTeamInvite
|
props["RestrictTeamInvite"] = *c.TeamSettings.RestrictTeamInvite
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user