feat: add two-factor authentication support and related configurations

This commit is contained in:
2026-07-24 12:59:10 +02:00
parent 54345e621c
commit 235d5f646c
27 changed files with 2608 additions and 374 deletions

View File

@@ -5,7 +5,9 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Models\SocialAccount;
use App\Models\User;
use App\Services\Auth\TwoFactorChallenge;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Laravel\Socialite\Facades\Socialite;
@@ -49,8 +51,11 @@ class SocialiteController extends Controller
/**
* Obtain the user information from provider.
*/
public function callback(string $provider): RedirectResponse
{
public function callback(
Request $request,
string $provider,
TwoFactorChallenge $twoFactor
): RedirectResponse {
if (! in_array($provider, $this->getEnabledProviders())) {
abort(404, 'Provider not enabled');
}
@@ -69,10 +74,7 @@ class SocialiteController extends Controller
->first();
if ($socialAccount) {
Auth::login($socialAccount->user, remember: true);
request()->session()->regenerate();
return redirect()->intended(config('auth-ui.redirects.login', '/'));
return $this->finishAuthentication($request, $socialAccount->user, $twoFactor);
}
// Check if a user with this email already exists
@@ -90,10 +92,7 @@ class SocialiteController extends Controller
'provider_id' => $socialUser->getId(),
]);
Auth::login($existingUser, remember: true);
request()->session()->regenerate();
return redirect()->intended(config('auth-ui.redirects.login', '/'));
return $this->finishAuthentication($request, $existingUser, $twoFactor);
}
// New user — check if registration is enabled
@@ -135,8 +134,20 @@ class SocialiteController extends Controller
'provider_id' => $socialUser->getId(),
]);
return $this->finishAuthentication($request, $user, $twoFactor);
}
private function finishAuthentication(
Request $request,
User $user,
TwoFactorChallenge $twoFactor
): RedirectResponse {
if ($twoFactor->requiredFor($user)) {
return $twoFactor->begin($request, $user, remember: true);
}
Auth::login($user, remember: true);
request()->session()->regenerate();
$request->session()->regenerate();
return redirect()->intended(config('auth-ui.redirects.login', '/'));
}