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/actions | |
| 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/actions')
| -rw-r--r-- | webapp/actions/global_actions.jsx | 2 | ||||
| -rw-r--r-- | webapp/actions/user_actions.jsx | 3 |
2 files changed, 1 insertions, 4 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; |