diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 0b05df7..4b10153 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers; use App\Http\Requests\LoginRequest; use App\Http\Requests\PasswordResetRequest; -use App\Http\Requests\PasswordResetWithTokenRequest; use App\Http\Requests\RegisterRequest; use App\Models\Invitation; use App\Models\Role; @@ -12,7 +11,6 @@ use App\Models\User; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Password; class AuthController extends Controller @@ -56,24 +54,6 @@ class AuthController extends Controller } public function resetPassword(PasswordResetRequest $request) - { - $user = Auth::user(); - $validatedData = $request->validated(); - - if (! Hash::check($request->current_password, $user->password)) { - return response()->json(['message' => 'Current password is incorrect.'], 422); - } - - try { - $user->forceFill(['password' => $validatedData['password']])->save(); - } catch (\Exception $e) { - return response()->json(['message' => 'Password reset failed.'], 400); - } - - return response()->json(['message' => 'Password reset successful.']); - } - - public function resetPasswordWithToken(PasswordResetWithTokenRequest $request) { $updatedUser = null; diff --git a/app/Http/Requests/PasswordResetRequest.php b/app/Http/Requests/PasswordResetRequest.php index 803ea1c..a37f4e1 100644 --- a/app/Http/Requests/PasswordResetRequest.php +++ b/app/Http/Requests/PasswordResetRequest.php @@ -24,7 +24,8 @@ class PasswordResetRequest extends FormRequest return [ 'password' => 'required|string|min:8|confirmed', 'password_confirmation' => 'string', - 'current_password' => 'required|string', + 'token' => 'required|string', + 'email' => 'required|email|exists:users,email', ]; } } diff --git a/app/Http/Requests/PasswordResetWithTokenRequest.php b/app/Http/Requests/PasswordResetWithTokenRequest.php deleted file mode 100644 index 9ab9aa4..0000000 --- a/app/Http/Requests/PasswordResetWithTokenRequest.php +++ /dev/null @@ -1,31 +0,0 @@ -|string> - */ - public function rules(): array - { - return [ - 'password' => 'required|string|min:8|confirmed', - 'password_confirmation' => 'string', - 'token' => 'required|string', - 'email' => 'required|email|exists:users,email', - ]; - } -} diff --git a/routes/api.php b/routes/api.php index a4e72b7..b84e7de 100644 --- a/routes/api.php +++ b/routes/api.php @@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Route; Route::post('/register', [AuthController::class, 'register'])->name('auth.register'); Route::post('/login', [AuthController::class, 'login'])->name('auth.login'); Route::post('/forgot-password', [AuthController::class, 'forgotPassword'])->name('auth.forgot-password'); -Route::post('/reset-password-token', [AuthController::class, 'resetPasswordWithToken'])->name('auth.reset-password-with-token'); Route::get('/invitations/{token}/accept', [InvitationController::class, 'accept'])->name('invitations.accept'); Route::get('/invitations/{token}/decline', [InvitationController::class, 'decline'])->name('invitations.decline');