From 23d831d341b7ab566f47cd09cb6bba3ecb7d3dbe Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Thu, 14 Jul 2016 15:57:59 -0400
Subject: [PATCH] added field name to ldap system console errors (#3593)

---
 i18n/en.json    | 36 ++++++++++++++++++++++++++++++++++++
 model/config.go | 44 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 8ea570b111d1f..2c0f4a119acd7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2715,6 +2715,42 @@
     "id": "model.config.is_valid.ldap_sync_interval.app_error",
     "translation": "Invalid sync interval time. Must be at least one minute."
   },
+  {
+    "id": "model.config.is_valid.ldap_server",
+    "translation": "LDAP field \"LDAP Server\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_basedn",
+    "translation": "LDAP field \"BaseDN\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_bind_username",
+    "translation": "LDAP field \"Bind Username\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_bind_password",
+    "translation": "LDAP field \"Bind Password\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_firstname",
+    "translation": "LDAP field \"First Name Attribute\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_lastname",
+    "translation": "LDAP field \"Last Name Attribute\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_email",
+    "translation": "LDAP field \"Email Attribute\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_username",
+    "translation": "LDAP field \"Username Attribute\" is required."
+  },
+  {
+    "id": "model.config.is_valid.ldap_id",
+    "translation": "LDAP field \"ID Attribute\" is required."
+  },
   {
     "id": "model.config.is_valid.listen_address.app_error",
     "translation": "Invalid listen address for service settings Must be set."
diff --git a/model/config.go b/model/config.go
index 64396b65e3b67..532584a1a4dba 100644
--- a/model/config.go
+++ b/model/config.go
@@ -895,16 +895,40 @@ func (o *Config) IsValid() *AppError {
 	}
 
 	if *o.LdapSettings.Enable {
-		if *o.LdapSettings.LdapServer == "" ||
-			*o.LdapSettings.BaseDN == "" ||
-			*o.LdapSettings.BindUsername == "" ||
-			*o.LdapSettings.BindPassword == "" ||
-			*o.LdapSettings.FirstNameAttribute == "" ||
-			*o.LdapSettings.LastNameAttribute == "" ||
-			*o.LdapSettings.EmailAttribute == "" ||
-			*o.LdapSettings.UsernameAttribute == "" ||
-			*o.LdapSettings.IdAttribute == "" {
-			return NewLocAppError("Config.IsValid", "Required LDAP field missing", nil, "")
+		if *o.LdapSettings.LdapServer == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_server", nil, "")
+		}
+
+		if *o.LdapSettings.BaseDN == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_basedn", nil, "")
+		}
+
+		if *o.LdapSettings.BindUsername == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_bind_username", nil, "")
+		}
+
+		if *o.LdapSettings.BindPassword == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_bind_password", nil, "")
+		}
+
+		if *o.LdapSettings.FirstNameAttribute == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_firstname", nil, "")
+		}
+
+		if *o.LdapSettings.LastNameAttribute == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_lastname", nil, "")
+		}
+
+		if *o.LdapSettings.EmailAttribute == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_email", nil, "")
+		}
+
+		if *o.LdapSettings.UsernameAttribute == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_username", nil, "")
+		}
+
+		if *o.LdapSettings.IdAttribute == "" {
+			return NewLocAppError("Config.IsValid", "model.config.is_valid.ldap_id", nil, "")
 		}
 	}