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
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
f1a4c07383
Коммит
ca3211bc04
@@ -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();
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user