diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/actions/user_actions.jsx | 6 | ||||
| -rw-r--r-- | webapp/components/mfa/components/confirm.jsx | 6 | ||||
| -rw-r--r-- | webapp/package.json | 2 |
3 files changed, 12 insertions, 2 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}); } } diff --git a/webapp/components/mfa/components/confirm.jsx b/webapp/components/mfa/components/confirm.jsx index a6c2eda4e..6ec99ef47 100644 --- a/webapp/components/mfa/components/confirm.jsx +++ b/webapp/components/mfa/components/confirm.jsx @@ -8,6 +8,8 @@ import React from 'react'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import {browserHistory} from 'react-router/es6'; +import {loadMe} from 'actions/user_actions.jsx'; + export default class Confirm extends React.Component { constructor(props) { super(props); @@ -25,7 +27,9 @@ export default class Confirm extends React.Component { submit(e) { e.preventDefault(); - browserHistory.push('/'); + loadMe(() => { + browserHistory.push('/'); + }); } onKeyPress(e) { diff --git a/webapp/package.json b/webapp/package.json index e7203f0d6..8d64773a9 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -22,7 +22,7 @@ "localforage": "1.5.0", "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317", "match-at": "0.1.0", - "mattermost-redux": "mattermost/mattermost-redux#webapp-part4", + "mattermost-redux": "mattermost/mattermost-redux#webapp-3.9", "object-assign": "4.1.1", "pdfjs-dist": "1.7.363", "perfect-scrollbar": "0.6.16", |