diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-23 17:08:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-23 17:08:25 -0400 |
commit | bf12e7e32cef427edacbd512d067c2bfd35d3b67 (patch) | |
tree | 0bdf8f79904527d013eaefc4ab6c859d06273c5e | |
parent | 964077eba3ac39126ea231fd227718e59cdab0f7 (diff) | |
download | chat-bf12e7e32cef427edacbd512d067c2bfd35d3b67.tar.gz chat-bf12e7e32cef427edacbd512d067c2bfd35d3b67.tar.bz2 chat-bf12e7e32cef427edacbd512d067c2bfd35d3b67.zip |
Load current user after loading client config (#6648)
-rw-r--r-- | webapp/actions/user_actions.jsx | 75 |
1 files changed, 31 insertions, 44 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index a1b0183bc..015c933bf 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -33,55 +33,42 @@ import {savePreferences, deletePreferences} from 'mattermost-redux/actions/prefe import {Preferences as PreferencesRedux} from 'mattermost-redux/constants'; -export function loadMe(callback) { - UserActions.loadMe()(dispatch, getState).then( - () => { - if (window.mm_config) { - loadCurrentLocale(); - } - - if (callback) { - callback(); - } +export function loadMe() { + return UserActions.loadMe()(dispatch, getState).then(() => { + if (window.mm_config) { + loadCurrentLocale(); } - ); + }); } export function loadMeAndConfig(callback) { - loadMe(() => { - getClientConfig()(store.dispatch, store.getState).then( - (config) => { - global.window.mm_config = config; - - if (global.window && global.window.analytics) { - global.window.analytics.identify(global.window.mm_config.DiagnosticId, {}, { - context: { - ip: '0.0.0.0' - }, - page: { - path: '', - referrer: '', - search: '', - title: '', - url: '' - }, - anonymousId: '00000000000000000000000000' - }); - } - - loadCurrentLocale(); - - getLicenseConfig()(store.dispatch, store.getState).then( - (license) => { // eslint-disable-line max-nested-callbacks - global.window.mm_license = license; + getClientConfig()(store.dispatch, store.getState).then((config) => { + global.window.mm_config = config; + + if (global.window && global.window.analytics) { + global.window.analytics.identify(global.window.mm_config.DiagnosticId, {}, { + context: { + ip: '0.0.0.0' + }, + page: { + path: '', + referrer: '', + search: '', + title: '', + url: '' + }, + anonymousId: '00000000000000000000000000' + }); + } - if (callback) { - callback(); - } - } - ); - } - ); + Promise.all([ + loadMe(), + getLicenseConfig()(store.dispatch, store.getState).then( + (license) => { + global.window.mm_license = license; + } + ) + ]).then(callback); }); } |