diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 07:48:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 07:48:57 -0500 |
commit | 202c383d8dc23ff3c0633fff99bd7da95397fe3a (patch) | |
tree | b9f06ca4dd84a90fd53676347820898c951829ef /webapp/actions/user_actions.jsx | |
parent | fb4d72bd8a3a9b533571e42cfb1b7e2d1702f6be (diff) | |
download | chat-202c383d8dc23ff3c0633fff99bd7da95397fe3a.tar.gz chat-202c383d8dc23ff3c0633fff99bd7da95397fe3a.tar.bz2 chat-202c383d8dc23ff3c0633fff99bd7da95397fe3a.zip |
Fix MFA enforcement on login and page load (#6356)
Diffstat (limited to 'webapp/actions/user_actions.jsx')
-rw-r--r-- | webapp/actions/user_actions.jsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index 377a11020..9d48e0c7a 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -742,6 +742,12 @@ export function webLogin(loginId, password, token, success, error) { success(); } else if (!ok && error) { const serverError = getState().requests.users.login.error; + if (serverError.server_error_id === 'api.context.mfa_required.app_error') { + if (success) { + success(); + } + return; + } error({id: serverError.server_error_id, ...serverError}); } } |