A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: delete account, sign out of other sessions and page height consistencies
aminnausinc31fa509f15f
diff --git a/app/Http/Controllers/Api/V1/ProfileController.php b/app/Http/Controllers/Api/V1/ProfileController.phpindex 12c170fe..39790e50 100644--- a/app/Http/Controllers/Api/V1/ProfileController.php+++ b/app/Http/Controllers/Api/V1/ProfileController.php@@ -47,7 +47,7 @@ class ProfileController extends Controller {$user = $request->user();- Auth::logout();+ Auth::guard("web")->logout();$user->delete();diff --git a/app/Http/Controllers/Api/V1/SessionController.php b/app/Http/Controllers/Api/V1/SessionController.phpindex 8f124038..52656c96 100644--- a/app/Http/Controllers/Api/V1/SessionController.php+++ b/app/Http/Controllers/Api/V1/SessionController.php@@ -7,6 +7,7 @@ use Illuminate\Http\Request;use Illuminate\Support\Carbon;use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Hash;class SessionController extends Controller {public function index(Request $request) {@@ -28,12 +29,16 @@ class SessionController extends Controller {return response()->json($sessions);}- public function delete(Request $request) {+ public function destroyOthers(Request $request) {$validated = $request->validate(['password' => ['required', 'current_password'],]);- Auth::logoutOtherDevices($validated['password']);+ $user = $request->user();+ $user->forceFill([+ 'password' => Hash::make($validated['password']),+ ])->save();+ // This is not compatible with Sanctum or something -> Auth::logoutOtherDevices($validated['password']);return response()->noContent();}diff --git a/resources/js/components/forms/PasswordConfirm.vue b/resources/js/components/forms/PasswordConfirm.vuenew file mode 100644index 00000000..3b3fb089--- /dev/null+++ b/resources/js/components/forms/PasswordConfirm.vue@@ -0,0 +1,83 @@+<script setup lang="ts">+import type { PasswordRequest } from '@/types/requests';+import type { AxiosResponse } from 'axios';+import type { FormField } from '@/types/types';++import { toast } from '@/service/toaster/toastService';++import FormInputLabel from '@/components/labels/FormInputLabel.vue';+import FormErrorList from '@/components/labels/FormErrorList.vue';+import ButtonForm from '@/components/inputs/ButtonForm.vue';+import FormInput from '@/components/inputs/FormInput.vue';+import BaseForm from '@/components/forms/BaseForm.vue';+import FormItem from '@/components/forms/FormItem.vue';+import useForm from '@/composables/useForm';++const emit = defineEmits(['confirm', 'cancel']);++const props = withDefaults(+ defineProps<{+ action: (fields: PasswordRequest) => Promise<AxiosResponse<any>>;+ successAction?: (response: AxiosResponse<any>) => void;+ successMessage?: string;+ confirmText?: string;+ cancelText?: string;+ passwordLabel?: string;+ }>(),+ {+ confirmText: 'Confirm',+ cancelText: 'Cancel',+ },+);++const fields: FormField[] = [+ {+ name: 'password',+ text: 'Confirm Password',+ placeholder: 'Password',+ autocomplete: 'current-password',+ ariaAutocomplete: 'inline',+ type: 'password',+ required: true,+ max: 255,+ },+];++const form = useForm<PasswordRequest>({+ password: '',+});++const handleSubmit = async () => {+ form.submit(+ async (fields) => {+ return props.action(fields);+ },+ {+ onSuccess: (response) => {+ if (props.successMessage) toast.success(props.successMessage);+ if (props.successAction) props.successAction(response);+ emit('confirm');+ },+ onError() {+ form.reset('password');+ },+ },+ );+};+</script>+<template>+ <BaseForm @submit.prevent="handleSubmit" :footer-class="`flex flex-col-reverse sm:flex-row sm:justify-end gap-2 text-sm`">+ <FormItem v-for="(field, index) in fields" :key="index">+ <FormInputLabel v-if="passwordLabel" :field="{ ...field, text: passwordLabel }" />+ <FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" />+ <FormErrorList :errors="form.errors" :field-name="field.name" />+ </FormItem>++ <template #footer>+ <ButtonForm variant="reset" type="button" :disabled="form.processing" class="!capitalize" @click="$emit('cancel')">{{ cancelText }}</ButtonForm>+ <ButtonForm variant="submit" type="button" @click="handleSubmit" :disabled="form.processing" class="!capitalize !bg-rose-600 hover:!bg-rose-500">+ {{ confirmText }}+ </ButtonForm>+ </template>+ </BaseForm>+</template>diff --git a/resources/js/components/labels/FormErrorList.vue b/resources/js/components/labels/FormErrorList.vueindex 0ffd8407..fbc4a4e8 100644--- a/resources/js/components/labels/FormErrorList.vue+++ b/resources/js/components/labels/FormErrorList.vue@@ -3,7 +3,7 @@ defineProps<{ errors: Record<string, any>; fieldName?: string }>();</script><template>- <ul class="text-rose-600 dark:text-rose-500" v-if="fieldName ? !!errors[fieldName] : Object.keys(errors).length > 0">+ <ul class="text-rose-600 dark:text-rose-500 text-sm" v-if="fieldName ? !!errors[fieldName] : Object.keys(errors).length > 0"><slot><li v-for="(item, index) in fieldName ? errors[fieldName] : errors" :key="index">{{ item }}</li></slot>diff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/pinesUI/ModalBase.vueindex daff17c9..e71587d6 100755--- a/resources/js/components/pinesUI/ModalBase.vue+++ b/resources/js/components/pinesUI/ModalBase.vue@@ -10,12 +10,11 @@ import ButtonForm from '@/components/inputs/ButtonForm.vue';const props = withDefaults(defineProps<{modalData: any;- action?: () => void;+ action?: () => Promise<void>;useControls?: boolean;isProcessing?: boolean;}>(),{- action: () => {},useControls: true,isProcessing: false,},@@ -25,13 +24,15 @@ const { setScrollLock } = useAppStore();const title = useTemplateRef('modalTitle');const processing = ref(false);-const submitModal = async (action: any, modalData: any) => {+const submitModal = async () => {processing.value = true;- await action();+ await props.action?.();processing.value = false;- modalData.toggleModal(false);+ closeModal();};+const closeModal = () => props.modalData.toggleModal(false);+watch(() => props.modalData.isAnimating,(value) => {@@ -61,31 +62,35 @@ watch(</Transition><Transitionenter-active-class="ease-out duration-300"- enter-from-class="opacity-0 -translate-y-2 sm:scale-95"- enter-to-class="opacity-100 translate-y-0 sm:scale-100"+ enter-from-class="opacity-0 sm:scale-95"+ enter-to-class="opacity-100 sm:scale-100"leave-active-class="ease-in duration-200"- leave-from-class="opacity-100 translate-y-0 sm:scale-100"- leave-to-class="opacity-0 -translate-y-2 sm:scale-95"+ leave-from-class="opacity-100 sm:scale-100"+ leave-to-class="opacity-0 sm:scale-95"><UseFocusTrap v-if="modalData.modalOpen" class="relative w-full px-6 py-10 sm:py-6 max-h-screen h-full overflow-y-scroll scrollbar-hide flex items-center"><OnClickOutside- @trigger="modalData.toggleModal(false)"- @keydown.esc="modalData.toggleModal(false)"+ @trigger="closeModal"+ @keydown.esc="closeModal"class="gap-4 flex flex-col drop-shadow-md m-auto w-full p-6 bg-white dark:bg-neutral-800/90 backdrop-blur-lg border shadow-lg border-neutral-200 dark:border-neutral-700 sm:max-w-lg xl:max-w-xl 3xl:max-w-2xl rounded-md sm:rounded-lg"tabindex="-1"+ role="dialog"+ aria-modal="true"+ aria-labelledby="modalTitle"+ aria-describedby="modalDescription"><section class="flex flex-wrap gap-2 items-center">- <h3 ref="modalTitle" class="text-xl font-semibold scroll-mt-16 sm:scroll-mt-12 flex-1">{{ modalData?.title ?? 'Modal Title' }}</h3>- <ButtonCorner @click="modalData.toggleModal(false)" class="!m-0 !static" />- <p class="text-neutral-500 dark:text-neutral-400 text-sm w-full" v-if="$slots.description">+ <h3 ref="modalTitle" id="modalTitle" class="text-xl font-semibold scroll-mt-16 sm:scroll-mt-12 flex-1">{{ modalData?.title ?? 'Modal Title' }}</h3>+ <ButtonCorner @click="closeModal" class="!m-0 !static" />+ <p class="text-neutral-500 dark:text-neutral-400 text-sm w-full" v-if="$slots.description" id="modalDescription"><slot name="description"> </slot></p></section><slot name="content"> </slot><slot v-if="useControls" name="controls"><section class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2">- <ButtonForm type="button" variant="reset" @click="modalData.toggleModal(false)" :disabled="processing || isProcessing"> Cancel </ButtonForm>- <ButtonForm type="button" variant="submit" @click="submitModal(action, modalData)" :disabled="processing || isProcessing">+ <ButtonForm type="button" variant="reset" @click="closeModal" :disabled="processing || isProcessing"> Cancel </ButtonForm>+ <ButtonForm type="button" variant="submit" @click="submitModal()" :disabled="processing || isProcessing">{{ modalData.submitText }}</ButtonForm></section>diff --git a/resources/js/components/settings/account/SettingsDeleteAccount.vue b/resources/js/components/settings/account/SettingsDeleteAccount.vueindex 97505a46..5a724a02 100644--- a/resources/js/components/settings/account/SettingsDeleteAccount.vue+++ b/resources/js/components/settings/account/SettingsDeleteAccount.vue@@ -1,7 +1,16 @@<script setup lang="ts">+import { deleteAccount } from '@/service/authAPI';+import { useRouter } from 'vue-router';++import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';import SettingsHeader from '@/components/settings/SettingsHeader.vue';import SettingsCard from '@/components/cards/SettingsCard.vue';import ButtonForm from '@/components/inputs/ButtonForm.vue';+import ModalBase from '@/components/pinesUI/ModalBase.vue';+import useModal from '@/composables/useModal';++const confirmModal = useModal({ title: 'Are you sure you want to delete your account?', submitText: 'Confim' });+const router = useRouter();</script><template>@@ -15,9 +24,36 @@ import ButtonForm from '@/components/inputs/ButtonForm.vue';<!-- Other Browser Sessions --><section class="flex flex-col gap-4 w-full max-w-xl mt-auto"><div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 w-full">- <ButtonForm variant="submit" class="bg-rose-600 hover:bg-rose-700 dark:hover:bg-rose-500" title="Not Implemented Yet">Delete Account</ButtonForm>+ <ButtonForm+ variant="submit"+ class="bg-rose-600 hover:bg-rose-700 dark:hover:bg-rose-500"+ title="Delete your account permanently"+ @click="confirmModal.toggleModal()"+ >+ Delete Account+ </ButtonForm></div></section></template></SettingsCard>++ <ModalBase :modalData="confirmModal" :useControls="false">+ <template #description>+ Once your account is deleted, all of its resources and data will also be permanently deleted. Please enter your password to confirm you would like to permanently delete+ your account.+ </template>+ <template #content>+ <PasswordConfirm+ :action="deleteAccount"+ @cancel="confirmModal.toggleModal()"+ :success-action="+ () => {+ confirmModal.toggleModal();+ router.push('/');+ }+ "+ success-message="Account Deleted..."+ />+ </template>+ </ModalBase></template>diff --git a/resources/js/components/settings/account/SettingsSessions.vue b/resources/js/components/settings/account/SettingsSessions.vueindex 12a135da..330c77af 100644--- a/resources/js/components/settings/account/SettingsSessions.vue+++ b/resources/js/components/settings/account/SettingsSessions.vue@@ -9,6 +9,14 @@ import ButtonForm from '@/components/inputs/ButtonForm.vue';import SvgSpinners90RingWithBg from '~icons/svg-spinners/90-ring-with-bg';+import { signOutOtherSessions } from '@/service/authAPI';++import PasswordConfirm from '@/components/forms/PasswordConfirm.vue';+import ModalBase from '@/components/pinesUI/ModalBase.vue';+import useModal from '@/composables/useModal';++const confirmModal = useModal({ title: 'Sign Out of Other Devices', submitText: 'Confim' });+const { stateSessions, isLoadingSessions } = storeToRefs(useSettingsStore());</script>@@ -36,9 +44,21 @@ const { stateSessions, isLoadingSessions } = storeToRefs(useSettingsStore());<SessionCard v-for="(session, index) in stateSessions" :key="index" :session="session" class="flex items-center" /></div><div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 w-full">- <ButtonForm variant="submit" :disabled="true" title="Not Implemented Yet">Log Out Other Sessions</ButtonForm>+ <ButtonForm variant="submit" title="Not Implemented Yet" @click="confirmModal.toggleModal()">Log Out Other Sessions</ButtonForm></div></section></template></SettingsCard>++ <ModalBase :modalData="confirmModal" :useControls="false">+ <template #description>Are you sure you want to sign out of other devices? You won't be able to undo this action. </template>+ <template #content>+ <PasswordConfirm+ :action="signOutOtherSessions"+ success-message="Other Sessions Logged Out Successfully"+ @cancel="confirmModal.toggleModal()"+ @confirm="confirmModal.toggleModal()"+ />+ </template>+ </ModalBase></template>diff --git a/resources/js/service/authAPI.ts b/resources/js/service/authAPI.tsindex b4b97b57..c0a8747d 100644--- a/resources/js/service/authAPI.ts+++ b/resources/js/service/authAPI.ts@@ -1,5 +1,6 @@-import type { ChangeEmailRequest, ChangePasswordRequest } from '@/types/requests';-import { WEB, API } from './api';+import type { ChangeEmailRequest, ChangePasswordRequest, PasswordRequest } from '@/types/requests';++import { WEB, API } from '@/service/api';export const getCSRF = async () => {return WEB.get(`/sanctum/csrf-cookie`);@@ -65,3 +66,15 @@ export function changeEmail(data: ChangeEmailRequest) {export function getSessions() {return API.get('/settings/sessions');}++export function signOutOtherSessions(data: PasswordRequest) {+ return API.delete('/settings/sessions', {+ data,+ });+}++export function deleteAccount(data: PasswordRequest) {+ return API.delete('/settings/account', {+ data,+ });+}diff --git a/resources/js/types/requests.ts b/resources/js/types/requests.tsindex e1789f7b..ac04e8f7 100644--- a/resources/js/types/requests.ts+++ b/resources/js/types/requests.ts@@ -54,3 +54,7 @@ export interface ChangeEmailRequest {export interface RecordStoreRequest {video_id: number;}++export interface PasswordRequest {+ password: string;+}diff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vueindex 5b247952..db1ca2fb 100644--- a/resources/js/views/DashboardView.vue+++ b/resources/js/views/DashboardView.vue@@ -103,7 +103,7 @@ watch(<template><LayoutBase><template v-slot:content>- <section id="content-dashboard" class="min-h-[80vh] text-sm">+ <section id="content-dashboard" class="min-h-[80vh] 3xl:min-h-[60vh] text-sm"><DashboardAnalytics v-if="dashboardTab?.name == 'overview'" /><DashboardLibraries v-if="dashboardTab?.name == 'libraries'" /><DashboardActivity v-if="dashboardTab?.name == 'activity'" />diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vueindex 9bec79d5..ba647d00 100755--- a/resources/js/views/HistoryView.vue+++ b/resources/js/views/HistoryView.vue@@ -93,7 +93,7 @@ onMounted(() => {<template><LayoutBase><template v-slot:content>- <section id="content-history" class="space-y-2 min-h-[80vh]">+ <section id="content-history" class="space-y-2 min-h-[80vh] 3xl:min-h-[60vh]"><TableBase:data="filteredRecords":row="RecordCardDetails"diff --git a/resources/js/views/SettingsView.vue b/resources/js/views/SettingsView.vueindex 843a9d4a..830ee7ea 100755--- a/resources/js/views/SettingsView.vue+++ b/resources/js/views/SettingsView.vue@@ -84,7 +84,7 @@ watch(<template><LayoutBase><template v-slot:content>- <section id="content-settings" class="min-h-[80vh] text-sm flex flex-col gap-6">+ <section id="content-settings" class="min-h-[80vh] 3xl:min-h-[60vh] text-sm flex flex-col gap-6"><SettingsPreferences v-if="settingsTab?.name == 'preferences'" /><SettingsAccount v-if="settingsTab?.name == 'account'" /></section>@@ -137,7 +137,7 @@ watch(<CircumGrid31 class="ml-auto w-6 h-6" /></template><template #body>- <h4 title="App Version" class="w-full text-wrap truncate sm:text-nowrap flex-1">Server Data and Analytics</h4>+ <h4 title="App Dashboard" class="w-full text-wrap truncate sm:text-nowrap flex-1">Server Analytics</h4></template></SidebarCard></section>diff --git a/resources/js/views/SetupView.vue b/resources/js/views/SetupView.vueindex 92df196b..68942d99 100644--- a/resources/js/views/SetupView.vue+++ b/resources/js/views/SetupView.vue@@ -18,7 +18,7 @@ onMounted(() => {<template><LayoutBase><template v-slot:content>- <section id="content-settings" class="flex flex-col gap-4 [&>*]:space-y-1 space-y-2 min-h-[80vh]">+ <section id="content-settings" class="flex flex-col gap-4 [&>*]:space-y-1 space-y-2 min-h-[80vh] 3xl:min-h-[60vh]"><h2>Before you can start watching your media, you must complete these setup steps</h2><ul class="text-sm flex flex-col gap-2"><li class="flex flex-wrap gap-1 items-center">diff --git a/routes/api.php b/routes/api.phpindex f0fb2f5a..fdce9903 100755--- a/routes/api.php+++ b/routes/api.php@@ -37,6 +37,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {Route::delete('/logout', [AuthController::class, 'destroy']); // NewRoute::prefix('settings')->group(function () {+ Route::delete('/sessions', [SessionController::class, 'destroyOthers'])->name('sessions.destroyOthers');+ Route::delete('/account', [ProfileController::class, 'destroy'])->name('account.destroy');Route::get('/sessions', [SessionController::class, 'index'])->name('sessions.list');Route::put('/password', [PasswordController::class, 'update'])->name('password.update');Route::put('/email', [EmailController::class, 'update'])->name('email.update');