A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
chore: auth optimisations
aminnausinb0d48e8dd02b
diff --git a/resources/js/components/pinesUI/ToastController.vue b/resources/js/components/pinesUI/ToastController.vueindex 454b4925..885d4c3b 100755--- a/resources/js/components/pinesUI/ToastController.vue+++ b/resources/js/components/pinesUI/ToastController.vue@@ -272,7 +272,7 @@ watchEffect((onInvalidate) => {<ulv-cloakref="container"- :tabIndex="-1"+ :tabindex="-1":class="`fixed w-full ${TOAST_WIDTH ? `sm:w-[${TOAST_WIDTH}px]` : 'sm:max-w-sm'} group z-[500] [&>*]:px-4 [&>*]:px-[${mobileViewportOffset ?? viewportOffset}] [&>*]:sm:px-6 [&>*]:sm:px-[${viewportOffset}] my-4 sm:my-6 my-[${mobileViewportOffset ?? viewportOffset}] sm:my-[${viewportOffset}] ` +`${position == 'top-right' ? 'right-0 top-0' : ''} ` +diff --git a/resources/js/service/util.ts b/resources/js/service/util.tsindex f1a0b9b0..51a3d8c8 100644--- a/resources/js/service/util.ts+++ b/resources/js/service/util.ts@@ -1,4 +1,5 @@import type { SortDir } from '@/types/types';+import type { AxiosError } from 'axios';export function toTitleCase(str: string) {return str?.toLowerCase().replace(/(?:^|\s)\w/g, function (match) {@@ -245,3 +246,7 @@ export function sortObject<T>(column: keyof T, direction: SortDir = 1, dateColumreturn String(valueA).toLowerCase().replace(/\s+/g, ' ').localeCompare(String(valueB).toLowerCase().replace(/\s+/g, ' ')) * direction;};}++export function isAxiosError(error: unknown): error is AxiosError {+ return (error as AxiosError).isAxiosError === true;+}diff --git a/resources/js/stores/AuthStore.ts b/resources/js/stores/AuthStore.tsindex fb14ab42..8a538f4e 100644--- a/resources/js/stores/AuthStore.ts+++ b/resources/js/stores/AuthStore.ts@@ -1,15 +1,16 @@import type { UserResource } from '@/types/resources';+import { AxiosError, isAxiosError } from 'axios';import { authenticate } from '@/service/authAPI';import { defineStore } from 'pinia';-import { AxiosError } from 'axios';import { toast } from '@/service/toaster/toastService';import { ref } from 'vue';+// This code is not goodexport const useAuthStore = defineStore('Auth', () => {const userData = ref<null | UserResource>(null);- const auth = async () => {+ const auth = async (): Promise<boolean> => {/*Auth States:@@ -22,29 +23,45 @@ export const useAuthStore = defineStore('Auth', () => {if (!localStorage.getItem('auth-token')) return false; // console.log('no auth token');- if (userData.value === null && !localStorage.getItem('auth-token')) return false; // console.log('never logged in');+ if (userData.value === null && !localStorage.getItem('auth-token')) return false; // console.log('never logged in'); this is never triggered because x, and y after an if statement checking for y will never applytry {const localToken = localStorage.getItem('auth-token');++ if (!localToken) {+ clearAuthState();+ return false;+ }+const { data, status } = await authenticate(localToken);if (status !== 200) {// Auth request was denied (so local data is invalid) -> don't logout because that will be another 401 anyway- throw new AxiosError('Not Authenticated', status.toString()) ?? 'Unauthenticated';+ throw new AxiosError('Not Authenticated', status.toString());}userData.value = data.data.user;-return true;- } catch (error) {- console.log(error);+ } catch (error: unknown) {+ console.error('Authentication failed:', error);++ let message = 'Authentication Error';+ if (isAxiosError(error)) {+ message = error.response?.status === 401 ? 'Session Expired' : `Authentication Failed (${error.response?.status})`;+ }++ toast.add(message, {+ type: 'warning',+ description: 'Please log in again.',+ });+toast.add('Session Expired', { type: 'warning', description: `Please log in again.` });clearAuthState();return false;}};- const clearAuthState = () => {+ const clearAuthState = (): void => {userData.value = null;localStorage.removeItem('auth-token');};