Skip to content

A self-hosted media server and file management system

fix: attempt at reducing auth requests and error logs on log out

aminnausinbd7be60248bd
diff --git a/resources/js/App.vue b/resources/js/App.vue
index f9ee336d..ad99c35a 100755
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { ToastPostion } from '@/types/pinesTypes';
-import { onMounted, ref, watch } from 'vue';
+import { onMounted, onUnmounted, ref, watch } from 'vue';
import { getScreenSize } from '@/service/util';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
@@ -16,7 +16,11 @@ const toastPosition = ref<ToastPostion>();
const { toggleDarkMode, initDarkMode, initAmbientMode, initPlaybackHeatmap, initIsPlaylist, setAmbientMode, setPlaybackHeatmap, setIsPlaylist } = useAppStore();
const { lightMode, ambientMode, playbackHeatmap, contextMenuItems, contextMenuStyle, contextMenuItemStyle, isPlaylist } = storeToRefs(useAppStore());
-const { fetchUser } = useAuthStore();
+
+async function loadUser() {
+ const authStore = useAuthStore();
+ await authStore.fetchUser();
+}
onMounted(async () => {
initDarkMode();
@@ -25,7 +29,13 @@ onMounted(async () => {
initIsPlaylist();
toastPosition.value = getScreenSize() === 'default' ? 'top-center' : 'bottom-left';
- await fetchUser();
+ loadUser();
+
+ window.addEventListener('focus', loadUser);
+});
+
+onUnmounted(() => {
+ window.removeEventListener('focus', loadUser);
});
watch(ambientMode, setAmbientMode, { immediate: false });
diff --git a/resources/js/router/index.ts b/resources/js/router/index.ts
index fc88346b..2aa0a90d 100644
--- a/resources/js/router/index.ts
+++ b/resources/js/router/index.ts
@@ -68,29 +68,30 @@ export const router = createRouter({
path: '/logout',
name: 'logout',
beforeEnter: async (to, from, next) => {
- try {
- const { clearAuthState } = useAuthStore();
- const meta = from.meta as { title?: string; protected?: boolean };
-
- let nextPath = from.fullPath;
- let nextTitle = meta?.title ?? toTitleCase(`${from.name?.toString()}`);
- await logout();
- clearAuthState();
+ const authStore = useAuthStore();
+ const meta = from.meta as { title?: string; protected?: boolean };
- if (meta?.protected || from.name === 'logout') {
- nextPath = '/';
- nextTitle = 'Home';
+ let nextPath = from.fullPath;
+ let nextTitle = meta?.title ?? toTitleCase(`${from.name?.toString()}`);
+ try {
+ if (authStore.userData) {
+ await logout(); // call API only if session is thought to be valid
}
+ } catch (error: any) {
+ if (error?.response?.status !== 419 && error?.response?.status !== 401) {
+ toast.error(`Unable to logout.`);
+ console.error(error);
+ }
+ }
+ authStore.clearAuthState();
- document.title = nextTitle;
- next(nextPath);
- } catch (error) {
- toast.error(`Unable to logout.`);
- console.log(error);
-
- document.title = 'Home'; // Update Page Title
- next('/');
+ if (meta?.protected || from.name === 'logout') {
+ nextPath = '/';
+ nextTitle = 'Home';
}
+
+ document.title = nextTitle;
+ next(nextPath);
},
component: {
render: () => 'div',
@@ -168,8 +169,7 @@ export const router = createRouter({
const redirectAfterLogin = async (to: RouteLocationNormalizedGeneric, next: NavigationGuardNext, meta: RouteMeta) => {
const authStore = useAuthStore();
-
- if (await authStore.fetchUser()) {
+ if (authStore.userData || (await authStore.fetchUser())) {
// Logged in -> user and page is protected
next();
return;
diff --git a/resources/js/service/api.ts b/resources/js/service/api.ts
index 6e62a5b7..164633a8 100644
--- a/resources/js/service/api.ts
+++ b/resources/js/service/api.ts
@@ -16,36 +16,32 @@ const handleError = async (error: AxiosError<{ message?: string }>) => {
clearTimeout(progressTimeout);
nProgress.done(true);
- const auth = useAuthStore();
const message = error.response?.data?.message ?? error.message;
+
+ const auth = useAuthStore();
const status = error.response?.status ?? 0;
// if the server throws an error (404, 500 etc.)
const knownError = [403, 422, 500, 404, 502, 401, 419].includes(status);
- const showToast = !error.config?.headers?.['X-Skip-Toast'];
const isSessionExpired = status === 419;
const isAuthError = status === 401;
+ const showToast = !error.config?.headers?.['X-Skip-Toast'];
- if (showToast) {
- toast('Error', { type: 'danger', description: message });
- }
+ // Handle expired auth token and session timeout (CSRF token expired)
+ if ((isAuthError || isSessionExpired) && auth.userData) {
+ const router = (await import('@/router')).router;
- // Handle session timeout (CSRF token expired)
- if (isSessionExpired && auth.userData) {
- import('@/router/index').then(({ router }) => {
- if (router.currentRoute.value.name !== 'logout') {
- router.push('/logout');
- }
- });
- error.message = `Session Expired: ${message}`;
- throw error;
- }
+ const currentRoute = router.currentRoute.value;
+
+ auth.clearAuthState(true, status);
- // Handle expired auth token
- if (isAuthError && auth.userData) {
- auth.clearAuthState(true);
- error.message = `Not logged in: ${message}`;
- throw error;
+ if (!!currentRoute.meta?.protected) {
+ router.replace({ path: '/' });
+ }
+
+ error.message = `Session Expired: ${message}`;
+ } else if (showToast && !isAuthError) {
+ toast.error('Error', { description: message });
}
if (!knownError) {
diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.ts
index 6489000a..00c075a5 100644
--- a/resources/js/service/queries.ts
+++ b/resources/js/service/queries.ts
@@ -9,6 +9,7 @@ import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
import { getSessions } from '@/service/authAPI';
import { useQuery } from '@tanstack/vue-query';
+import { computed } from 'vue';
import mediaAPI, { getCategories, getFolders } from '@/service/mediaAPI.ts';
@@ -142,11 +143,13 @@ export const useGetSessions = () => {
};
export const useGetTaskWaitTimes = () => {
+ const { userData } = storeToRefs(useAuthStore());
return useQuery<WaitTimesResponse>({
queryKey: ['wait-times'],
queryFn: async () => {
const { data: response } = await getTaskWaitTimes();
return response;
},
+ enabled: computed(() => !!userData.value),
});
};