From fe95276ba849bc7a520087369eea0aaff6c92358 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 4 May 2017 16:36:31 -0400
Subject: 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
---
 webapp/actions/global_actions.jsx | 2 +-
 webapp/actions/user_actions.jsx   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'webapp/actions')

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;
-- 
cgit v1.2.3-1-g7c22