From 268e9ce5042cc89707204153b64f04f1c1b9e0e0 Mon Sep 17 00:00:00 2001 From: taehoon Date: Wed, 19 Jun 2019 23:11:39 -0400 Subject: make sure to clear old token when logout --- src/modules/oauth.js | 4 ++++ src/modules/users.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/oauth.js b/src/modules/oauth.js index 11cb10fe..b7755b64 100644 --- a/src/modules/oauth.js +++ b/src/modules/oauth.js @@ -22,6 +22,10 @@ const oauth = { }, setToken (state, token) { state.userToken = token + }, + clearToken (state) { + state.userToken = false + state.token = false } }, getters: { diff --git a/src/modules/users.js b/src/modules/users.js index 22340271..1e0b16f5 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -399,7 +399,7 @@ const users = { logout (store) { store.commit('clearCurrentUser') store.dispatch('disconnectFromChat') - store.commit('setToken', false) + store.commit('clearToken') store.dispatch('stopFetching', 'friends') store.commit('setBackendInteractor', backendInteractorService(store.getters.getToken())) store.dispatch('stopFetching', 'notifications') -- cgit v1.2.3-70-g09d2 From c23228f1967547e7df1462efa7b3bcc1a9a96319 Mon Sep 17 00:00:00 2001 From: taehoon Date: Wed, 19 Jun 2019 23:12:25 -0400 Subject: fix error breaking logout flow --- src/modules/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/chat.js b/src/modules/chat.js index 2804e577..4d8d6699 100644 --- a/src/modules/chat.js +++ b/src/modules/chat.js @@ -21,7 +21,7 @@ const chat = { }, actions: { disconnectFromChat (store) { - store.state.socket.disconnect() + store.state.socket && store.state.socket.disconnect() }, initializeChat (store, socket) { const channel = socket.channel('chat:public') -- cgit v1.2.3-70-g09d2 From bd377148ade7aaf26652dc14ee77683b7e6c8c5a Mon Sep 17 00:00:00 2001 From: taehoon Date: Thu, 20 Jun 2019 11:47:33 -0400 Subject: delete state.token instead of setting false --- src/modules/oauth.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/oauth.js b/src/modules/oauth.js index b7755b64..a2a83450 100644 --- a/src/modules/oauth.js +++ b/src/modules/oauth.js @@ -1,3 +1,5 @@ +import { delete as del } from 'vue' + const oauth = { state: { clientId: false, @@ -25,7 +27,9 @@ const oauth = { }, clearToken (state) { state.userToken = false - state.token = false + // state.token is userToken with older name, coming from persistent state + // let's clear it as well, since it is being used as a fallback of state.userToken + del(state, 'token') } }, getters: { -- cgit v1.2.3-70-g09d2