Commit 62c2b506 authored by Joram Wilander's avatar Joram Wilander Committed by JoramWilander

Fix email verificaton redirect on login (#2158)

parent 6583153a
...@@ -272,10 +272,10 @@ class LoginController extends React.Component { ...@@ -272,10 +272,10 @@ class LoginController extends React.Component {
this.props.actions.login(loginId, password, token).then(({error}) => { this.props.actions.login(loginId, password, token).then(({error}) => {
if (error) { if (error) {
if (error.id === 'api.user.login.not_verified.app_error') { if (error.server_error_id === 'api.user.login.not_verified.app_error') {
browserHistory.push('/should_verify_email?&email=' + encodeURIComponent(loginId)); browserHistory.push('/should_verify_email?&email=' + encodeURIComponent(loginId));
} else if (error.id === 'store.sql_user.get_for_login.app_error' || } else if (error.server_error_id === 'store.sql_user.get_for_login.app_error' ||
error.id === 'ent.ldap.do_login.user_not_registered.app_error') { error.server_error_id === 'ent.ldap.do_login.user_not_registered.app_error') {
this.setState({ this.setState({
showMfa: false, showMfa: false,
loading: false, loading: false,
...@@ -286,7 +286,7 @@ class LoginController extends React.Component { ...@@ -286,7 +286,7 @@ class LoginController extends React.Component {
/> />
), ),
}); });
} else if (error.id === 'api.user.check_user_password.invalid.app_error' || error.id === 'ent.ldap.do_login.invalid_password.app_error') { } else if (error.server_error_id === 'api.user.check_user_password.invalid.app_error' || error.server_error_id === 'ent.ldap.do_login.invalid_password.app_error') {
this.setState({ this.setState({
showMfa: false, showMfa: false,
loading: false, loading: false,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment