commit: 7abcb13ec08513ce41d97af13f442a262060ebae
parent: c6b909570a55741320685b46b1e719c5c274b514
Author: lambadalambda <gitgud@rogerbraun.net>
Date: Wed, 13 Sep 2017 04:47:03 -0400
Merge branch 'feature/login-with-cookie' into 'develop'
Try logging in with the existing cookie.
See merge request !116
Diffstat:
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
@@ -51,6 +51,9 @@ export default function createPersistedState ({
merge({}, store.state, savedState)
)
}
+ if (store.state.users.lastLoginName) {
+ store.dispatch('loginUser', {username: store.state.users.lastLoginName, password: 'xxx'})
+ }
loaded = true
} catch (e) {
console.log("Couldn't load state")
diff --git a/src/main.js b/src/main.js
@@ -38,8 +38,7 @@ const persistedStateOptions = {
'config.autoLoad',
'config.hoverPreview',
'config.muteWords',
- 'statuses.notifications',
- 'users.users'
+ 'users.lastLoginName'
]
}
diff --git a/src/modules/users.js b/src/modules/users.js
@@ -24,10 +24,12 @@ export const mutations = {
set(user, 'muted', muted)
},
setCurrentUser (state, user) {
+ state.lastLoginName = user.screen_name
state.currentUser = merge(state.currentUser || {}, user)
},
clearCurrentUser (state) {
state.currentUser = false
+ state.lastLoginName = false
},
beginLogin (state) {
state.loggingIn = true
@@ -44,6 +46,7 @@ export const mutations = {
}
export const defaultState = {
+ lastLoginName: false,
currentUser: false,
loggingIn: false,
users: [],