From 1bf60bec7f40aab254703b8ce3a0134ca96743a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B8rn=20Antonsen?= <torbjant@ntnu.no>
Date: Fri, 26 Apr 2024 15:31:09 +0200
Subject: [PATCH] fixed issues with HomePagePopUp not working as expected
---
src/stores/token.ts | 24 +++++++++++++++++++-----
src/views/HomePage/HomePagePopUp.vue | 1 -
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/stores/token.ts b/src/stores/token.ts
index 029124b..d029e1e 100644
--- a/src/stores/token.ts
+++ b/src/stores/token.ts
@@ -52,8 +52,11 @@ export const useTokenStore = defineStore({
async refreshToken() {
try {
+ console.log("potetmos")
const response = await refreshToken(this.jwtToken);
+ console.log(response)
if (response !== undefined) {
+ console.log(response)
this.jwtToken = response.data;
this.displayPopUp = false;
this.startTimer();
@@ -67,21 +70,32 @@ export const useTokenStore = defineStore({
this.jwtToken = "";
this.username = null;
this.isConnectedToBank = null;
+ this.timerClear();
router.push("/login").then(r => r);
},
+ timerClear() {
+ if (this.timer) clearTimeout(this.timer)
+ if (this.tokenTimer) clearTimeout(this.tokenTimer)
+
+ },
+
startTimer() {
+ // Clear the existing timer if it's already set
+ this.timerClear()
+
+ // Set a new timer for displayPopUp after 10 seconds (10000 ms)
this.timer = setTimeout(() => {
- this.displayPopUp = true;
+ this.displayPopUp = true;
}, 300000);
- },
- actualTokenTimer() {
+ // Set a new timer for logout after 15 seconds (15000 ms)
this.tokenTimer = setTimeout(() => {
this.displayPopUp = false;
this.logout();
- }, 3600000);
- }
+ }, 360000);
+ },
+
},
getters: {
diff --git a/src/views/HomePage/HomePagePopUp.vue b/src/views/HomePage/HomePagePopUp.vue
index 8516959..37a0542 100644
--- a/src/views/HomePage/HomePagePopUp.vue
+++ b/src/views/HomePage/HomePagePopUp.vue
@@ -9,7 +9,6 @@ const emit = defineEmits(['close']);
const continueBrowse = () => {
useTokenStore().refreshToken();
- useTokenStore().actualTokenTimer();
emit('close');
};
--
GitLab