diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
| commit | 69304fb54da5300941a49364e4344c2c65e654d6 (patch) | |
| tree | de20c2e8a479ae3d13bcd21abc3dff067afa602e /utils | |
| parent | e46b94fa66c029b9a493fdc6ff7bcb98e9651568 (diff) | |
| parent | 47f3c064db885c2cb2e75c195ea24e2ef687891d (diff) | |
| download | chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.gz chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.bz2 chat-69304fb54da5300941a49364e4344c2c65e654d6.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 13 | ||||
| -rw-r--r-- | utils/license.go | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/utils/config.go b/utils/config.go index dd782c0fc..18e25c999 100644 --- a/utils/config.go +++ b/utils/config.go @@ -602,6 +602,11 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["DataRetentionMessageRetentionDays"] = "0" props["DataRetentionEnableFileDeletion"] = "false" props["DataRetentionFileRetentionDays"] = "0" + props["PasswordMinimumLength"] = fmt.Sprintf("%v", *c.PasswordSettings.MinimumLength) + props["PasswordRequireLowercase"] = strconv.FormatBool(*c.PasswordSettings.Lowercase) + props["PasswordRequireUppercase"] = strconv.FormatBool(*c.PasswordSettings.Uppercase) + props["PasswordRequireNumber"] = strconv.FormatBool(*c.PasswordSettings.Number) + props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) if license != nil { props["ExperimentalTownSquareIsReadOnly"] = strconv.FormatBool(*c.TeamSettings.ExperimentalTownSquareIsReadOnly) @@ -662,14 +667,6 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["EnableSignUpWithOffice365"] = strconv.FormatBool(c.Office365Settings.Enable) } - if *license.Features.PasswordRequirements { - props["PasswordMinimumLength"] = fmt.Sprintf("%v", *c.PasswordSettings.MinimumLength) - props["PasswordRequireLowercase"] = strconv.FormatBool(*c.PasswordSettings.Lowercase) - props["PasswordRequireUppercase"] = strconv.FormatBool(*c.PasswordSettings.Uppercase) - props["PasswordRequireNumber"] = strconv.FormatBool(*c.PasswordSettings.Number) - props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) - } - if *license.Features.Announcement { props["EnableBanner"] = strconv.FormatBool(*c.AnnouncementSettings.EnableBanner) props["BannerText"] = *c.AnnouncementSettings.BannerText diff --git a/utils/license.go b/utils/license.go index 1d76cf994..8bb214734 100644 --- a/utils/license.go +++ b/utils/license.go @@ -139,7 +139,6 @@ func GetClientLicense(l *model.License) map[string]string { props["Compliance"] = strconv.FormatBool(*l.Features.Compliance) props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand) props["MHPNS"] = strconv.FormatBool(*l.Features.MHPNS) - props["PasswordRequirements"] = strconv.FormatBool(*l.Features.PasswordRequirements) props["Announcement"] = strconv.FormatBool(*l.Features.Announcement) props["Elasticsearch"] = strconv.FormatBool(*l.Features.Elasticsearch) props["DataRetention"] = strconv.FormatBool(*l.Features.DataRetention) |