diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-05-04 16:36:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-04 16:36:31 -0400 |
commit | fe95276ba849bc7a520087369eea0aaff6c92358 (patch) | |
tree | 7eaa8cca5fdd2ab7d2839e474fe3e34f468fc7a3 /webapp | |
parent | 1838f6c25eb95a34f7fc5892e6896b3c3e2f3673 (diff) | |
download | chat-fe95276ba849bc7a520087369eea0aaff6c92358.tar.gz chat-fe95276ba849bc7a520087369eea0aaff6c92358.tar.bz2 chat-fe95276ba849bc7a520087369eea0aaff6c92358.zip |
PLT-6492 Use new cookie to determine if user is logged in (#6317)
* Use new cookie to determine if user is logged in
* Add temporary code for 3.9 to prevent forced re-login
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/actions/global_actions.jsx | 2 | ||||
-rw-r--r-- | webapp/actions/user_actions.jsx | 3 | ||||
-rw-r--r-- | webapp/root.jsx | 7 | ||||
-rw-r--r-- | webapp/store/index.js | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 8d3eddfd9..ed434fdc7 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -457,7 +457,7 @@ export function clientLogout(redirectTo = '/') { ChannelStore.clear(); stopPeriodicStatusUpdates(); WebsocketActions.close(); - localStorage.removeItem('currentUserId'); + document.cookie = 'MMUSERID=;expires=Thu, 01 Jan 1970 00:00:01 GMT;'; window.location.href = redirectTo; } diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index 8dfc819b9..377a11020 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -51,8 +51,6 @@ import {getTeamMembersByIds, getMyTeamMembers} from 'mattermost-redux/actions/te export function loadMe(callback) { loadMeRedux()(dispatch, getState).then( () => { - localStorage.setItem('currentUserId', UserStore.getCurrentId()); - if (callback) { callback(); } @@ -741,7 +739,6 @@ export function webLogin(loginId, password, token, success, error) { login(loginId, password, token)(dispatch, getState).then( (ok) => { if (ok && success) { - localStorage.setItem('currentUserId', UserStore.getCurrentId()); success(); } else if (!ok && error) { const serverError = getState().requests.users.login.error; diff --git a/webapp/root.jsx b/webapp/root.jsx index 03595f85c..94645b661 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -13,7 +13,6 @@ import PDFJS from 'pdfjs-dist'; import * as Websockets from 'actions/websocket_actions.jsx'; import {loadMeAndConfig} from 'actions/user_actions.jsx'; import ChannelStore from 'stores/channel_store.jsx'; -import UserStore from 'stores/user_store.jsx'; import * as I18n from 'i18n/i18n.jsx'; // Import our styles @@ -61,9 +60,7 @@ function preRenderSetup(callwhendone) { setUrl(window.location.origin); - const currentUserId = localStorage.getItem('currentUserId'); - - if (currentUserId) { + if (document.cookie.indexOf('MMUSERID=') > -1) { loadMeAndConfig(() => d1.resolve()); } else { getClientConfig()(store.dispatch, store.getState).then( @@ -85,7 +82,7 @@ function preRenderSetup(callwhendone) { () => { // Turn off to prevent getting stuck in a loop $(window).off('beforeunload'); - if (UserStore.getCurrentUser()) { + if (document.cookie.indexOf('MMUSERID=') > -1) { viewChannel('', ChannelStore.getCurrentId() || '')(dispatch, getState); } Websockets.close(); diff --git a/webapp/store/index.js b/webapp/store/index.js index 1af7127e8..521181f8c 100644 --- a/webapp/store/index.js +++ b/webapp/store/index.js @@ -77,6 +77,9 @@ export default function configureStore(initialState) { persistor.purge(); + document.cookie = 'MMUSERID=;expires=Thu, 01 Jan 1970 00:00:01 GMT;'; + window.location.href = '/'; + store.dispatch(batchActions([ { type: General.OFFLINE_STORE_RESET, @@ -84,9 +87,6 @@ export default function configureStore(initialState) { } ])); - localStorage.removeItem('currentUserId'); - window.location.href = '/'; - setTimeout(() => { purging = false; }, 500); |