diff options
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 17 | ||||
| -rw-r--r-- | model/oauth.go | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 7c9643b75..904668606 100644 --- a/model/config.go +++ b/model/config.go @@ -907,6 +907,21 @@ func (s *EmailSettings) SetDefaults() { } } +type ExtensionSettings struct { + EnableExperimentalExtensions *bool + AllowedExtensionsIDs []string +} + +func (s *ExtensionSettings) SetDefaults() { + if s.EnableExperimentalExtensions == nil { + s.EnableExperimentalExtensions = NewBool(false) + } + + if s.AllowedExtensionsIDs == nil { + s.AllowedExtensionsIDs = []string{} + } +} + type RateLimitSettings struct { Enable *bool PerSec *int @@ -1870,6 +1885,7 @@ type Config struct { PasswordSettings PasswordSettings FileSettings FileSettings EmailSettings EmailSettings + ExtensionSettings ExtensionSettings RateLimitSettings RateLimitSettings PrivacySettings PrivacySettings SupportSettings SupportSettings @@ -1967,6 +1983,7 @@ func (o *Config) SetDefaults() { o.MessageExportSettings.SetDefaults() o.TimezoneSettings.SetDefaults() o.DisplaySettings.SetDefaults() + o.ExtensionSettings.SetDefaults() } func (o *Config) IsValid() *AppError { diff --git a/model/oauth.go b/model/oauth.go index c92b1ec41..0ea1aa4e2 100644 --- a/model/oauth.go +++ b/model/oauth.go @@ -17,6 +17,7 @@ const ( OAUTH_ACTION_EMAIL_TO_SSO = "email_to_sso" OAUTH_ACTION_SSO_TO_EMAIL = "sso_to_email" OAUTH_ACTION_MOBILE = "mobile" + OAUTH_ACTION_CLIENT = "client" ) type OAuthApp struct { |