PLT-5813 support SAML sync via LDAP (#7668)
* PLT-5813 support SAML sync via LDAP * Cleaning up based on review
Этот коммит содержится в:
@@ -394,6 +394,7 @@ type ClientRequirements struct {
|
||||
type LdapSettings struct {
|
||||
// Basic
|
||||
Enable *bool
|
||||
EnableSync *bool
|
||||
LdapServer *string
|
||||
LdapPort *int
|
||||
ConnectionSecurity *string
|
||||
@@ -439,7 +440,9 @@ type LocalizationSettings struct {
|
||||
|
||||
type SamlSettings struct {
|
||||
// Basic
|
||||
Enable *bool
|
||||
Enable *bool
|
||||
EnableSyncWithLdap *bool
|
||||
|
||||
Verify *bool
|
||||
Encrypt *bool
|
||||
|
||||
@@ -987,6 +990,12 @@ func (o *Config) SetDefaults() {
|
||||
o.LdapSettings.Enable = NewBool(false)
|
||||
}
|
||||
|
||||
// When unset should default to LDAP Enabled
|
||||
if o.LdapSettings.EnableSync == nil {
|
||||
o.LdapSettings.EnableSync = new(bool)
|
||||
*o.LdapSettings.EnableSync = *o.LdapSettings.Enable
|
||||
}
|
||||
|
||||
if o.LdapSettings.LdapServer == nil {
|
||||
o.LdapSettings.LdapServer = NewString("")
|
||||
}
|
||||
@@ -1209,6 +1218,11 @@ func (o *Config) SetDefaults() {
|
||||
o.SamlSettings.Enable = NewBool(false)
|
||||
}
|
||||
|
||||
if o.SamlSettings.EnableSyncWithLdap == nil {
|
||||
o.SamlSettings.EnableSyncWithLdap = new(bool)
|
||||
*o.SamlSettings.EnableSyncWithLdap = false
|
||||
}
|
||||
|
||||
if o.SamlSettings.Verify == nil {
|
||||
o.SamlSettings.Verify = NewBool(true)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user