summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--utils/config.go51
-rw-r--r--utils/config_test.go105
2 files changed, 148 insertions, 8 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 {
diff --git a/utils/config_test.go b/utils/config_test.go
index 6d6181a3d..f816e2ee8 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -12,6 +12,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/mattermost/mattermost-server/model"
)
func TestConfig(t *testing.T) {
@@ -202,14 +204,97 @@ func TestValidateLocales(t *testing.T) {
}
func TestGetClientConfig(t *testing.T) {
- TranslationsPreInit()
- cfg, _, err := LoadConfig("config.json")
- require.Nil(t, err)
+ t.Parallel()
+ testCases := []struct {
+ description string
+ config *model.Config
+ diagnosticId string
+ license *model.License
+ expectedFields map[string]string
+ }{
+ {
+ "unlicensed",
+ &model.Config{
+ EmailSettings: model.EmailSettings{
+ EmailNotificationContentsType: sToP(model.EMAIL_NOTIFICATION_CONTENTS_FULL),
+ },
+ ThemeSettings: model.ThemeSettings{
+ // Ignored, since not licensed.
+ AllowCustomThemes: bToP(false),
+ },
+ },
+ "",
+ nil,
+ map[string]string{
+ "DiagnosticId": "",
+ "EmailNotificationContentsType": "full",
+ "AllowCustomThemes": "true",
+ },
+ },
+ {
+ "licensed, but not for theme management",
+ &model.Config{
+ EmailSettings: model.EmailSettings{
+ EmailNotificationContentsType: sToP(model.EMAIL_NOTIFICATION_CONTENTS_FULL),
+ },
+ ThemeSettings: model.ThemeSettings{
+ // Ignored, since not licensed.
+ AllowCustomThemes: bToP(false),
+ },
+ },
+ "tag1",
+ &model.License{
+ Features: &model.Features{
+ ThemeManagement: bToP(false),
+ },
+ },
+ map[string]string{
+ "DiagnosticId": "tag1",
+ "EmailNotificationContentsType": "full",
+ "AllowCustomThemes": "true",
+ },
+ },
+ {
+ "licensed for theme management",
+ &model.Config{
+ EmailSettings: model.EmailSettings{
+ EmailNotificationContentsType: sToP(model.EMAIL_NOTIFICATION_CONTENTS_FULL),
+ },
+ ThemeSettings: model.ThemeSettings{
+ AllowCustomThemes: bToP(false),
+ },
+ },
+ "tag2",
+ &model.License{
+ Features: &model.Features{
+ ThemeManagement: bToP(true),
+ },
+ },
+ map[string]string{
+ "DiagnosticId": "tag2",
+ "EmailNotificationContentsType": "full",
+ "AllowCustomThemes": "false",
+ },
+ },
+ }
- configMap := GenerateClientConfig(cfg, "", nil)
- if configMap["EmailNotificationContentsType"] != *cfg.EmailSettings.EmailNotificationContentsType {
- t.Fatal("EmailSettings.EmailNotificationContentsType not exposed to client config")
+ for _, testCase := range testCases {
+ testCase := testCase
+ t.Run(testCase.description, func(t *testing.T) {
+ t.Parallel()
+
+ testCase.config.SetDefaults()
+ if testCase.license != nil {
+ testCase.license.Features.SetDefaults()
+ }
+
+ configMap := GenerateClientConfig(testCase.config, testCase.diagnosticId, testCase.license)
+ for expectedField, expectedValue := range testCase.expectedFields {
+ assert.Equal(t, expectedValue, configMap[expectedField])
+ }
+ })
}
+
}
func TestReadConfig(t *testing.T) {
@@ -222,3 +307,11 @@ func TestReadConfig(t *testing.T) {
assert.Equal(t, "http://foo.bar", *config.ServiceSettings.SiteURL)
}
+
+func sToP(s string) *string {
+ return &s
+}
+
+func bToP(b bool) *bool {
+ return &b
+}