diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-12-30 13:12:43 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-12-30 13:12:43 -0500 |
| commit | 2a91e5e031d9490f8364d55cb023d384d56f047f (patch) | |
| tree | 9d32b19ae22122d67e2395a3361d9d89650b7c53 /webapp/actions | |
| parent | 28a7a2f200270ea64c7169403d79244babf5595b (diff) | |
| download | chat-2a91e5e031d9490f8364d55cb023d384d56f047f.tar.gz chat-2a91e5e031d9490f8364d55cb023d384d56f047f.tar.bz2 chat-2a91e5e031d9490f8364d55cb023d384d56f047f.zip | |
Clean up /logout command flow and errors (#4918)
Diffstat (limited to 'webapp/actions')
| -rw-r--r-- | webapp/actions/global_actions.jsx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 5ee1e16a5..f1714def2 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -476,15 +476,7 @@ export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = tr BrowserStore.signalLogout(); } - BrowserStore.clear(); - ErrorStore.clearLastError(); - PreferenceStore.clear(); - UserStore.clear(); - TeamStore.clear(); - newLocalizationSelected(global.window.mm_config.DefaultClientLocale); - stopPeriodicStatusUpdates(); - WebsocketActions.close(); - browserHistory.push(redirectTo); + clientLogout(redirectTo); }, () => { browserHistory.push(redirectTo); @@ -492,6 +484,18 @@ export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = tr ); } +export function clientLogout(redirectTo = '/') { + BrowserStore.clear(); + ErrorStore.clearLastError(); + PreferenceStore.clear(); + UserStore.clear(); + TeamStore.clear(); + newLocalizationSelected(global.window.mm_config.DefaultClientLocale); + stopPeriodicStatusUpdates(); + WebsocketActions.close(); + browserHistory.push(redirectTo); +} + export function emitSearchMentionsEvent(user) { let terms = ''; if (user.notify_props && user.notify_props.mention_keys) { |