Skip to content

A self-hosted media server and file management system

fix: auth state is not loaded with app

aminnausin7c60b69f67a3
diff --git a/resources/js/App.vue b/resources/js/App.vue
index a3061e39..281a9442 100755
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,8 +1,9 @@
<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';
import { useAppStore } from '@/stores/AppStore';
import { RouterView } from 'vue-router';
@@ -15,19 +16,16 @@ 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();
onMounted(async () => {
initDarkMode();
initAmbientMode();
initPlaybackHeatmap();
initIsPlaylist();
- const screenSize = getScreenSize();
- if (screenSize === 'default') {
- toastPosition.value = 'top-center';
- } else {
- toastPosition.value = 'bottom-left';
- }
+ toastPosition.value = getScreenSize() === 'default' ? 'top-center' : 'bottom-left';
+ await fetchUser();
});
watch(ambientMode, setAmbientMode, { immediate: false });
diff --git a/resources/js/stores/AuthStore.ts b/resources/js/stores/AuthStore.ts
index 8371467d..469c79b0 100644
--- a/resources/js/stores/AuthStore.ts
+++ b/resources/js/stores/AuthStore.ts
@@ -11,7 +11,7 @@ export const useAuthStore = defineStore('Auth', () => {
const userData = ref<null | UserResource>(null);
const isLoadingUserData = ref<boolean>(false);
- const auth = async (): Promise<boolean> => {
+ const fetchUser = async (): Promise<boolean> => {
/*
Auth States:
@@ -59,23 +59,29 @@ export const useAuthStore = defineStore('Auth', () => {
description: 'Please log in again.',
});
- toast.add('Session Expired', { type: 'warning', description: `Please log in again.` });
clearAuthState();
isLoadingUserData.value = false;
return false;
}
};
- const clearAuthState = (): void => {
+ const clearAuthState = (showMessage: boolean = false, status = 401): void => {
userData.value = null;
isLoadingUserData.value = false;
localStorage.removeItem('auth-token');
+
+ if (!showMessage) return;
+ const message = status === 401 ? 'Session Expired' : `Authentication Failed (${status})`;
+
+ toast.warning(message, {
+ description: 'Please log in again.',
+ });
};
return {
userData,
isLoadingUserData,
- auth,
+ fetchUser,
clearAuthState,
};
});