local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only renew user token on tab focus events

Browse source
This commit is contained in:
kolaente 2020-06-12 20:02:32 +02:00
parent cd98b41bec
commit dc29604f94
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
1 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/App.vue
View file

@ -131,23 +131,35 @@
<div class="spinner" :class="{ 'is-loading': namespaceService.loading}"></div> <div class="spinner" :class="{ 'is-loading': namespaceService.loading}"></div>
<template v-for="n in namespaces"> <template v-for="n in namespaces">
<div :key="n.id"> <div :key="n.id">
<router-link v-tooltip.right="'Settings'" <router-link
:to="{name: 'editNamespace', params: {id: n.id} }" class="nsettings" v-tooltip.right="'Settings'"
:to="{name: 'editNamespace', params: {id: n.id} }"
class="nsettings"
v-if="n.id > 0"> v-if="n.id > 0">
<span class="icon"> <span class="icon">
<icon icon="cog"/> <icon icon="cog"/>
</span> </span>
</router-link> </router-link>
<router-link v-tooltip="'Add a new list in the ' + n.title + ' namespace'" <router-link
:to="{ name: 'newList', params: { id: n.id} }" class="nsettings" v-tooltip="'Add a new list in the ' + n.title + ' namespace'"
:key="n.id + 'newList'" v-if="n.id > 0"> :to="{ name: 'newList', params: { id: n.id} }"
class="nsettings"
:key="n.id + 'newList'"
v-if="n.id > 0">
<span class="icon"> <span class="icon">
<icon icon="plus"/> <icon icon="plus"/>
</span> </span>
</router-link> </router-link>
<label class="menu-label" v-tooltip="n.title + ' (' + n.lists.length + ')'" :for="n.id + 'checker'"> <label
class="menu-label"
v-tooltip="n.title + ' (' + n.lists.length + ')'"
:for="n.id + 'checker'">
<span class="name"> <span class="name">
<span class="color-bubble" v-if="n.hexColor !== ''" :style="{ backgroundColor: n.hexColor }"></span> <span
class="color-bubble"
v-if="n.hexColor !== ''"
:style="{ backgroundColor: n.hexColor }">
</span>
{{n.title}} ({{n.lists.length}}) {{n.title}} ({{n.lists.length}})
</span> </span>
<span class="is-archived" v-if="n.isArchived"> <span class="is-archived" v-if="n.isArchived">
@ -155,13 +167,24 @@
</span> </span>
</label> </label>
</div> </div>
<input :key="n.id + 'checker'" type="checkbox" checked="checked" :id="n.id + 'checker'" class="checkinput"/> <input
:key="n.id + 'checker'"
type="checkbox"
checked="checked"
:id="n.id + 'checker'"
class="checkinput"/>
<div class="more-container" :key="n.id + 'child'"> <div class="more-container" :key="n.id + 'child'">
<ul class="menu-list can-be-hidden" > <ul class="menu-list can-be-hidden">
<li v-for="l in n.lists" :key="l.id"> <li v-for="l in n.lists" :key="l.id">
<router-link :to="{ name: 'list.index', params: { listId: l.id} }" :class="{'router-link-exact-active': currentList.id === l.id}"> <router-link
:to="{ name: 'list.index', params: { listId: l.id} }"
:class="{'router-link-exact-active': currentList.id === l.id}">
<span class="name"> <span class="name">
<span class="color-bubble" v-if="l.hexColor !== ''" :style="{ backgroundColor: l.hexColor }"></span> <span
class="color-bubble"
v-if="l.hexColor !== ''"
:style="{ backgroundColor: l.hexColor }">
</span>
{{l.title}} {{l.title}}
</span> </span>
<span class="is-archived" v-if="l.isArchived"> <span class="is-archived" v-if="l.isArchived">
@ -325,10 +348,18 @@
} }
); );
// Schedule a token renew every minute // Try renewing the token every time vikunja is loaded initially
setTimeout(() => { // (When opening the browser the focus event is not fired)
this.$store.dispatch('auth/renewToken') this.$store.dispatch('auth/renewToken')
}, 1000 * 60)
// Check if the token is still valid if the window gets focus again to maybe renew it
window.addEventListener('focus', () => {
// Check if the token is valid for less than 60 hours and renew if thats the case
if (this.userInfo.exp - +new Date() / 1000 < 60 * 3600) {
this.$store.dispatch('auth/renewToken')
console.log('renewed token')
}
})
}, },
watch: { watch: {
// call the method again if the route changes // call the method again if the route changes