Skip to content

A self-hosted media server and file management system

feat: password reset backend

aminnausine4d1ab5bdd8d
diff --git a/app/Http/Controllers/Api/V1/Auth/PasswordResetLinkController.php b/app/Http/Controllers/Api/V1/Auth/PasswordResetLinkController.php
new file mode 100644
index 00000000..8b724c81
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/Auth/PasswordResetLinkController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Password;
+
+class PasswordResetLinkController extends Controller {
+ /**
+ * Handle an incoming password reset link request.
+ *
+ * @throws \Illuminate\Validation\ValidationException
+ */
+ public function store(Request $request) {
+ $request->validate([
+ 'email' => 'required|email',
+ ]);
+
+ $status = Password::sendResetLink(
+ $request->only('email')
+ );
+
+ return $status === Password::ResetLinkSent
+ ? response(['status' => __($status)])
+ : response(['email' => __($status), 422]);
+ }
+}
diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.php
index 7cb682a0..270ceb54 100755
--- a/app/Http/Controllers/Api/V1/AuthController.php
+++ b/app/Http/Controllers/Api/V1/AuthController.php
@@ -28,7 +28,7 @@ class AuthController extends Controller {
*/
public function login(UserLoginRequest $request) {
$validated = $request->validated();
- if (!Auth::attempt($request->only('email', 'password'), $request['remember'])) {
+ if (! Auth::attempt($request->only('email', 'password'), $request['remember'])) {
return $this->invalidCredentialsResponse($request);
}
@@ -43,6 +43,7 @@ class AuthController extends Controller {
}
$request->session()->regenerate();
+
return redirect()->intended();
}
diff --git a/app/Http/Controllers/Api/V1/EmailController.php b/app/Http/Controllers/Api/V1/EmailController.php
index f0d04df0..adecac52 100644
--- a/app/Http/Controllers/Api/V1/EmailController.php
+++ b/app/Http/Controllers/Api/V1/EmailController.php
@@ -27,6 +27,6 @@ class EmailController extends Controller {
'email' => $validated['email'],
]);
- return response(null, 204);
+ return response()->noContent();
}
}
diff --git a/app/Http/Controllers/Api/V1/PasswordController.php b/app/Http/Controllers/Api/V1/PasswordController.php
index 91114cb8..d8451c45 100644
--- a/app/Http/Controllers/Api/V1/PasswordController.php
+++ b/app/Http/Controllers/Api/V1/PasswordController.php
@@ -3,32 +3,27 @@
namespace App\Http\Controllers\Api\V1;
use App\Http\Controllers\Controller;
+use Illuminate\Auth\Events\PasswordReset;
use Illuminate\Http\Request;
+use Illuminate\Http\Response;
use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Password;
use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Password;
+use Illuminate\Validation\Rules;
+use Illuminate\Validation\ValidationException;
class PasswordController extends Controller {
public function update(Request $request) {
$validated = $request->validate([
'current_password' => ['required', 'current_password'],
- 'password' => ['required', Password::defaults(), 'confirmed'],
+ 'password' => ['required', Rules\Password::defaults(), 'confirmed'],
]);
$request->user()->update([
'password' => Hash::make($validated['password']),
]);
- return response(null, 204);
- }
-
- public function requestRecovery(Request $request) {
- $request->validate(['email' => 'required|email']);
-
- $token = Str::random(64);
-
- // just return for now
- return response()->json(['reset_token' => $token]);
+ return response()->noContent();
}
/**
@@ -36,37 +31,37 @@ class PasswordController extends Controller {
*
* @throws \Illuminate\Validation\ValidationException
*/
- public function store(Request $request) {
+ public function store(Request $request): Response {
$request->validate([
'token' => 'required',
'email' => 'required|email',
- // 'password' => ['required', 'confirmed', Rules\Password::defaults()],
+ 'password' => ['required', 'confirmed', Rules\Password::defaults()],
]);
// Here we will attempt to reset the user's password. If it is successful we
// will update the password on an actual user model and persist it to the
// database. Otherwise we will parse the error and return the response.
- // $status = Password::reset(
- // $request->only('email', 'password', 'password_confirmation', 'token'),
- // function ($user) use ($request) {
- // $user->forceFill([
- // 'password' => Hash::make($request->password),
- // 'remember_token' => Str::random(60),
- // ])->save();
+ $status = Password::reset(
+ $request->only('email', 'password', 'password_confirmation', 'token'),
+ function ($user) use ($request) {
+ $user->forceFill([
+ 'password' => Hash::make($request->password),
+ 'remember_token' => Str::random(60),
+ ])->save();
- // event(new PasswordReset($user));
- // }
- // );
+ event(new PasswordReset($user));
+ }
+ );
// If the password was successfully reset, we will redirect the user back to
// the application's home authenticated view. If there is an error we can
// redirect them back to where they came from with their error message.
- // if ($status == Password::PasswordReset) {
- // return to_route('login')->with('status', __($status));
- // }
+ if ($status == Password::PasswordReset) {
+ return response('Password Reset Successfully', 200);
+ }
- // throw ValidationException::withMessages([
- // 'email' => [__($status)],
- // ]);
+ throw ValidationException::withMessages([
+ 'email' => [__($status)],
+ ]);
}
}
diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vue
index 4e84a463..279bc636 100644
--- a/resources/js/components/forms/RecoveryForm.vue
+++ b/resources/js/components/forms/RecoveryForm.vue
@@ -27,7 +27,7 @@ const handleSubmit = async () => {
},
{
onSuccess: (response) => {
- toast.success('A reset link will be sent if the account exists.', { description: 'This is not yet implemented.' });
+ toast.success('A reset link will be sent if the account exists.');
form.reset('email');
},
onError() {
diff --git a/resources/js/components/forms/ResetPassword.vue b/resources/js/components/forms/ResetPassword.vue
new file mode 100644
index 00000000..279bc636
--- /dev/null
+++ b/resources/js/components/forms/ResetPassword.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import type { FormField } from '@/types/types';
+
+import { recoverAccount } from '@/service/authAPI';
+import { RouterLink } from 'vue-router';
+import { toast } from '@/service/toaster/toastService';
+import { ref } from 'vue';
+
+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 fields = ref<FormField[]>([{ name: 'email', text: 'Email', type: 'text', required: true, autocomplete: 'email', placeholder: '[email protected]' }]);
+
+const form = useForm<{ email: string }>({
+ email: '',
+});
+
+const handleSubmit = async () => {
+ form.submit(
+ async (fields) => {
+ return recoverAccount(fields);
+ },
+ {
+ onSuccess: (response) => {
+ toast.success('A reset link will be sent if the account exists.');
+ form.reset('email');
+ },
+ onError() {
+ form.reset('email');
+ },
+ },
+ );
+};
+</script>
+<template>
+ <BaseForm @submit.prevent="handleSubmit">
+ <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>
+ </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/routes/api.php b/routes/api.php
index 06d6a939..f0fb2f5a 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,6 +1,7 @@
<?php
use App\Http\Controllers\Api\V1\AnalyticsController;
+use App\Http\Controllers\Api\V1\Auth\PasswordResetLinkController;
use App\Http\Controllers\Api\V1\AuthController;
use App\Http\Controllers\Api\V1\CategoryController;
use App\Http\Controllers\Api\V1\EmailController;
@@ -96,9 +97,10 @@ Route::prefix('pulse')->group(function () {
// public
-Route::post('/login', [AuthController::class, 'login']);
+Route::post('/reset-password/{token}', [PasswordController::class, 'store'])->name('password.reset');
Route::post('/register', [AuthController::class, 'register'])->middleware('throttle:6,1')->name('register');
-Route::post('/recovery', [PasswordController::class, 'requestRecovery'])->name('recovery');
+Route::post('/recovery', [PasswordResetLinkController::class, 'store'])->name('password.recovery');
+Route::post('/login', [AuthController::class, 'login']);
Route::get('/manifest', function () {
return response()->json(AppManifest::info());
diff --git a/routes/console.php b/routes/console.php
index f654987e..9e88bf29 100755
--- a/routes/console.php
+++ b/routes/console.php
@@ -10,4 +10,5 @@ use Illuminate\Support\Facades\Schedule;
// })->purpose('Display an inspiring quote')->hourly();
Schedule::job(new ScheduledIndexFiles)->everySixHours()->environments(['staging', 'production']);
+Schedule::command('auth:clear-resets')->everyFifteenMinutes();
Schedule::command('sanctum:prune-expired --hours=2')->daily();