MM-15730: Send down the Position attribute mapping in client config. (#11018)
This is required to know when to disable the Position field in the User Settings UI modal.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
69076934ec
Коммит
328eea4bc3
@@ -94,12 +94,14 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
|
|||||||
props["LdapNicknameAttributeSet"] = "false"
|
props["LdapNicknameAttributeSet"] = "false"
|
||||||
props["LdapFirstNameAttributeSet"] = "false"
|
props["LdapFirstNameAttributeSet"] = "false"
|
||||||
props["LdapLastNameAttributeSet"] = "false"
|
props["LdapLastNameAttributeSet"] = "false"
|
||||||
|
props["LdapPositionAttributeSet"] = "false"
|
||||||
props["EnableCompliance"] = "false"
|
props["EnableCompliance"] = "false"
|
||||||
props["EnableMobileFileDownload"] = "true"
|
props["EnableMobileFileDownload"] = "true"
|
||||||
props["EnableMobileFileUpload"] = "true"
|
props["EnableMobileFileUpload"] = "true"
|
||||||
props["SamlFirstNameAttributeSet"] = "false"
|
props["SamlFirstNameAttributeSet"] = "false"
|
||||||
props["SamlLastNameAttributeSet"] = "false"
|
props["SamlLastNameAttributeSet"] = "false"
|
||||||
props["SamlNicknameAttributeSet"] = "false"
|
props["SamlNicknameAttributeSet"] = "false"
|
||||||
|
props["SamlPositionAttributeSet"] = "false"
|
||||||
props["EnableCluster"] = "false"
|
props["EnableCluster"] = "false"
|
||||||
props["EnableMetrics"] = "false"
|
props["EnableMetrics"] = "false"
|
||||||
props["PasswordMinimumLength"] = "0"
|
props["PasswordMinimumLength"] = "0"
|
||||||
@@ -136,6 +138,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
|
|||||||
props["LdapNicknameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.NicknameAttribute != "")
|
props["LdapNicknameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.NicknameAttribute != "")
|
||||||
props["LdapFirstNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.FirstNameAttribute != "")
|
props["LdapFirstNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.FirstNameAttribute != "")
|
||||||
props["LdapLastNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.LastNameAttribute != "")
|
props["LdapLastNameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.LastNameAttribute != "")
|
||||||
|
props["LdapPositionAttributeSet"] = strconv.FormatBool(*c.LdapSettings.PositionAttribute != "")
|
||||||
}
|
}
|
||||||
|
|
||||||
if *license.Features.Compliance {
|
if *license.Features.Compliance {
|
||||||
@@ -148,6 +151,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
|
|||||||
props["SamlFirstNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.FirstNameAttribute != "")
|
props["SamlFirstNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.FirstNameAttribute != "")
|
||||||
props["SamlLastNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.LastNameAttribute != "")
|
props["SamlLastNameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.LastNameAttribute != "")
|
||||||
props["SamlNicknameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.NicknameAttribute != "")
|
props["SamlNicknameAttributeSet"] = strconv.FormatBool(*c.SamlSettings.NicknameAttribute != "")
|
||||||
|
props["SamlPositionAttributeSet"] = strconv.FormatBool(*c.SamlSettings.PositionAttribute != "")
|
||||||
|
|
||||||
// do this under the correct licensed feature
|
// do this under the correct licensed feature
|
||||||
props["ExperimentalClientSideCertEnable"] = strconv.FormatBool(*c.ExperimentalSettings.ClientSideCertEnable)
|
props["ExperimentalClientSideCertEnable"] = strconv.FormatBool(*c.ExperimentalSettings.ClientSideCertEnable)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user