Renew token in authenticated component

src/App.vue

@@ -45,11 +45,6 @@ export default {
 		KeyboardShortcuts,
 		Notification,
 	},
-	data() {
-		return {
-			currentDate: new Date(),
-		}
-	},
 	beforeMount() {
 		// Check if the user is offline, show a message then
 		this.$store.commit(ONLINE, navigator.onLine)
@@ -93,33 +88,7 @@ export default {
 			this.$router.push({name: 'home'})
 		}
 
-		// Try renewing the token every time vikunja is loaded initially
+		this.renewTokenOnFocus()
-		// (When opening the browser the focus event is not fired)
-		this.$store.dispatch('auth/renewToken')
-
-		// Check if the token is still valid if the window gets focus again to maybe renew it
-		window.addEventListener('focus', () => {
-
-			if (!this.userAuthenticated) {
-				return
-			}
-
-			const expiresIn = this.userInfo.exp - +new Date() / 1000
-
-			// If the token expiry is negative, it is already expired and we have no choice but to redirect
-			// the user to the login page
-			if (expiresIn < 0) {
-				this.$store.dispatch('auth/checkAuth')
-				this.$router.push({name: 'user.login'})
-				return
-			}
-
-			// Check if the token is valid for less than 60 hours and renew if thats the case
-			if (expiresIn < 60 * 3600) {
-				this.$store.dispatch('auth/renewToken')
-				console.log('renewed token')
-			}
-		})
 	},
 	computed: {
 		authUser() {

src/components/home/contentAuth.vue

@@ -42,6 +42,9 @@ export default {
 	watch: {
 		'$route': 'doStuffAfterRoute',
 	},
+	created() {
+		this.renewTokenOnFocus()
+	},
 	computed: mapState({
 		fullpage: IS_FULLPAGE,
 		namespaces(state) {
@@ -74,6 +77,31 @@ export default {
 				this.$store.commit(CURRENT_LIST, {})
 			}
 		},
+		renewTokenOnFocus() {
+			// Try renewing the token every time vikunja is loaded initially
+			// (When opening the browser the focus event is not fired)
+			this.$store.dispatch('auth/renewToken')
+
+			// Check if the token is still valid if the window gets focus again to maybe renew it
+			window.addEventListener('focus', () => {
+
+				const expiresIn = this.userInfo.exp - +new Date() / 1000
+
+				// If the token expiry is negative, it is already expired and we have no choice but to redirect
+				// the user to the login page
+				if (expiresIn < 0) {
+					this.$store.dispatch('auth/checkAuth')
+					this.$router.push({name: 'user.login'})
+					return
+				}
+
+				// Check if the token is valid for less than 60 hours and renew if thats the case
+				if (expiresIn < 60 * 3600) {
+					this.$store.dispatch('auth/renewToken')
+					console.debug('renewed token')
+				}
+			})
+		},
 	},
 }
 </script>