From 5318227c378a9cd44baa4cc12dbb1935826c843b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 13 Mar 2019 13:29:34 +0100
Subject: afterStoreSetup: Move log in and theme load to afterStoreSetup.

---
 src/lib/persisted_state.js | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/lib/persisted_state.js')

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index e828a74b..7ab89c12 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -60,18 +60,6 @@ export default function createPersistedState ({
             merge({}, store.state, savedState)
           )
         }
-        if (store.state.config.customTheme) {
-          // This is a hack to deal with async loading of config.json and themes
-          // See: style_setter.js, setPreset()
-          window.themeLoaded = true
-          store.dispatch('setOption', {
-            name: 'customTheme',
-            value: store.state.config.customTheme
-          })
-        }
-        if (store.state.oauth.token) {
-          store.dispatch('loginUser', store.state.oauth.token)
-        }
         loaded = true
       } catch (e) {
         console.log("Couldn't load state")
-- 
cgit v1.2.3-70-g09d2


From 31d09931c8a2be1484a5023f0663e16549bc2e7d Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Fri, 22 Mar 2019 14:04:22 -0400
Subject: #450 - dispatch login after saved state is loaded

---
 src/lib/persisted_state.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib/persisted_state.js')

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 7ab89c12..720ff706 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -60,6 +60,9 @@ export default function createPersistedState ({
             merge({}, store.state, savedState)
           )
         }
+        if (store.state.oauth.token) {
+          store.dispatch('loginUser', store.state.oauth.token)
+        }
         loaded = true
       } catch (e) {
         console.log("Couldn't load state")
-- 
cgit v1.2.3-70-g09d2


From 2d05aef24b36d1c8be5cdad13ae69a2f0514c713 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Tue, 26 Mar 2019 14:26:26 -0700
Subject: Add await to login action'

---
 src/boot/after_store.js    | 2 +-
 src/lib/persisted_state.js | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/lib/persisted_state.js')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index f5e84cbc..f5add8ad 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -241,7 +241,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
 
   // Now we have the server settings and can try logging in
   if (store.state.oauth.token) {
-    store.dispatch('loginUser', store.state.oauth.token)
+    await store.dispatch('loginUser', store.state.oauth.token)
   }
 
   const router = new VueRouter({
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 720ff706..7ab89c12 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -60,9 +60,6 @@ export default function createPersistedState ({
             merge({}, store.state, savedState)
           )
         }
-        if (store.state.oauth.token) {
-          store.dispatch('loginUser', store.state.oauth.token)
-        }
         loaded = true
       } catch (e) {
         console.log("Couldn't load state")
-- 
cgit v1.2.3-70-g09d2


From 268e9ce5042cc89707204153b64f04f1c1b9e0e0 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Wed, 19 Jun 2019 23:11:39 -0400
Subject: make sure to clear old token when logout

---
 src/lib/persisted_state.js | 3 ++-
 src/modules/oauth.js       | 4 ++++
 src/modules/users.js       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/lib/persisted_state.js')

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 7ab89c12..cad7ea25 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -19,7 +19,8 @@ const saveImmedeatelyActions = [
   'setHighlight',
   'setOption',
   'setClientData',
-  'setToken'
+  'setToken',
+  'clearToken'
 ]
 
 const defaultStorage = (() => {
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