Compare commits
No commits in common. "e38a2b13ed851c52ad361fc5fd9a3ce223575ea2" and "e81cfcb19ad5513b6278b6593dadf94e908d30c0" have entirely different histories.
e38a2b13ed
...
e81cfcb19a
4 changed files with 2 additions and 53 deletions
|
|
@ -4,7 +4,6 @@ namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Http\Requests\LoginRequest;
|
use App\Http\Requests\LoginRequest;
|
||||||
use App\Http\Requests\PasswordResetRequest;
|
use App\Http\Requests\PasswordResetRequest;
|
||||||
use App\Http\Requests\PasswordResetWithTokenRequest;
|
|
||||||
use App\Http\Requests\RegisterRequest;
|
use App\Http\Requests\RegisterRequest;
|
||||||
use App\Models\Invitation;
|
use App\Models\Invitation;
|
||||||
use App\Models\Role;
|
use App\Models\Role;
|
||||||
|
|
@ -12,7 +11,6 @@ use App\Models\User;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Illuminate\Support\Facades\Hash;
|
|
||||||
use Illuminate\Support\Facades\Password;
|
use Illuminate\Support\Facades\Password;
|
||||||
|
|
||||||
class AuthController extends Controller
|
class AuthController extends Controller
|
||||||
|
|
@ -56,24 +54,6 @@ class AuthController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
public function resetPassword(PasswordResetRequest $request)
|
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;
|
$updatedUser = null;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,8 @@ class PasswordResetRequest extends FormRequest
|
||||||
return [
|
return [
|
||||||
'password' => 'required|string|min:8|confirmed',
|
'password' => 'required|string|min:8|confirmed',
|
||||||
'password_confirmation' => 'string',
|
'password_confirmation' => 'string',
|
||||||
'current_password' => 'required|string',
|
'token' => 'required|string',
|
||||||
|
'email' => 'required|email|exists:users,email',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Requests;
|
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
|
|
||||||
class PasswordResetWithTokenRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*/
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'password' => 'required|string|min:8|confirmed',
|
|
||||||
'password_confirmation' => 'string',
|
|
||||||
'token' => 'required|string',
|
|
||||||
'email' => 'required|email|exists:users,email',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Route;
|
||||||
Route::post('/register', [AuthController::class, 'register'])->name('auth.register');
|
Route::post('/register', [AuthController::class, 'register'])->name('auth.register');
|
||||||
Route::post('/login', [AuthController::class, 'login'])->name('auth.login');
|
Route::post('/login', [AuthController::class, 'login'])->name('auth.login');
|
||||||
Route::post('/forgot-password', [AuthController::class, 'forgotPassword'])->name('auth.forgot-password');
|
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}/accept', [InvitationController::class, 'accept'])->name('invitations.accept');
|
||||||
Route::get('/invitations/{token}/decline', [InvitationController::class, 'decline'])->name('invitations.decline');
|
Route::get('/invitations/{token}/decline', [InvitationController::class, 'decline'])->name('invitations.decline');
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue