diff --git a/app/Http/Controllers/Settings/SecurityController.php b/app/Http/Controllers/Settings/SecurityController.php index 9efffbe..0563e1e 100644 --- a/app/Http/Controllers/Settings/SecurityController.php +++ b/app/Http/Controllers/Settings/SecurityController.php @@ -29,18 +29,12 @@ class SecurityController extends Controller implements HasMiddleware /** * Show the user's security settings page. */ - public function edit(TwoFactorAuthenticationRequest $request): Response|RedirectResponse + public function edit(TwoFactorAuthenticationRequest $request): Response { $user = $request->user(); - if ($user->must_change_password_on_next_login) { - return to_route('password.force-change.edit'); - } - $props = [ 'canManageTwoFactor' => Features::canManageTwoFactorAuthentication(), - 'mustChangePassword' => (bool) $user->must_change_password_on_next_login, - 'status' => session('status'), ]; if (Features::canManageTwoFactorAuthentication()) { diff --git a/app/Http/Middleware/RequirePasswordChange.php b/app/Http/Middleware/RequirePasswordChange.php index 2edae2b..baef01e 100644 --- a/app/Http/Middleware/RequirePasswordChange.php +++ b/app/Http/Middleware/RequirePasswordChange.php @@ -23,10 +23,7 @@ class RequirePasswordChange if ($request->routeIs([ 'logout', - 'password.confirm', - 'password.confirm.*', 'password.force-change.edit', - 'security.edit', 'user-password.update', ])) { return $next($request); diff --git a/config/fortify.php b/config/fortify.php index ce67e2c..eb256f1 100644 --- a/config/fortify.php +++ b/config/fortify.php @@ -144,7 +144,6 @@ return [ */ 'features' => [ - Features::registration(), Features::resetPasswords(), Features::emailVerification(), Features::twoFactorAuthentication([