diff options
| -rw-r--r-- | webapp/actions/user_actions.jsx | 12 | ||||
| -rw-r--r-- | webapp/components/mfa/components/confirm.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/signup/components/signup_email.jsx | 16 | ||||
| -rw-r--r-- | webapp/components/signup/components/signup_ldap.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/signup/signup_controller.jsx | 2 |
5 files changed, 10 insertions, 24 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index 5ebec3efb..20912b778 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -32,12 +32,12 @@ import {savePreferences as savePreferencesRedux, deletePreferences} from 'matter import {Preferences as PreferencesRedux} from 'mattermost-redux/constants'; -export function loadMe() { - return UserActions.loadMe()(dispatch, getState).then(() => { - if (window.mm_config) { - loadCurrentLocale(); - } - }); +export async function loadMe() { + await UserActions.loadMe()(dispatch, getState); + + if (window.mm_config) { + loadCurrentLocale(); + } } export function loadMeAndConfig(callback) { diff --git a/webapp/components/mfa/components/confirm.jsx b/webapp/components/mfa/components/confirm.jsx index 6ec99ef47..718632382 100644 --- a/webapp/components/mfa/components/confirm.jsx +++ b/webapp/components/mfa/components/confirm.jsx @@ -27,7 +27,7 @@ export default class Confirm extends React.Component { submit(e) { e.preventDefault(); - loadMe(() => { + loadMe().then(() => { browserHistory.push('/'); }); } diff --git a/webapp/components/signup/components/signup_email.jsx b/webapp/components/signup/components/signup_email.jsx index 6277fcce4..25d2c25bd 100644 --- a/webapp/components/signup/components/signup_email.jsx +++ b/webapp/components/signup/components/signup_email.jsx @@ -109,20 +109,6 @@ export default class SignupEmail extends React.Component { }; } - finishSignup() { - loadMe( - () => { - const query = this.props.location.query; - GlobalActions.loadDefaultLocale(); - if (query.redirect_to) { - browserHistory.push(query.redirect_to); - } else { - GlobalActions.redirectUserToDefaultTeam(); - } - } - ); - } - handleSignupSuccess(user, data) { trackEvent('signup', 'signup_user_02_complete'); loginById( @@ -134,7 +120,7 @@ export default class SignupEmail extends React.Component { BrowserStore.setGlobalItem(this.state.hash, JSON.stringify({usedBefore: true})); } - loadMe( + loadMe().then( () => { const query = this.props.location.query; if (query.redirect_to) { diff --git a/webapp/components/signup/components/signup_ldap.jsx b/webapp/components/signup/components/signup_ldap.jsx index 8320bf089..a7ab14b9b 100644 --- a/webapp/components/signup/components/signup_ldap.jsx +++ b/webapp/components/signup/components/signup_ldap.jsx @@ -99,7 +99,7 @@ export default class SignupLdap extends React.Component { } finishSignup() { - loadMe( + loadMe().then( () => { const query = this.props.location.query; GlobalActions.loadDefaultLocale(); diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx index ea6e69f0a..2fd775428 100644 --- a/webapp/components/signup/signup_controller.jsx +++ b/webapp/components/signup/signup_controller.jsx @@ -74,7 +74,7 @@ export default class SignupController extends React.Component { hash, inviteId, (team) => { - loadMe( + loadMe().then( () => { browserHistory.push('/' + team.name + '/channels/town-square'); } |