fixes
This commit is contained in:
@@ -29,18 +29,12 @@ class SecurityController extends Controller implements HasMiddleware
|
|||||||
/**
|
/**
|
||||||
* Show the user's security settings page.
|
* Show the user's security settings page.
|
||||||
*/
|
*/
|
||||||
public function edit(TwoFactorAuthenticationRequest $request): Response|RedirectResponse
|
public function edit(TwoFactorAuthenticationRequest $request): Response
|
||||||
{
|
{
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
|
|
||||||
if ($user->must_change_password_on_next_login) {
|
|
||||||
return to_route('password.force-change.edit');
|
|
||||||
}
|
|
||||||
|
|
||||||
$props = [
|
$props = [
|
||||||
'canManageTwoFactor' => Features::canManageTwoFactorAuthentication(),
|
'canManageTwoFactor' => Features::canManageTwoFactorAuthentication(),
|
||||||
'mustChangePassword' => (bool) $user->must_change_password_on_next_login,
|
|
||||||
'status' => session('status'),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
if (Features::canManageTwoFactorAuthentication()) {
|
if (Features::canManageTwoFactorAuthentication()) {
|
||||||
|
|||||||
@@ -23,10 +23,7 @@ class RequirePasswordChange
|
|||||||
|
|
||||||
if ($request->routeIs([
|
if ($request->routeIs([
|
||||||
'logout',
|
'logout',
|
||||||
'password.confirm',
|
|
||||||
'password.confirm.*',
|
|
||||||
'password.force-change.edit',
|
'password.force-change.edit',
|
||||||
'security.edit',
|
|
||||||
'user-password.update',
|
'user-password.update',
|
||||||
])) {
|
])) {
|
||||||
return $next($request);
|
return $next($request);
|
||||||
|
|||||||
@@ -144,7 +144,6 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'features' => [
|
'features' => [
|
||||||
Features::registration(),
|
|
||||||
Features::resetPasswords(),
|
Features::resetPasswords(),
|
||||||
Features::emailVerification(),
|
Features::emailVerification(),
|
||||||
Features::twoFactorAuthentication([
|
Features::twoFactorAuthentication([
|
||||||
|
|||||||
Reference in New Issue
Block a user