diff options
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 26 | ||||
-rw-r--r-- | model/config_test.go | 7 |
2 files changed, 18 insertions, 15 deletions
diff --git a/model/config.go b/model/config.go index a5a588a82..4710658ec 100644 --- a/model/config.go +++ b/model/config.go @@ -224,6 +224,7 @@ type ServiceSettings struct { ImageProxyType *string ImageProxyURL *string ImageProxyOptions *string + EnableAPITeamDeletion *bool } func (s *ServiceSettings) SetDefaults() { @@ -452,6 +453,10 @@ func (s *ServiceSettings) SetDefaults() { if s.ImageProxyOptions == nil { s.ImageProxyOptions = NewString("") } + + if s.EnableAPITeamDeletion == nil { + s.EnableAPITeamDeletion = NewBool(false) + } } type ClusterSettings struct { @@ -975,7 +980,7 @@ type TeamSettings struct { SiteName string MaxUsersPerTeam *int EnableTeamCreation *bool - EnableUserCreation bool + EnableUserCreation *bool EnableOpenServer *bool RestrictCreationToDomains string EnableCustomBrand *bool @@ -1106,6 +1111,11 @@ func (s *TeamSettings) SetDefaults() { if s.EnableTeamCreation == nil { s.EnableTeamCreation = NewBool(true) } + + if s.EnableUserCreation == nil { + s.EnableUserCreation = NewBool(true) + } + } type ClientRequirements struct { @@ -1860,18 +1870,10 @@ func (o *Config) SetDefaults() { } func (o *Config) IsValid() *AppError { - if len(*o.ServiceSettings.SiteURL) == 0 && *o.EmailSettings.EnableEmailBatching { - return NewAppError("Config.IsValid", "model.config.is_valid.site_url_email_batching.app_error", nil, "", http.StatusBadRequest) - } - if *o.ClusterSettings.Enable && *o.EmailSettings.EnableEmailBatching { return NewAppError("Config.IsValid", "model.config.is_valid.cluster_email_batching.app_error", nil, "", http.StatusBadRequest) } - if len(*o.ServiceSettings.SiteURL) == 0 && *o.ServiceSettings.AllowCookiesForSubdomains { - return NewAppError("Config.IsValid", "Allowing cookies for subdomains requires SiteURL to be set.", nil, "", http.StatusBadRequest) - } - if err := o.TeamSettings.isValid(); err != nil { return err } @@ -2177,12 +2179,6 @@ func (ss *ServiceSettings) isValid() *AppError { return NewAppError("Config.IsValid", "model.config.is_valid.login_attempts.app_error", nil, "", http.StatusBadRequest) } - if len(*ss.SiteURL) != 0 { - if _, err := url.ParseRequestURI(*ss.SiteURL); err != nil { - return NewAppError("Config.IsValid", "model.config.is_valid.site_url.app_error", nil, "", http.StatusBadRequest) - } - } - if len(*ss.WebsocketURL) != 0 { if _, err := url.ParseRequestURI(*ss.WebsocketURL); err != nil { return NewAppError("Config.IsValid", "model.config.is_valid.websocket_url.app_error", nil, "", http.StatusBadRequest) diff --git a/model/config_test.go b/model/config_test.go index b7533145b..e39ecef3b 100644 --- a/model/config_test.go +++ b/model/config_test.go @@ -82,6 +82,13 @@ func TestConfigDefaultFileSettingsS3SSE(t *testing.T) { } } +func TestConfigDefaultSiteURL(t *testing.T) { + c1 := Config{} + c1.SetDefaults() + + assert.Equal(t, "", *c1.ServiceSettings.SiteURL, "SiteURL should be empty by default.") +} + func TestConfigDefaultServiceSettingsExperimentalGroupUnreadChannels(t *testing.T) { c1 := Config{} c1.SetDefaults() |