diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2018-05-23 20:36:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 20:36:20 +0800 |
| commit | 70a118c0fd45f8ab2510c80a0110f24be21f8785 (patch) | |
| tree | 9289aa8881b83bf533fda2b6b56453c49af72d12 /utils/config.go | |
| parent | ce378adc97399dcae9e1c9621c584669b813b2d2 (diff) | |
| download | chat-70a118c0fd45f8ab2510c80a0110f24be21f8785.tar.gz chat-70a118c0fd45f8ab2510c80a0110f24be21f8785.tar.bz2 chat-70a118c0fd45f8ab2510c80a0110f24be21f8785.zip | |
remove license check when enforcing password requirements (#8840)
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 13 |
1 files changed, 5 insertions, 8 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 |