diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-14 13:48:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-14 13:48:28 -0500 |
commit | 814d2fc88d000c61b4430fa00cbadeb9674091c5 (patch) | |
tree | 23106db8d6a60e68e318be926d36dfedeb362de1 /webapp/actions/global_actions.jsx | |
parent | db0314053e0ac32a29e628a1389975d046a22edb (diff) | |
download | chat-814d2fc88d000c61b4430fa00cbadeb9674091c5.tar.gz chat-814d2fc88d000c61b4430fa00cbadeb9674091c5.tar.bz2 chat-814d2fc88d000c61b4430fa00cbadeb9674091c5.zip |
Fixed websocket to properly logout when logged out from another tab (#4546)
Diffstat (limited to 'webapp/actions/global_actions.jsx')
-rw-r--r-- | webapp/actions/global_actions.jsx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index bcd981df6..a70462295 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -461,21 +461,23 @@ export function emitRemoteUserTypingEvent(channelId, userId, postParentId) { }); } -export function emitUserLoggedOutEvent(redirectTo) { - const rURL = (redirectTo && typeof redirectTo === 'string') ? redirectTo : '/'; +export function emitUserLoggedOutEvent(redirectTo = '/', shouldSignalLogout = true) { Client.logout( () => { - BrowserStore.signalLogout(); + if (shouldSignalLogout) { + BrowserStore.signalLogout(); + } + BrowserStore.clear(); ErrorStore.clearLastError(); PreferenceStore.clear(); UserStore.clear(); TeamStore.clear(); newLocalizationSelected(global.window.mm_config.DefaultClientLocale); - browserHistory.push(rURL); + browserHistory.push(redirectTo); }, () => { - browserHistory.push(rURL); + browserHistory.push(redirectTo); } ); } |