A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix Auth Issues with new api files
aminnausin44c2ca1db23b
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.phpindex 4bd09646..6db50bc4 100644--- a/app/Http/Controllers/DirectoryController.php+++ b/app/Http/Controllers/DirectoryController.php@@ -64,7 +64,7 @@ class DirectoryController extends Controller$data = array('dir'=>array('id'=>null,'name'=>$dir,'folders'=>null),'folder'=>array('id'=>null, 'name'=>$folderName ?? null, 'videos'=>null)); // Default null valuesif(!isset($dirRaw->id)){ // Cannot find category so return default nulls- return $this->error(array('categoryName'=>$dir), 'Cannot find specified category', 500);+ return $this->error(array('categoryName'=>$dir), 'Cannot find specified category', 200);}$folderList = Folder::where('category_id', $dirRaw->id)->withCount(['videos']); // Folders in category@@ -72,7 +72,7 @@ class DirectoryController extends Controller$folderRaw = isset($request->folderName) ? $folderList->firstWhere('name', 'ilike', '%' . $folderName . '%') : $folderList->first(); // Folder in request ? search by name else select first in categoryif(!isset($folderRaw->id)){ // no folder found- return $this->error(array('categoryName'=>$dir,'folderName'=>$folderName), 'Cannot find folder in specified category', 500);+ return $this->error(array('categoryName'=>$dir,'folderName'=>$folderName), 'Cannot find folder in specified category', 200);}$videoList = VideoResource::collection( Video::where('folder_id', $folderRaw->id)->get());diff --git a/resources/js/App.vue b/resources/js/App.vueindex d6fb2d7a..18721e71 100644--- a/resources/js/App.vue+++ b/resources/js/App.vue@@ -3,14 +3,12 @@import {RouterView} from 'vue-router'import { storeToRefs } from 'pinia';import { useAppStore } from './stores/AppStore';- // import { getCSRF } from './service/auth';const appStore = useAppStore();const { lightMode } = storeToRefs( appStore );const { toggleDarkMode, initDarkMode } = appStore;onMounted(async () => {- // getCSRF();initDarkMode();});diff --git a/resources/js/router/index.js b/resources/js/router/index.jsindex 6da20633..4b2391f3 100644--- a/resources/js/router/index.js+++ b/resources/js/router/index.js@@ -7,7 +7,7 @@ import VideoView from '../views/VideoView.vue'import { createRouter, createWebHistory} from "vue-router";import { useAuthStore } from "../stores/AuthStore";import { storeToRefs } from "pinia";-import { logout } from "../service/auth";+import { logout } from "../service/authAPI";import { toTitleCase } from '../service/util';const router = createRouter({@@ -71,7 +71,7 @@ const router = createRouter({]})-router.beforeEach((to, from, next) => {+router.beforeEach(async (to, from, next) => {document.title = to.meta?.title ?? toTitleCase(to.name); // Update Page Titleif(!to.meta?.protected){ // Not protected route@@ -80,9 +80,9 @@ router.beforeEach((to, from, next) => {}const authStore = useAuthStore();- const { userData } = storeToRefs(authStore);-- if(userData.value){ // Logged in -> user and page is protected+ const { auth } = authStore;++ if( await auth() ){ // Logged in -> user and page is protectednext();return;}diff --git a/resources/js/service/api.js b/resources/js/service/api.jsindex ce2e17d1..65361709 100644--- a/resources/js/service/api.js+++ b/resources/js/service/api.js@@ -1,18 +1,31 @@import axios from "axios";-axios.defaults.withCredentials = true++const handleResponse = (response) => {+ return response;+}++const handleError = (error) => {+ // if the server throws an error (404, 500 etc.)+ return error.response;+}export const API = axios.create({baseURL: "/api",headers: {- "Accept": "application/json",+ Accept: "application/json","Content-Type": "application/json",},+ withCredentials: true,});export const WEB = axios.create({baseURL: "/",headers: {- "Accept": "application/json",+ Accept: "application/json","Content-Type": "application/json",},-})\ No newline at end of file+ withCredentials: true,+});++API.interceptors.response.use(handleResponse, handleError);+WEB.interceptors.response.use(handleResponse, handleError);diff --git a/resources/js/service/auth.js b/resources/js/service/authAPI.jssimilarity index 78%rename from resources/js/service/auth.jsrename to resources/js/service/authAPI.jsindex e595886e..cd1c8d41 100644--- a/resources/js/service/auth.js+++ b/resources/js/service/authAPI.js@@ -1,9 +1,8 @@// TODO: json from response does not include status code. Find a modular way to handle that-import axios from "axios";import { WEB, API } from './api';export const getCSRF = async () => {- return axios.get(`/sanctum/csrf-cookie`)+ return WEB.get(`/sanctum/csrf-cookie`)}export const login = async (credentials) => {@@ -36,4 +35,14 @@ export const logout = async () => {} catch (error) {return Promise.reject({error});}+}++export const authenticate = async (token) => {+ try {+ return await API.get('/auth', { headers: {+ Authorization: `bearer ${token}`+ }});+ } catch (error) {+ return Promise.reject({error});+ }}\ No newline at end of filediff --git a/resources/js/service/mediaAPI.js b/resources/js/service/mediaAPI.jsindex 3f259a88..249386ca 100644--- a/resources/js/service/mediaAPI.js+++ b/resources/js/service/mediaAPI.js@@ -8,7 +8,7 @@ import { API } from "./api"export default{getVideos(data) {- return API.post('/videos', data)+ return API.post('/videos', data);},getCategory(query) {return API.get(`/${query}`);diff --git a/resources/js/stores/AuthStore.js b/resources/js/stores/AuthStore.jsindex 87c93ad0..7ade44b7 100644--- a/resources/js/stores/AuthStore.js+++ b/resources/js/stores/AuthStore.js@@ -1,10 +1,9 @@import { ref } from "vue";import { defineStore } from "pinia";-import { logout } from "../service/auth";+import { authenticate } from "../service/authAPI";export const useAuthStore = defineStore('Auth', () => {const userData = ref(null);- const isAuth = ref(null);const user = ref(null);const auth = async () => {@@ -17,46 +16,32 @@ export const useAuthStore = defineStore('Auth', () => {4: State exists -> State is State (Logged in or out has already been checked)*/- if(!localStorage.getItem('auth-token')){- // console.log('no auth token');- return false;- }-- if(userData.value === null && !localStorage.getItem('auth-token')){- // console.log('never logged in');- return false;- }- if(isAuth.value) return true; //checked+ 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');try {const localToken = localStorage.getItem('auth-token');- const response = await fetch(`/api/auth`, {- method: 'get',- headers: {- 'Accept': 'application/json',- 'Content-Type': 'application/json',- 'Authorization': "Bearer " + localToken,- }- })-- if(response.status !== 200){- logout();- return false;+ const { data, error } = await authenticate(localToken)++ if(error){ // Auth request was denied (so local data is invalid) -> don't logout because that will be another 401 anyway+ throw error ?? 'Unauthenticated';}- const json = await response.json();-- isAuth.value = true;- // console.log(json);- userData.value = json.data.user;+ userData.value = data.data.user;return true;} catch (error) {console.log(error);- logout();+ clearAuthState();return false;}}++ const clearAuthState = () => {+ userData.value = null;+ localStorage.removeItem('auth-token');+ }return {user, userData, auth,diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex 5b3e3aa4..b4dfe8dd 100644--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -76,8 +76,7 @@ export const useContentStore = defineStore('Content', () => {}async function getCategory(URL_CATEGORY, URL_FOLDER) {- const { data, error } = await mediaAPI.getCategory(`/${URL_CATEGORY} ${URL_FOLDER ? '/' + URL_FOLDER : ''}`)-+ const { data, error } = await mediaAPI.getCategory(`${URL_CATEGORY}${URL_FOLDER ? '/' + URL_FOLDER : ''}`)if(error || !data?.success){// eslint-disable-next-line no-undeftoastr['error'](data?.message ?? 'Unable to load data.');diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vueindex bf2446bd..5860472c 100644--- a/resources/js/views/LoginView.vue+++ b/resources/js/views/LoginView.vue@@ -5,7 +5,7 @@import { useRouter, useRoute, RouterLink } from 'vue-router'import { useAuthStore } from '../stores/AuthStore'import { storeToRefs } from 'pinia';- import { login } from '../service/auth';+ import { login } from '../service/authAPI';import { ref } from 'vue';diff --git a/resources/js/views/RegisterView.vue b/resources/js/views/RegisterView.vueindex 17511bc3..06cbaf0f 100644--- a/resources/js/views/RegisterView.vue+++ b/resources/js/views/RegisterView.vue@@ -2,7 +2,7 @@import FormInputLabel from '../components/labels/FormInputLabel.vue';import FormInput from '../components/inputs/FormInput.vue';- import { register } from '../service/auth';+ import { register } from '../service/authAPI';import { useRouter, RouterLink} from 'vue-router'import { useAuthStore } from '../stores/AuthStore';import { storeToRefs } from 'pinia';