feat(profile): align settings with dashboard layout

This commit is contained in:
2026-07-31 03:41:51 +02:00
parent e47243f7dc
commit 73c601ddc2
18 changed files with 947 additions and 377 deletions

View File

@@ -65,7 +65,7 @@ class TwoFactorSettingsController extends Controller
$redirect = $request->routeIs('two-factor.setup.confirm')
? redirect()->route('two-factor.setup')
: redirect()->route('profile.show');
: redirect()->route('profile.security');
return $redirect
->with('success', 'Two-factor authentication is now enabled.')
@@ -102,7 +102,7 @@ class TwoFactorSettingsController extends Controller
));
$securityEvents->record('two_factor.disabled', $user, $request);
return redirect()->route('profile.show')
return redirect()->route('profile.security')
->with('success', 'Two-factor authentication has been disabled.');
}
@@ -138,7 +138,7 @@ class TwoFactorSettingsController extends Controller
$securityEvents->record('two_factor.recovery_codes_revealed', $user, $request);
}
return redirect()->route('profile.show')
return redirect()->route('profile.security')
->with('success', $request->boolean('regenerate')
? 'New recovery codes have been generated. Previous codes no longer work.'
: 'Recovery codes revealed.')
@@ -158,7 +158,7 @@ class TwoFactorSettingsController extends Controller
{
return $request->routeIs('two-factor.setup.*')
? redirect()->route('two-factor.setup')
: redirect()->route('profile.show');
: redirect()->route('profile.security');
}
private function validatePasswordForPasswordUser(Request $request, User $user): void

View File

@@ -2,26 +2,50 @@
namespace App\Http\Controllers;
use App\Http\Requests\Profile\UpdateProfileRequest;
use App\Models\User;
use App\Services\Auth\TwoFactorEnrollmentState;
use Illuminate\Http\Request;
use App\Services\Auth\SecurityEventRecorder;
use Illuminate\Http\RedirectResponse;
use Inertia\Inertia;
use Inertia\Response;
class ProfileController extends Controller
{
/**
* Display the authenticated user's profile and security settings.
* Display the authenticated user's profile settings.
*/
public function __invoke(
Request $request,
TwoFactorEnrollmentState $enrollmentState
): Response {
public function show(): Response
{
return Inertia::render('Profile/Show');
}
/**
* Update the authenticated user's profile settings.
*/
public function update(
UpdateProfileRequest $request,
SecurityEventRecorder $securityEvents
): RedirectResponse {
/** @var User $user */
$user = $request->user();
$emailChanged = $user->email !== $request->validated('email');
return Inertia::render('Profile/Show', [
'twoFactor' => $enrollmentState->for($user),
$user->fill($request->validated());
if ($emailChanged) {
$user->email_verified_at = null;
}
$user->save();
$securityEvents->record('profile.updated', $user, $request, [
'email_changed' => $emailChanged,
]);
if ($emailChanged) {
$user->sendEmailVerificationNotification();
}
return redirect()->route('profile.show')
->with('success', 'Your profile has been updated.');
}
}

View File

@@ -0,0 +1,71 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\Profile\UpdatePasswordRequest;
use App\Models\User;
use App\Notifications\PasswordChangedNotification;
use App\Services\Auth\SecurityEventRecorder;
use App\Services\Auth\TwoFactorEnrollmentState;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Inertia\Inertia;
use Inertia\Response;
class ProfileSecurityController extends Controller
{
/**
* Display the authenticated user's security settings.
*/
public function show(
Request $request,
TwoFactorEnrollmentState $enrollmentState
): Response {
/** @var User $user */
$user = $request->user();
return Inertia::render('Profile/Security', [
'twoFactor' => $enrollmentState->for($user),
]);
}
/**
* Update the authenticated user's password and revoke other sessions.
*/
public function updatePassword(
UpdatePasswordRequest $request,
SecurityEventRecorder $securityEvents
): RedirectResponse {
/** @var User $user */
$user = $request->user();
$user->forceFill([
'password' => $request->validated('password'),
'remember_token' => Str::random(60),
'auth_session_version' => $user->auth_session_version + 1,
])->save();
if (config('session.driver') === 'database') {
DB::table(config('session.table'))
->where('user_id', $user->getKey())
->where('id', '!=', $request->session()->getId())
->delete();
}
$request->session()->put(
'auth.session_version',
$user->auth_session_version
);
$user->notify(new PasswordChangedNotification(
(string) $request->ip(),
now()->toIso8601String()
));
$securityEvents->record('password.changed', $user, $request);
return redirect()->route('profile.security')
->with('success', 'Your password has been updated. Other sessions were signed out.');
}
}

View File

@@ -52,7 +52,7 @@ class AddSecurityHeaders
'login',
'password.*',
'two-factor.*',
'profile.show',
'profile.*',
]);
}
}

View File

@@ -0,0 +1,31 @@
<?php
namespace App\Http\Requests\Profile;
use App\Models\User;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rules;
class UpdatePasswordRequest extends FormRequest
{
public function authorize(): bool
{
return $this->user() !== null;
}
/**
* @return array<string, array<mixed>>
*/
public function rules(): array
{
/** @var User $user */
$user = $this->user();
return [
'current_password' => $user->hasPassword()
? ['required', 'string', 'current_password:web']
: ['nullable', 'string'],
'password' => ['required', 'confirmed', Rules\Password::defaults()],
];
}
}

View File

@@ -0,0 +1,47 @@
<?php
namespace App\Http\Requests\Profile;
use App\Models\User;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class UpdateProfileRequest extends FormRequest
{
public function authorize(): bool
{
return $this->user() !== null;
}
/**
* @return array<string, array<mixed>>
*/
public function rules(): array
{
return [
'first_name' => ['required', 'string', 'max:255'],
'last_name' => ['required', 'string', 'max:255'],
'username' => [
'required',
'string',
'max:255',
'alpha_dash',
function ($attribute, $value, $fail): void {
if (User::whereKeyNot($this->user()->getKey())
->whereRaw('LOWER(username) = ?', [strtolower($value)])
->exists()) {
$fail('The username has already been taken.');
}
},
],
'email' => [
'required',
'string',
'lowercase',
'email',
'max:255',
Rule::unique(User::class)->ignore($this->user()->getKey()),
],
];
}
}

View File

@@ -35,6 +35,6 @@ class TwoFactorFailedNotification extends Notification implements ShouldQueue
->line("IP address: {$this->ipAddress}")
->line("Browser: {$this->userAgent}")
->line('If this was not you, change your password immediately.')
->action('Review account security', url('/profile'));
->action('Review account security', url('/profile/security'));
}
}

View File

@@ -34,6 +34,6 @@ class TwoFactorSecurityNotification extends Notification implements ShouldQueue
->line("Time: {$this->occurredAt}")
->line("IP address: {$this->ipAddress}")
->line('If you did not perform this action, change your password and contact support immediately.')
->action('Review account security', url('/profile'));
->action('Review account security', url('/profile/security'));
}
}