From 62c2b506733cb21012582f3b6d87e539bd9134f2 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 11 Dec 2018 15:55:51 -0500 Subject: [PATCH] Fix email verificaton redirect on login (#2158) --- components/login/login_controller/login_controller.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/login/login_controller/login_controller.jsx b/components/login/login_controller/login_controller.jsx index a5be7c607..0610d2b39 100644 --- a/components/login/login_controller/login_controller.jsx +++ b/components/login/login_controller/login_controller.jsx @@ -272,10 +272,10 @@ class LoginController extends React.Component { this.props.actions.login(loginId, password, token).then(({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)); - } else if (error.id === 'store.sql_user.get_for_login.app_error' || - error.id === 'ent.ldap.do_login.user_not_registered.app_error') { + } else if (error.server_error_id === 'store.sql_user.get_for_login.app_error' || + error.server_error_id === 'ent.ldap.do_login.user_not_registered.app_error') { this.setState({ showMfa: false, loading: false, @@ -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({ showMfa: false, loading: false, -- GitLab