From 4ec30b37f882d926d5cf425491cdea1465127299 Mon Sep 17 00:00:00 2001
From: Andrew Lalis <andrewlalisofficial@gmail.com>
Date: Wed, 29 Mar 2023 09:28:34 +0200
Subject: [PATCH] Cleaned up auth logic and fixed interval for token
 refreshing.

---
 gymboard-app/src/api/main/auth.ts     | 21 ++++++++++++++------
 gymboard-app/src/stores/auth-store.ts | 28 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/gymboard-app/src/api/main/auth.ts b/gymboard-app/src/api/main/auth.ts
index 8d0a024..141f80a 100644
--- a/gymboard-app/src/api/main/auth.ts
+++ b/gymboard-app/src/api/main/auth.ts
@@ -1,8 +1,8 @@
 import { api } from 'src/api/main/index';
-import {AuthStoreType, useAuthStore} from 'stores/auth-store';
+import {AuthStoreType} from 'stores/auth-store';
 import Timeout = NodeJS.Timeout;
 import { WeightUnit } from 'src/api/main/submission';
-import {Page, PaginationOptions, toQueryParams} from "src/api/main/models";
+import {Page, PaginationOptions, toQueryParams} from 'src/api/main/models';
 
 export interface User {
   id: string;
@@ -91,14 +91,14 @@ class AuthModule {
     authStore.roles = roles;
 
     clearTimeout(this.tokenRefreshTimer);
-    this.tokenRefreshTimer = setTimeout(
+    this.tokenRefreshTimer = setInterval(
       () => this.refreshToken(authStore),
       AuthModule.TOKEN_REFRESH_INTERVAL_MS
     );
   }
 
   public logout(authStore: AuthStoreType) {
-    authStore.$reset();
+    authStore.logOut();
     clearTimeout(this.tokenRefreshTimer);
   }
 
@@ -118,8 +118,17 @@ class AuthModule {
   }
 
   public async refreshToken(authStore: AuthStoreType) {
-    const response = await api.get('/auth/token', authStore.axiosConfig);
-    authStore.token = response.data.token;
+    try {
+      const response = await api.get('/auth/token', authStore.axiosConfig);
+      authStore.token = response.data.token;
+    } catch (error: any) {
+      authStore.logOut();
+      if (error.response) {
+        console.warn('Failed to refresh token: ', error.response);
+      } else {
+        console.error(error);
+      }
+    }
   }
 
   public async getMyUser(authStore: AuthStoreType): Promise<User> {
diff --git a/gymboard-app/src/stores/auth-store.ts b/gymboard-app/src/stores/auth-store.ts
index 1a379d7..32ab93d 100644
--- a/gymboard-app/src/stores/auth-store.ts
+++ b/gymboard-app/src/stores/auth-store.ts
@@ -43,6 +43,34 @@ export const useAuthStore = defineStore('authStore', {
     },
     isAdmin: state => state.roles.indexOf('admin') !== -1,
   },
+  actions: {
+    /**
+     * Logs a user into the application.
+     * @param user The user who was logged in.
+     * @param token The token that was obtained.
+     * @param roles The list of the user's roles.
+     */
+    logIn(user: User, token: string, roles: string[]) {
+      this.user = user;
+      this.token = token;
+      this.roles = roles;
+    },
+    /**
+     * Logs a user out of the application, resetting the auth state.
+     */
+    logOut() {
+      this.user = null;
+      this.token = null;
+      this.roles = [];
+    },
+    /**
+     * Updates the token that's stored for the currently authenticated user.
+     * @param token The new token.
+     */
+    updateToken(token: string) {
+      this.token = token;
+    }
+  }
 });
 
 export type AuthStoreType = ReturnType<typeof useAuthStore>;