diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-10-11 09:47:59 -0700 |
|---|---|---|
| committer | Chris <ccbrown112@gmail.com> | 2017-10-11 09:47:59 -0700 |
| commit | 675f13c808f4fe0f8a39e75f27d4471eb0680cd9 (patch) | |
| tree | 739ef5d088fbed243bdad606944e23a065094456 /utils/config.go | |
| parent | 7c4e338a5652835ba6de986c3d56525acffe7d47 (diff) | |
| download | chat-675f13c808f4fe0f8a39e75f27d4471eb0680cd9.tar.gz chat-675f13c808f4fe0f8a39e75f27d4471eb0680cd9.tar.bz2 chat-675f13c808f4fe0f8a39e75f27d4471eb0680cd9.zip | |
Fixing LDAP and SAML settings detection (#7605)
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/config.go b/utils/config.go index c4ffbc8e0..2a956dd4a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -518,9 +518,9 @@ func getClientConfig(c *model.Config) map[string]string { if *License.Features.LDAP { props["EnableLdap"] = strconv.FormatBool(*c.LdapSettings.Enable) props["LdapLoginFieldName"] = *c.LdapSettings.LoginFieldName - props["NicknameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.NicknameAttribute != "") - props["FirstNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.FirstNameAttribute != "") - props["LastNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.LastNameAttribute != "") + props["LdapNicknameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.NicknameAttribute != "") + props["LdapFirstNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.FirstNameAttribute != "") + props["LdapLastNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.LastNameAttribute != "") } if *License.Features.MFA { @@ -535,9 +535,9 @@ func getClientConfig(c *model.Config) map[string]string { if *License.Features.SAML { props["EnableSaml"] = strconv.FormatBool(*c.SamlSettings.Enable) props["SamlLoginButtonText"] = *c.SamlSettings.LoginButtonText - props["FirstNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.FirstNameAttribute != "") - props["LastNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.LastNameAttribute != "") - props["NicknameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.NicknameAttribute != "") + props["SamlFirstNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.FirstNameAttribute != "") + props["SamlLastNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.LastNameAttribute != "") + props["SamlNicknameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.NicknameAttribute != "") } if *License.Features.Cluster { |