A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: password reset
aminnausind31d6e671885
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex 15a4d83a..bd75d73d 100755--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -4,6 +4,7 @@ namespace App\Providers;use App\Models\User;use GuzzleHttp\Client;+use Illuminate\Auth\Notifications\ResetPassword;use Illuminate\Support\Facades\Gate;use Illuminate\Support\ServiceProvider;use Laravel\Pulse\Facades\Pulse;@@ -30,7 +31,7 @@ class AppServiceProvider extends ServiceProvider {*/public function boot(): void {//- Pulse::user(fn ($user) => [+ Pulse::user(fn($user) => ['name' => $user->name,'extra' => $user->email,]);@@ -45,5 +46,11 @@ class AppServiceProvider extends ServiceProvider {1,]);});++ ResetPassword::createUrlUsing(function (User $user, string $token) {+ $email = urlencode($user->getEmailForPasswordReset());++ return url("/reset-password/{$token}?email={$email}");+ });}}diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vueindex 279bc636..058908d7 100644--- a/resources/js/components/forms/RecoveryForm.vue+++ b/resources/js/components/forms/RecoveryForm.vue@@ -39,13 +39,14 @@ const handleSubmit = async () => {</script><template><BaseForm @submit.prevent="handleSubmit">+ {{ form.processing }}<FormItem v-for="(field, index) in fields" :key="index"><FormInputLabel :field="field" /><FormInput v-model="form.fields[field.name]" :field="field" class="!mt-0" /><FormErrorList :errors="form.errors" :field-name="field.name" /></FormItem>- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="!justify-center !capitalize"> Email password reset link </ButtonForm>+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="!justify-center !capitalize">Email password reset link</ButtonForm></BaseForm><span class="mx-auto text-gray-600 dark:text-gray-400">Or, return todiff --git a/resources/js/components/forms/ResetPassword.vue b/resources/js/components/forms/ResetPassword.vueindex 279bc636..2f8c8f1c 100644--- a/resources/js/components/forms/ResetPassword.vue+++ b/resources/js/components/forms/ResetPassword.vue@@ -1,8 +1,8 @@<script setup lang="ts">import type { FormField } from '@/types/types';-import { recoverAccount } from '@/service/authAPI';-import { RouterLink } from 'vue-router';+import { useRoute, useRouter } from 'vue-router';+import { recoverAccount, resetPassword } from '@/service/authAPI';import { toast } from '@/service/toaster/toastService';import { ref } from 'vue';@@ -14,21 +14,53 @@ import BaseForm from '@/components/forms/BaseForm.vue';import FormItem from '@/components/forms/FormItem.vue';import useForm from '@/composables/useForm';-const fields = ref<FormField[]>([{ name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'email', placeholder: '[email protected]' }]);+const router = useRouter();+const route = useRoute();-const form = useForm<{ email: string }>({- email: '',+const fields = ref<FormField[]>([+ {+ name: 'email',+ text: 'Email',+ type: 'text',+ required: true,+ autocomplete: 'email',+ placeholder: '[email protected]',+ },+ {+ name: 'password',+ text: `New Password`,+ placeholder: `New Password`,+ autocomplete: 'new-password',+ type: 'password',+ required: true,+ max: 255,+ },+ {+ name: 'password_confirmation',+ text: `Confirm Password`,+ placeholder: `Confirm Password`,+ type: 'password',+ required: true,+ max: 255,+ },+]);++const form = useForm({+ email: route.query.email as string,+ token: route.params.token as string,+ password: '',+ password_confirmation: '',});const handleSubmit = async () => {form.submit(async (fields) => {- return recoverAccount(fields);+ return resetPassword(fields);},{onSuccess: (response) => {- toast.success('A reset link will be sent if the account exists.');- form.reset('email');+ toast.success('Your password has been reset.');+ router.push('/login');},onError() {form.reset('email');@@ -45,15 +77,6 @@ const handleSubmit = async () => {<FormErrorList :errors="form.errors" :field-name="field.name" /></FormItem>- <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="!justify-center !capitalize"> Email password reset link </ButtonForm>+ <ButtonForm variant="auth" type="button" @click="handleSubmit" :disabled="form.processing" class="!justify-center !capitalize">Reset Password</ButtonForm></BaseForm>- <span class="mx-auto text-gray-600 dark:text-gray-400">- Or, return to- <RouterLink- class="underline hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"- to="/login"- >- log in- </RouterLink>- </span></template>diff --git a/resources/js/router/index.ts b/resources/js/router/index.tsindex 9c1b2708..be19b3c3 100644--- a/resources/js/router/index.ts+++ b/resources/js/router/index.ts@@ -7,6 +7,7 @@ import { storeToRefs } from 'pinia';import { logout } from '@/service/authAPI';import { toast } from '@/service/toaster/toastService';+import ResetPasswordView from '@/views/ResetPasswordView.vue';import DashboardView from '@/views/DashboardView.vue';import RegisterView from '@/views/RegisterView.vue';import SettingsView from '@/views/SettingsView.vue';@@ -17,8 +18,8 @@ import LoginView from '@/views/LoginView.vue';import VideoView from '@/views/VideoView.vue';import ErrorView from '@/views/ErrorView.vue';import SetupView from '@/views/SetupView.vue';-import RootView from '@/views/RootView.vue';import nProgress from 'nprogress';+import RootView from '@/views/RootView.vue';interface RouteMeta {title?: string;@@ -58,6 +59,12 @@ const router = createRouter({component: RegisterView,meta: { guestOnly: true },},+ {+ path: '/reset-password/:token',+ name: 'reset-password',+ component: ResetPasswordView,+ meta: { guestOnly: true },+ },{path: '/logout',name: 'logout',diff --git a/resources/js/service/authAPI.ts b/resources/js/service/authAPI.tsindex 1c2e92bc..b4b97b57 100644--- a/resources/js/service/authAPI.ts+++ b/resources/js/service/authAPI.ts@@ -19,6 +19,10 @@ export function recoverAccount(credentials: { email: string }) {return API.post('/recovery', credentials);}+export function resetPassword(credentials: { token: string; email: string; password: string; password_confirmation: string }) {+ return API.post(`/reset-password/${credentials.token}`, credentials);+}+export const register = async (credentials: any) => {try {const response = await API.post('/register', credentials);diff --git a/resources/js/views/ResetPasswordView.vue b/resources/js/views/ResetPasswordView.vuenew file mode 100644index 00000000..bb8d40e0--- /dev/null+++ b/resources/js/views/ResetPasswordView.vue@@ -0,0 +1,15 @@+<script setup lang="ts">+import ResetPassword from '@/components/forms/ResetPassword.vue';+import AuthHeader from '@/components/headers/AuthHeader.vue';+import LayoutAuth from '@/layouts/LayoutAuth.vue';+import AuthCard from '@/components/cards/AuthCard.vue';+</script>++<template>+ <LayoutAuth>+ <AuthHeader> Please enter your new password below </AuthHeader>+ <AuthCard>+ <ResetPassword />+ </AuthCard>+ </LayoutAuth>+</template>