ami/tl-vikunja
1
0
Fork 0
Code Activity

Update dependency cypress to v7 (#453)

Browse Source 
Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/453
Co-authored-by: renovate <renovatebot@kolaente.de>
Co-committed-by: renovate <renovatebot@kolaente.de>
This commit is contained in:
renovate
2021-04-09 14:29:07 +00:00
committed by konrad
parent d315bb41a4
commit 7b0d2290fc
6 changed files with 115 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/store/modules/auth.js
View File

@ -18,9 +18,10 @@ export default {
state.info = info
if (info !== null) {
state.avatarUrl = info.getAvatarUrl()
}
if (info.settings) {
state.settings = info.settings
if (info.settings) {
state.settings = info.settings
}
}
},
setUserSettings(state, settings) {
@ -70,7 +71,6 @@ export default {
// Tell others the user is autheticated
ctx.commit('isLinkShareAuth', false)
console.log('login')
ctx.dispatch('checkAuth')
return Promise.resolve()
})
@ -81,12 +81,13 @@ export default {
return Promise.reject()
}
let errorMsg = e.response.data.message
let errorMsg = typeof e.response.data.message !== 'undefined' ? e.response.data.message : null
if (e.response.status === 401) {
errorMsg = 'Wrong username or password.'
}
ctx.commit(ERROR_MESSAGE, errorMsg, {root: true})
}
return Promise.reject()
})
.finally(() => {
@ -106,10 +107,11 @@ export default {
return ctx.dispatch('login', credentials)
})
.catch(e => {
if (e.response) {
if (e.response && e.response.data && e.response.data.message) {
ctx.commit(ERROR_MESSAGE, e.response.data.message, {root: true})
}
return Promise.reject()
return Promise.reject(e)
})
.finally(() => {
ctx.commit(LOADING, false, {root: true})
@ -137,7 +139,7 @@ export default {
})
.catch(e => {
if (e.response) {
let errorMsg = e.response.data.message
let errorMsg = typeof e.response.data.message !== 'undefined' ? e.response.data.message : null
if (e.response.status === 401) {
errorMsg = 'Wrong username or password.'
}