A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
add axios util and update auth to use axios only. Fixes logout maybe :). Removes need for @csrf
aminnausin8375f5613d76
diff --git a/resources/js/router/index.js b/resources/js/router/index.jsindex 0917f458..6da20633 100644--- a/resources/js/router/index.js+++ b/resources/js/router/index.js@@ -32,8 +32,9 @@ const router = createRouter({path:'/logout',name:'logout',component: {- async beforeRouteEnter() {+ async beforeRouteEnter(from) {try {+ const destination = from.fullPath === '/logout' ? '/' : (from?.meta.protected ? '/' : from.fullPath);const authStore = useAuthStore();const { userData } = storeToRefs(authStore);@@ -41,14 +42,13 @@ const router = createRouter({localStorage.clear('auth-token');userData.value = null;- window.location.href = "/";+ router.push(destination);} catch (error) {+ // eslint-disable-next-line no-undeftoastr['error']('Unable to logout');console.log(error);router.push('/');}-- // router.push('/test');}}},@@ -72,9 +72,9 @@ const router = createRouter({})router.beforeEach((to, from, next) => {- document.title = to.meta?.title ?? toTitleCase(to.name);+ document.title = to.meta?.title ?? toTitleCase(to.name); // Update Page Title- if(!to.meta?.protected){+ if(!to.meta?.protected){ // Not protected routenext();return;}@@ -82,20 +82,19 @@ router.beforeEach((to, from, next) => {const authStore = useAuthStore();const { userData } = storeToRefs(authStore);- // Check if user is authenticated (has user data) if path is protected-- if (!userData.value && to.path !== '/login' && to.path !== '/register') {- next({- name: 'login',- query: {- redirect: to.fullPath,- }- });-+ if(userData.value){ // Logged in -> user and page is protected+ next();return;}- next()+ // Not logged in -> no user and page is protected++ next({+ name: 'login',+ query: {+ redirect: to.fullPath,+ }+ });})export default router;\ No newline at end of filediff --git a/resources/js/service/api.js b/resources/js/service/api.jsindex 671cf41d..ce2e17d1 100644--- a/resources/js/service/api.js+++ b/resources/js/service/api.js@@ -1,6 +1,7 @@import axios from "axios";+axios.defaults.withCredentials = true-const API = axios.create({+export const API = axios.create({baseURL: "/api",headers: {"Accept": "application/json",@@ -8,10 +9,10 @@ const API = axios.create({},});-export function apiGET(url) {- return API.get(url);-}--export function apiPost(url, data) {- return API.post(url, data);-}\ No newline at end of file+export const WEB = axios.create({+ baseURL: "/",+ headers: {+ "Accept": "application/json",+ "Content-Type": "application/json",+ },+})\ No newline at end of filediff --git a/resources/js/service/auth.js b/resources/js/service/auth.jsindex ebe75919..8ce1e39f 100644--- a/resources/js/service/auth.js+++ b/resources/js/service/auth.js@@ -1,19 +1,18 @@// 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`)+}export const login = async (credentials) => {try {- const response = await fetch(`/api/login`, {- method: 'post',- headers: {- 'Accept': 'application/json',- 'Content-Type': 'application/json'- },- body: JSON.stringify({- ...credentials- })- })- const json = await response.json();- return Promise.resolve({response: json});+ await WEB.get(`/sanctum/csrf-cookie`);++ const response = await API.post('/login', credentials);+ const { data } = response;+ return Promise.resolve({response: data});} catch (error) {return Promise.reject({error});}@@ -21,18 +20,19 @@ export const login = async (credentials) => {export const register = async (credentials) => {try {- const response = await fetch(`/api/register`, {- method: 'post',- headers: {- 'Accept': 'application/json',- 'Content-Type': 'application/json'- },- body: JSON.stringify({- ...credentials- })- })- const json = await response.json();- return Promise.resolve({response: json});+ // const response = await fetch(`/api/register`, {+ // method: 'post',+ // headers: {+ // 'Accept': 'application/json',+ // 'Content-Type': 'application/json'+ // },+ // body: JSON.stringify({+ // ...credentials+ // })+ // })+ const response = await API.post('/register', credentials)+ const { data } = response;+ return Promise.resolve({response: data});} catch (error) {return Promise.reject({error});}@@ -40,19 +40,20 @@ export const register = async (credentials) => {export const logout = async () => {try {- const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');+ // const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');// const localToken = localStorage.getItem('auth-token');- const response = await fetch(`/api/logout`, {- method: 'delete',- headers: {- 'Accept': 'application/json',- 'Content-Type': 'application/json',- 'X-CSRF-TOKEN': csrfToken- // 'Authorization': "Bearer " + localToken,- }- })- const json = await response.json();- return Promise.resolve({response: json});+ // const response = await fetch(`/api/logout`, {+ // method: 'delete',+ // headers: {+ // 'Accept': 'application/json',+ // 'Content-Type': 'application/json',+ // 'X-CSRF-TOKEN': csrfToken+ // // 'Authorization': "Bearer " + localToken,+ // }+ // })+ const response = await API.delete('/logout');+ const { data } = response;+ return Promise.resolve({response: data});} catch (error) {return Promise.reject({error});}diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.phpindex d4260d88..0313e1d6 100644--- a/resources/views/layouts/app.blade.php+++ b/resources/views/layouts/app.blade.php@@ -4,7 +4,7 @@<head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">- <meta name="csrf-token" content="{{ csrf_token() }}">+ <!-- <meta name="csrf-token" content="{{ csrf_token() }}"> --><title>{{ config('app.name', 'Laravel') }}</title>