diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-02-02 09:31:00 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-02-02 09:31:00 -0500 |
commit | ca3211bc04f6dea34e8168217182637d1419f998 (patch) | |
tree | a3d47d510ea562083bc4370e0b4fd9ab9e2befb4 /webapp/actions/user_actions.jsx | |
parent | f1a4c0738301f50b6a9e8bd635fbcc172decb199 (diff) | |
download | chat-ca3211bc04f6dea34e8168217182637d1419f998.tar.gz chat-ca3211bc04f6dea34e8168217182637d1419f998.tar.bz2 chat-ca3211bc04f6dea34e8168217182637d1419f998.zip |
PLT-5328 Fixing signup screen (#5247)
* Fixing signup screen not forwarding properly
* Fixing team id not forwarding from invite link if only LDAP is enabled
Diffstat (limited to 'webapp/actions/user_actions.jsx')
-rw-r--r-- | webapp/actions/user_actions.jsx | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index 55b143d34..94777bc45 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -4,12 +4,10 @@ import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; -import BrowserStore from 'stores/browser_store.jsx'; import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; -import * as GlobalActions from 'actions/global_actions.jsx'; import {getChannelMembersForUserIds} from 'actions/channel_actions.jsx'; import {loadStatusesForProfilesList, loadStatusesForProfilesMap} from 'actions/status_actions.jsx'; @@ -637,28 +635,12 @@ export function resendVerification(email, success, error) { ); } -export function loginById(userId, password, mfaToken, hash, success, error) { +export function loginById(userId, password, mfaToken, success, error) { Client.loginById( userId, password, mfaToken, - hash, () => { - if (hash > 0) { - BrowserStore.setGlobalItem(hash, JSON.stringify({usedBefore: true})); - } - - GlobalActions.emitInitialLoad( - () => { - const query = this.props.location.query; - if (query.redirect_to) { - browserHistory.push(query.redirect_to); - } else { - GlobalActions.redirectUserToDefaultTeam(); - } - } - ); - if (success) { success(); } |