79f800f858
Splits the OAuth connect flow off entirely from signup/login so each
route has a single responsibility.
- routes/auth.php returns to its original state — redirect + callback
both back inside the `guest` group.
- routes/app.php gains a paired callback route at
/settings/authentication/providers/{provider}/callback.
- AuthenticationController::connectProvider /
connectProviderCallback override Socialite's redirectUrl so the
round-trip stays on the connect-flow URL. The Auth::check() branch
in the auth controllers is gone.
The OAuth apps in Google Cloud and GitHub Developer Settings need the
new callback URL registered alongside the existing one — documented in
.env.example.
84 lines
2.3 KiB
PHP
84 lines
2.3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Http\Controllers\Auth;
|
|
|
|
use App\Actions\User\CreateUser;
|
|
use App\Http\Controllers\Auth\Concerns\PreservesUtmParameters;
|
|
use App\Http\Controllers\Controller;
|
|
use App\Models\User;
|
|
use Illuminate\Auth\Events\Registered;
|
|
use Illuminate\Http\RedirectResponse;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Laravel\Socialite\Facades\Socialite;
|
|
|
|
class GoogleController extends Controller
|
|
{
|
|
use PreservesUtmParameters;
|
|
|
|
public function redirect(Request $request): RedirectResponse
|
|
{
|
|
$this->storeUtmParameters($request);
|
|
|
|
return Socialite::driver('google-auth')->redirect();
|
|
}
|
|
|
|
public function callback(): RedirectResponse
|
|
{
|
|
try {
|
|
$googleUser = Socialite::driver('google-auth')->user();
|
|
} catch (\Exception) {
|
|
return redirect()->route('login');
|
|
}
|
|
|
|
$user = User::where('google_id', $googleUser->getId())
|
|
->orWhere('email', $googleUser->getEmail())
|
|
->first();
|
|
|
|
if ($user) {
|
|
return $this->loginExistingUser($user, $googleUser->getId());
|
|
}
|
|
|
|
return $this->registerNewUser($googleUser);
|
|
}
|
|
|
|
private function loginExistingUser(User $user, string $googleId): RedirectResponse
|
|
{
|
|
if (! $user->google_id) {
|
|
$user->update(['google_id' => $googleId]);
|
|
}
|
|
|
|
if (! $user->hasVerifiedEmail()) {
|
|
$user->markEmailAsVerified();
|
|
}
|
|
|
|
Auth::login($user, remember: true);
|
|
|
|
$this->retrieveUtmParameters();
|
|
|
|
return redirect()->route('app.home');
|
|
}
|
|
|
|
private function registerNewUser(\Laravel\Socialite\Contracts\User $googleUser): RedirectResponse
|
|
{
|
|
$utmParameters = $this->retrieveUtmParameters();
|
|
|
|
$user = CreateUser::execute([
|
|
'name' => $googleUser->getName(),
|
|
'email' => $googleUser->getEmail(),
|
|
'google_id' => $googleUser->getId(),
|
|
'email_verified_at' => now(),
|
|
'registration_ip' => request()->ip(),
|
|
], $utmParameters);
|
|
|
|
event(new Registered($user));
|
|
|
|
Auth::login($user, remember: true);
|
|
|
|
session()->flash('auth_provider', 'google');
|
|
|
|
return redirect()->route('register.success', $utmParameters);
|
|
}
|
|
}
|