summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorJesse Hallam <jesse.hallam@gmail.com>2018-03-22 10:57:29 -0400
committerChristopher Speller <crspeller@gmail.com>2018-03-22 07:57:29 -0700
commit6036ddad8598cc69511a259ffdafcce570653717 (patch)
treed2235c5d2495cad0649c6bfdca87b95d7fcf5b4a /utils/config.go
parent74e703f58daff2aded07a969410f988cff9ada9b (diff)
downloadchat-6036ddad8598cc69511a259ffdafcce570653717.tar.gz
chat-6036ddad8598cc69511a259ffdafcce570653717.tar.bz2
chat-6036ddad8598cc69511a259ffdafcce570653717.zip
MM-9804: emit defaults for all enterprise config (#8490)
* MM-9804: emit defaults for all enterprise config This prevents the client from having to write inverted checks if a certain value defaults as `'true'` instead of `'false'`. * move EnableMobileFile(Upload|Download) to a defaulted enterprise configuration
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go51
1 files changed, 49 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go
index 5e9849930..163838a13 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -408,8 +408,6 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
props["SupportEmail"] = *c.SupportSettings.SupportEmail
props["EnableFileAttachments"] = strconv.FormatBool(*c.FileSettings.EnableFileAttachments)
- props["EnableMobileFileUpload"] = strconv.FormatBool(*c.FileSettings.EnableMobileUpload)
- props["EnableMobileFileDownload"] = strconv.FormatBool(*c.FileSettings.EnableMobileDownload)
props["EnablePublicLink"] = strconv.FormatBool(c.FileSettings.EnablePublicLink)
props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort)
@@ -443,8 +441,55 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
hasImageProxy := c.ServiceSettings.ImageProxyType != nil && *c.ServiceSettings.ImageProxyType != "" && c.ServiceSettings.ImageProxyURL != nil && *c.ServiceSettings.ImageProxyURL != ""
props["HasImageProxy"] = strconv.FormatBool(hasImageProxy)
+ // Set default values for all options that require a license.
+ props["ExperimentalTownSquareIsReadOnly"] = "false"
+ props["ExperimentalEnableAuthenticationTransfer"] = "true"
+ props["EnableCustomBrand"] = "false"
+ props["CustomBrandText"] = ""
+ props["CustomDescriptionText"] = ""
+ props["EnableLdap"] = "false"
+ props["LdapLoginFieldName"] = ""
+ props["LdapNicknameAttributeSet"] = "false"
+ props["LdapFirstNameAttributeSet"] = "false"
+ props["LdapLastNameAttributeSet"] = "false"
+ props["LdapLoginButtonColor"] = ""
+ props["LdapLoginButtonBorderColor"] = ""
+ props["LdapLoginButtonTextColor"] = ""
+ props["EnableMultifactorAuthentication"] = "false"
+ props["EnforceMultifactorAuthentication"] = "false"
+ props["EnableCompliance"] = "false"
+ props["EnableMobileFileDownload"] = "true"
+ props["EnableMobileFileUpload"] = "true"
+ props["EnableSaml"] = "false"
+ props["SamlLoginButtonText"] = ""
+ props["SamlFirstNameAttributeSet"] = "false"
+ props["SamlLastNameAttributeSet"] = "false"
+ props["SamlNicknameAttributeSet"] = "false"
+ props["SamlLoginButtonColor"] = ""
+ props["SamlLoginButtonBorderColor"] = ""
+ props["SamlLoginButtonTextColor"] = ""
+ props["EnableCluster"] = "false"
+ props["EnableMetrics"] = "false"
+ props["EnableSignUpWithGoogle"] = "false"
+ props["EnableSignUpWithOffice365"] = "false"
+ props["PasswordMinimumLength"] = "0"
+ props["PasswordRequireLowercase"] = "false"
+ props["PasswordRequireUppercase"] = "false"
+ props["PasswordRequireNumber"] = "false"
+ props["PasswordRequireSymbol"] = "false"
+ props["EnableBanner"] = "false"
+ props["BannerText"] = ""
+ props["BannerColor"] = ""
+ props["BannerTextColor"] = ""
+ props["AllowBannerDismissal"] = "false"
props["EnableThemeSelection"] = "true"
+ props["DefaultTheme"] = ""
props["AllowCustomThemes"] = "true"
+ props["AllowedThemes"] = ""
+ props["DataRetentionEnableMessageDeletion"] = "false"
+ props["DataRetentionMessageRetentionDays"] = "0"
+ props["DataRetentionEnableFileDeletion"] = "false"
+ props["DataRetentionFileRetentionDays"] = "0"
if license != nil {
props["ExperimentalTownSquareIsReadOnly"] = strconv.FormatBool(*c.TeamSettings.ExperimentalTownSquareIsReadOnly)
@@ -474,6 +519,8 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
if *license.Features.Compliance {
props["EnableCompliance"] = strconv.FormatBool(*c.ComplianceSettings.Enable)
+ props["EnableMobileFileDownload"] = strconv.FormatBool(*c.FileSettings.EnableMobileDownload)
+ props["EnableMobileFileUpload"] = strconv.FormatBool(*c.FileSettings.EnableMobileUpload)
}
if *license.Features.SAML {