diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/actions/global_actions.jsx | 12 | ||||
| -rw-r--r-- | webapp/components/logged_in.jsx | 4 |
2 files changed, 8 insertions, 8 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); } ); } diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index 4e7df0392..ec4ca2a6a 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -14,8 +14,6 @@ import {loadEmoji} from 'actions/emoji_actions.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; -import {browserHistory} from 'react-router/es6'; - const BACKSPACE_CHAR = 8; import $ from 'jquery'; @@ -41,7 +39,7 @@ export default class LoggedIn extends React.Component { } console.log('detected logout from a different tab'); //eslint-disable-line no-console - browserHistory.push('/'); + GlobalActions.emitUserLoggedOutEvent('/', false); } if (e.originalEvent.key === '__login__' && e.originalEvent.storageArea === localStorage && e.originalEvent.newValue) { |