diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-12 12:11:02 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-12 12:11:02 -0400 |
| commit | d1efb66ad7b017f0fbfe6f0c20843b30f396e504 (patch) | |
| tree | 5b48a38382015de815b2d45d58836c5ca06b631c /webapp/components/login/login.jsx | |
| parent | 3f0325fd223dcb3a6eec92f772df1e7541ab0b2b (diff) | |
| parent | 9a701b7e5b31ca803a2d92f0b3b1d7cc68bf3c37 (diff) | |
| download | chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.gz chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.tar.bz2 chat-d1efb66ad7b017f0fbfe6f0c20843b30f396e504.zip | |
Merge branch 'release-3.0'
Diffstat (limited to 'webapp/components/login/login.jsx')
| -rw-r--r-- | webapp/components/login/login.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx index 0a12ed645..8ae3fdd4d 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login.jsx @@ -85,8 +85,7 @@ export default class Login extends React.Component { browserHistory.push('/should_verify_email?&email=' + encodeURIComponent(loginId)); return; } else if (err.id === 'store.sql_user.get_for_login.app_error' || - err.id === 'ent.ldap.do_login.user_not_registered.app_error' || - err.id === 'ent.ldap.do_login.user_filtered.app_error') { + err.id === 'ent.ldap.do_login.user_not_registered.app_error') { this.setState({ showMfa: false, serverError: ( @@ -98,6 +97,7 @@ export default class Login extends React.Component { }); } else if (err.id === 'api.user.check_user_password.invalid.app_error' || err.id === 'ent.ldap.do_login.invalid_password.app_error') { this.setState({ + showMfa: false, serverError: ( <FormattedMessage id='login.invalidPassword' |