A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: refetch or clear queries that depend on the user on login/logout
aminnausinefa5d36fb53e
diff --git a/resources/js/components/cards/data/LibraryCard.vue b/resources/js/components/cards/data/LibraryCard.vueindex 025cf06e..5f84bd6b 100644--- a/resources/js/components/cards/data/LibraryCard.vue+++ b/resources/js/components/cards/data/LibraryCard.vue@@ -38,7 +38,7 @@ const handleSetDefaultFolder = async (newFolder: { value: number }) => {try {processing.value = true;await updateLibraryDefaultFolder(props.data.id, { default_folder_id: newFolder.value });- await queryClient.invalidateQueries({ queryKey: ['categories'] });+ await queryClient.invalidateQueries({ queryKey: ['auth-only', 'categories'] });toast.success(`Default folder set to ${defaultFolder.value?.title}`);} catch (error) {toast('Unable to set Default Folder', { type: 'danger', description: `${error}` });@@ -93,7 +93,7 @@ const handleToggleSetting = async (try {processing.value = true;await updateLibrarySettings(props.data.id, { [setting]: !currentValue });- await queryClient.invalidateQueries({ queryKey: ['categories'] });+ await queryClient.invalidateQueries({ queryKey: ['auth-only', 'categories'] });toast.success(successMessage(!currentValue));} catch (error) {toast('Failure', { type: 'danger', description: 'Unable to update library settings.' });diff --git a/resources/js/components/cards/data/LibraryFolderCard.vue b/resources/js/components/cards/data/LibraryFolderCard.vueindex 509256fc..8557b0d8 100644--- a/resources/js/components/cards/data/LibraryFolderCard.vue+++ b/resources/js/components/cards/data/LibraryFolderCard.vue@@ -38,7 +38,7 @@ const handleToggleDownloads = async (id: number, currentValue: boolean) => {processing.value = true;await setSeriesDownloadSettings(id, { downloads_enabled: !currentValue });- await queryClient.invalidateQueries({ queryKey: ['libraryFolders', stateLibraryId.value] });+ await queryClient.invalidateQueries({ queryKey: ['auth-only', 'libraryFolders', stateLibraryId.value] });toast.success(`${currentValue ? 'Disabled' : 'Enabled'} Folder Downloads.`);processing.value = false;diff --git a/resources/js/components/forms/LoginForm.vue b/resources/js/components/forms/LoginForm.vueindex 2f415f43..0de91a7a 100644--- a/resources/js/components/forms/LoginForm.vue+++ b/resources/js/components/forms/LoginForm.vue@@ -4,6 +4,7 @@ import type { FormField } from '@/types/types';import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';import { useRouter, useRoute, RouterLink } from 'vue-router';+import { resetUserDependantQueries } from '@/service/vue-query';import { useAuthStore } from '@/stores/AuthStore';import { storeToRefs } from 'pinia';import { ButtonForm } from '@/components/cedar-ui/button';@@ -40,6 +41,7 @@ const handleLogin = async () => {onSuccess: (response: { data: { user: UserResource } }) => {userData.value = response.data.user;useAuthStore().clearGuestToken();+ resetUserDependantQueries();router.push(route.query.redirect ? route.query.redirect.toString() : '/');},onError: () => form.reset('password'),diff --git a/resources/js/service/home/useHomeQueries.ts b/resources/js/service/home/useHomeQueries.tsindex 4605dc74..0a52ad31 100644--- a/resources/js/service/home/useHomeQueries.ts+++ b/resources/js/service/home/useHomeQueries.ts@@ -1,18 +1,22 @@import { getContinueWatching, getRecentlyAdded, getRecentlyReleased, getRecentlyUpdated, getRecentlyUploaded } from '@/service/home/homeAPI';import { useQuery } from '@tanstack/vue-query';+import { computed } from 'vue';+import { useAuth } from '@/composables/auth/useAuth';export const useContinueWatching = () => {+ const { isAuthenticated } = useAuth();return useQuery({- queryKey: ['home', 'continue-watching'],+ queryKey: ['auth', 'home', 'continue-watching'],queryFn: getContinueWatching,staleTime: 1000 * 30,retry: false,+ enabled: computed(() => !!isAuthenticated.value),});};export const useRecentlyReleased = () => {return useQuery({- queryKey: ['home', 'recently-released'],+ queryKey: ['auth', 'home', 'recently-released'],queryFn: getRecentlyReleased,staleTime: 1000 * 30,retry: false,@@ -21,7 +25,7 @@ export const useRecentlyReleased = () => {export const useRecentlyUpdated = () => {return useQuery({- queryKey: ['home', 'recently-updated'],+ queryKey: ['auth', 'home', 'recently-updated'],queryFn: getRecentlyUpdated,staleTime: 1000 * 30,retry: false,@@ -30,7 +34,7 @@ export const useRecentlyUpdated = () => {export const useRecentlyAdded = () => {return useQuery({- queryKey: ['home', 'recently-added'],+ queryKey: ['auth', 'home', 'recently-added'],queryFn: getRecentlyAdded,staleTime: 1000 * 30,retry: false,@@ -39,7 +43,7 @@ export const useRecentlyAdded = () => {export const useRecentlyUploaded = (mediaType?: 'video' | 'audio') => {return useQuery({- queryKey: ['home', ['recently-uploaded', mediaType].filter(Boolean).join('-')],+ queryKey: ['auth', 'home', ['recently-uploaded', mediaType].filter(Boolean).join('-')],queryFn: () => getRecentlyUploaded(mediaType),staleTime: 1000 * 30,retry: false,diff --git a/resources/js/service/queries.ts b/resources/js/service/queries.tsindex 6b63029e..98c228d3 100644--- a/resources/js/service/queries.ts+++ b/resources/js/service/queries.ts@@ -5,13 +5,13 @@ import type { Session } from '@/types/model';import type { Ref } from 'vue';import { getSiteAnalytics, getPulse, getUsers, getTasks, getTaskStats, getActiveSessions, getManifest, getTaskWaitTimes } from '@/service/siteAPI.ts';-import { useAuthStore } from '@/stores/AuthStore';-import { storeToRefs } from 'pinia';+import { getCategories, getFolders } from '@/service/mediaAPI.ts';import { getSessions } from '@/service/authAPI';import { useQuery } from '@tanstack/vue-query';import { computed } from 'vue';+import { useAuth } from '@/composables/auth/useAuth';-import mediaAPI, { getCategories, getFolders } from '@/service/mediaAPI.ts';+import mediaAPI from '@/service/mediaAPI.ts';export const useGetAllTags = () => {return useQuery({@@ -54,29 +54,34 @@ export const useGetSiteAnalytics = (period: Ref<string>) => {};export const useGetCategories = () => {+ const { isAuthenticated } = useAuth();return useQuery<CategoryResource[]>({- queryKey: ['categories'],+ queryKey: ['auth-only', 'categories'],queryFn: async () => {const { data: response } = await getCategories();return response;},retry: false,+ enabled: computed(() => !!isAuthenticated.value),});};export const useGetLibraryFolders = (id: Ref<number, number>) => {+ const { isAuthenticated } = useAuth();return useQuery<{ data: FolderResource[] }>({- queryKey: ['libraryFolders', id],+ queryKey: ['auth-only', 'libraryFolders', id],queryFn: async () => {if (id.value < 1) return { data: [] };const { data: response } = await getFolders(id.value);return response;},retry: false,+ enabled: computed(() => !!isAuthenticated.value),});};export const useGetUsers = () => {+ const { isAuthenticated } = useAuth();return useQuery<{ data: UserResource[] }>({queryKey: ['users'],queryFn: async () => {@@ -84,40 +89,45 @@ export const useGetUsers = () => {return response;},retry: false,+ enabled: computed(() => !!isAuthenticated.value),});};export const useGetTasks = () => {+ const { isAuthenticated, userData } = useAuth();return useQuery<{ data: TaskResource[] }>({queryKey: ['tasks'],queryFn: async () => {- const { userData } = storeToRefs(useAuthStore());-if (userData.value?.id !== 1) return { data: [] };const { data: response } = await getTasks();return response;},+ enabled: computed(() => !!isAuthenticated.value),});};export const useGetTaskStats = () => {+ const { isAuthenticated } = useAuth();return useQuery<{ data: TaskStatsResponse }>({queryKey: ['taskStats'],queryFn: async () => {const { data: response } = await getTaskStats();return response;},+ enabled: computed(() => !!isAuthenticated.value),});};export const useGetActiveSessions = () => {+ const { isAuthenticated } = useAuth();return useQuery<{ data: number }>({queryKey: ['activeSessions'],queryFn: async () => {const { data: response } = await getActiveSessions();return response;},+ enabled: computed(() => !!isAuthenticated.value),});};@@ -136,23 +146,25 @@ export const useGetManifest = () => {* @returns List of logged in sessions for the logged in user*/export const useGetSessions = () => {+ const { isAuthenticated } = useAuth();return useQuery<Session[]>({queryKey: ['sessions'],queryFn: async () => {const { data: response } = await getSessions();return response;},+ enabled: computed(() => !!isAuthenticated.value),});};export const useGetTaskWaitTimes = () => {- const { userData } = storeToRefs(useAuthStore());+ const { isAuthenticated } = useAuth();return useQuery<WaitTimesResponse>({queryKey: ['wait-times'],queryFn: async () => {const { data: response } = await getTaskWaitTimes();return response;},- enabled: computed(() => !!userData.value),+ enabled: computed(() => !!isAuthenticated.value),});};diff --git a/resources/js/service/vue-query.ts b/resources/js/service/vue-query.tsindex 33088693..3951f3ea 100644--- a/resources/js/service/vue-query.ts+++ b/resources/js/service/vue-query.ts@@ -23,3 +23,8 @@ export const queryClient = new QueryClient({},},});++export const resetUserDependantQueries = async () => {+ await queryClient.invalidateQueries({ queryKey: ['auth'] });+ queryClient.removeQueries({ queryKey: ['auth-only'] });+};diff --git a/resources/js/stores/ContentStore.ts b/resources/js/stores/ContentStore.tsindex 74e3ec50..1277e691 100644--- a/resources/js/stores/ContentStore.ts+++ b/resources/js/stores/ContentStore.ts@@ -2,12 +2,12 @@ import type { CategoryResource, FolderResource, MetadataResource, SeriesResourceimport type { SortCriteria, SortKey } from '@/service/sort/types';import { formatFileSize, toFormattedDuration } from '@/service/util';+import { resetUserDependantQueries } from '@/service/vue-query';import { computed, ref, watch } from 'vue';import { useRoute, useRouter } from 'vue-router';import { CompareStrategies } from '@/service/sort/strategies';import { sortObjectNew } from '@/service/sort/baseSort';import { toParamNumber } from '@/util/route';-import { queryClient } from '@/service/vue-query';import { defineStore } from 'pinia';import { MediaType } from '@/types/types';import { toast } from '@aminnausin/cedar-ui';@@ -353,7 +353,7 @@ export const useContentStore = defineStore('Content', () => {}function clearUserContentState() {- queryClient.clear();+ resetUserDependantQueries();stateFolder.value.videos.forEach((video) => {video.progress_offset = 0;video.progress_percentage = 0;