fixes
This commit is contained in:
@@ -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()) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user