From ae3865b5397b798f85151c51ec4e37187fc5f25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Tue, 28 Aug 2018 19:49:01 +0200
Subject: MM-10532: Add EnableSyncWithLdapIncludeAuth config (#9319)

---
 app/diagnostics.go  | 5 +++--
 config/default.json | 1 +
 model/config.go     | 9 +++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index 450e9c0e3..f0d6153e6 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -452,8 +452,9 @@ func (a *App) trackConfig() {
 	})
 
 	a.SendDiagnostic(TRACK_CONFIG_SAML, map[string]interface{}{
-		"enable":                              *cfg.SamlSettings.Enable,
-		"enable_sync_with_ldap":               *cfg.SamlSettings.EnableSyncWithLdap,
+		"enable":                             *cfg.SamlSettings.Enable,
+		"enable_sync_with_ldap":              *cfg.SamlSettings.EnableSyncWithLdap,
+		"enable_sync_with_ldap_include_auth": *cfg.SamlSettings.EnableSyncWithLdapIncludeAuth,
 		"verify":                              *cfg.SamlSettings.Verify,
 		"encrypt":                             *cfg.SamlSettings.Encrypt,
 		"isdefault_scoping_idp_provider_id":   isDefault(*cfg.SamlSettings.ScopingIDPProviderId, ""),
diff --git a/config/default.json b/config/default.json
index ebbf42dca..dc103638e 100644
--- a/config/default.json
+++ b/config/default.json
@@ -308,6 +308,7 @@
     "SamlSettings": {
         "Enable": false,
         "EnableSyncWithLdap": false,
+        "EnableSyncWithLdapIncludeAuth": false,
         "Verify": true,
         "Encrypt": true,
         "IdpUrl": "",
diff --git a/model/config.go b/model/config.go
index 7fc5c567a..c0f443b72 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1457,8 +1457,9 @@ func (s *LocalizationSettings) SetDefaults() {
 
 type SamlSettings struct {
 	// Basic
-	Enable             *bool
-	EnableSyncWithLdap *bool
+	Enable                        *bool
+	EnableSyncWithLdap            *bool
+	EnableSyncWithLdapIncludeAuth *bool
 
 	Verify  *bool
 	Encrypt *bool
@@ -1500,6 +1501,10 @@ func (s *SamlSettings) SetDefaults() {
 		s.EnableSyncWithLdap = NewBool(false)
 	}
 
+	if s.EnableSyncWithLdapIncludeAuth == nil {
+		s.EnableSyncWithLdapIncludeAuth = NewBool(false)
+	}
+
 	if s.Verify == nil {
 		s.Verify = NewBool(true)
 	}
-- 
cgit v1.2.3-1-g7c22