diff options
Diffstat (limited to 'webapp/actions/global_actions.jsx')
-rw-r--r-- | webapp/actions/global_actions.jsx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index f7c4c455c..a70462295 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -50,13 +50,13 @@ export function emitChannelClickEvent(channel) { AsyncClient.updateLastViewedAt(chan.id); loadPosts(chan.id); trackPage(); + }); - AppDispatcher.handleViewAction({ - type: ActionTypes.CLICK_CHANNEL, - name: chan.name, - id: chan.id, - prev: ChannelStore.getCurrentId() - }); + AppDispatcher.handleViewAction({ + type: ActionTypes.CLICK_CHANNEL, + name: chan.name, + id: chan.id, + prev: ChannelStore.getCurrentId() }); } @@ -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); } ); } |