ami/tl-vikunja
1
0
Fork 0
Code Activity

Use the same method everywhere to calculate the avatar url

Browse Source
This commit is contained in:
kolaente
2020-02-09 13:28:33 +01:00
parent 783401723a
commit 05da96e545
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/auth/index.js
View File

@ -1,5 +1,6 @@
import {HTTP} from '../http-common'
import router from '../router'
import UserModel from '../models/user'
// const API_URL = 'http://localhost:8082/api/v1/'
// const LOGIN_URL = 'http://localhost:8082/login'
@ -106,9 +107,8 @@ export default {
this.getUserInfos()
this.user.authenticated = false
if (jwt) {
let infos = this.user.infos
let ts = Math.round((new Date()).getTime() / 1000)
if (infos.exp >= ts) {
if (this.user.infos.exp >= ts) {
this.user.authenticated = true
}
}
@ -117,8 +117,8 @@ export default {
getUserInfos() {
let jwt = localStorage.getItem('token')
if (jwt) {
this.user.infos = this.parseJwt(localStorage.getItem('token'))
return this.parseJwt(localStorage.getItem('token'))
this.user.infos = new UserModel(this.parseJwt(localStorage.getItem('token')))
return this.user.infos
} else {
return {}
}