From b3b46a01aae85594b9b3d2d8872d33d6812492a6 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Tue, 31 Oct 2017 08:37:34 -0700
Subject: PLT-5813 support SAML sync via LDAP (#7668)

* PLT-5813 support SAML sync via LDAP

* Cleaning up based on review
---
 model/config.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index 17b7e87e6..ae62626de 100644
--- a/model/config.go
+++ b/model/config.go
@@ -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)
 	}
-- 
cgit v1.2.3-1-g7c22