From 629fc3d3064114a092c9708eeb74f332448d3da2 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 24 Mar 2016 12:44:31 -0400
Subject: [PATCH 1/3] Minor fix to let Sign-in Method settings show up when
 ldap is enabled

---
 webapp/components/user_settings/user_settings_security.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx
index 283d2c4258..f937844ec2 100644
--- a/webapp/components/user_settings/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security.jsx
@@ -416,6 +416,7 @@ class SecurityTab extends React.Component {
         let numMethods = 0;
         numMethods = global.window.mm_config.EnableSignUpWithGitLab === 'true' ? numMethods + 1 : numMethods;
         numMethods = global.window.mm_config.EnableSignUpWithGoogle === 'true' ? numMethods + 1 : numMethods;
+        numMethods = global.window.mm_config.EnableLdap === 'true' ? numMethods + 1 : numMethods;
 
         if (global.window.mm_config.EnableSignUpWithEmail && numMethods > 0) {
             signInSection = this.createSignInSection();

From be2c883883e746a96c7d1cce48e59cc61a9a6ec8 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 24 Mar 2016 13:59:46 -0400
Subject: [PATCH 2/3] Fix chrome autocompleting using hidden input

---
 .../claim/components/email_to_ldap.jsx           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx
index f3046fa740..0c9fb6f9fc 100644
--- a/webapp/components/claim/components/email_to_ldap.jsx
+++ b/webapp/components/claim/components/email_to_ldap.jsx
@@ -20,7 +20,7 @@ export default class EmailToLDAP extends React.Component {
         e.preventDefault();
         var state = {};
 
-        const password = ReactDOM.findDOMNode(this.refs.password).value.trim();
+        const password = ReactDOM.findDOMNode(this.refs.emailpassword).value.trim();
         if (!password) {
             state.error = Utils.localizeMessage('claim.email_to_ldap.pwdError', 'Please enter your password.');
             this.setState(state);
@@ -104,13 +104,19 @@ export default class EmailToLDAP extends React.Component {
                             }}
                         />
                     </p>
+                    <input
+                        type='text'
+                        style={{display: 'none'}}
+                        name='fakeusernameremembered'
+                    />
                     <div className={formClass}>
                         <input
                             type='password'
                             className='form-control'
-                            name='password'
-                            ref='password'
-                            placeholder={Utils.localizeMessage('claim.email_to_ldap.pwd', 'Password')}
+                            name='emailPassword'
+                            ref='emailpassword'
+                            autoComplete='off'
+                            placeholder={Utils.localizeMessage('claim.email_to_ldap.emailPwd', 'Email Password')}
                             spellCheck='false'
                         />
                     </div>
@@ -130,6 +136,7 @@ export default class EmailToLDAP extends React.Component {
                             className='form-control'
                             name='ldapId'
                             ref='ldapid'
+                            autoComplete='off'
                             placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapId', 'LDAP ID')}
                             spellCheck='false'
                         />
@@ -140,6 +147,7 @@ export default class EmailToLDAP extends React.Component {
                             className='form-control'
                             name='ldapPassword'
                             ref='ldappassword'
+                            autoComplete='off'
                             placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'LDAP Password')}
                             spellCheck='false'
                         />

From 105333412e7fb95c3ce43958207bad922fc48cbb Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 24 Mar 2016 18:57:16 -0400
Subject: [PATCH 3/3] Remove loc change

---
 webapp/components/claim/components/email_to_ldap.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx
index 0c9fb6f9fc..1f7631953e 100644
--- a/webapp/components/claim/components/email_to_ldap.jsx
+++ b/webapp/components/claim/components/email_to_ldap.jsx
@@ -116,7 +116,7 @@ export default class EmailToLDAP extends React.Component {
                             name='emailPassword'
                             ref='emailpassword'
                             autoComplete='off'
-                            placeholder={Utils.localizeMessage('claim.email_to_ldap.emailPwd', 'Email Password')}
+                            placeholder={Utils.localizeMessage('claim.email_to_ldap.pwd', 'Password')}
                             spellCheck='false'
                         />
                     </div>