diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-05-12 09:12:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-12 09:12:55 -0400 |
commit | 1397798f1763b0848957a8672c8d40b6243764d5 (patch) | |
tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/actions/user_actions.jsx | |
parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
parent | 9d109b070037951fcd0832b785eba8a3db9a157c (diff) | |
download | chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2 chat-1397798f1763b0848957a8672c8d40b6243764d5.zip |
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/actions/user_actions.jsx')
-rw-r--r-- | webapp/actions/user_actions.jsx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index 377a11020..c8d848555 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -9,6 +9,7 @@ import UserStore from 'stores/user_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import {getChannelMembersForUserIds} from 'actions/channel_actions.jsx'; +import {loadCurrentLocale} from 'actions/global_actions.jsx'; import {loadStatusesForProfilesList, loadStatusesForProfilesMap} from 'actions/status_actions.jsx'; import {getDirectChannelName, getUserIdFromChannelName} from 'utils/utils.jsx'; @@ -51,6 +52,8 @@ import {getTeamMembersByIds, getMyTeamMembers} from 'mattermost-redux/actions/te export function loadMe(callback) { loadMeRedux()(dispatch, getState).then( () => { + loadCurrentLocale(); + if (callback) { callback(); } @@ -742,6 +745,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}); } } |