refactor(auth): simplify GitHub callback flow and deprecate connect callback route

Author: maartenbode

app/Http/Controllers/Auth/GitHubController.php

@@ -9,14 +9,15 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Socialite\Facades\Socialite;
+use Laravel\Socialite\Two\GithubProvider;
 use Laravel\Socialite\Two\User as SocialiteUser;
 use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirectResponse;
 
 class GitHubController extends Controller
 {
     public function redirect(): SymfonyRedirectResponse
     {
-        /** @var \Laravel\Socialite\Two\GithubProvider $driver */
+        /** @var GithubProvider $driver */
         $driver = Socialite::driver('github');
 
         return $driver
@@ -26,6 +27,10 @@ public function redirect(): SymfonyRedirectResponse
 
     public function callback(): RedirectResponse
     {
+        if (session()->has('github_connect_organization') && Auth::check()) {
+            return $this->connectCallback();
+        }
+
         try {
             /** @var SocialiteUser $githubUser */
             $githubUser = Socialite::driver('github')->user();
@@ -90,7 +95,7 @@ public function connect(Organization $organization): SymfonyRedirectResponse
     {
         session(['github_connect_organization' => $organization->slug]);
 
-        /** @var \Laravel\Socialite\Two\GithubProvider $driver */
+        /** @var GithubProvider $driver */
         $driver = Socialite::driver('github');
 
         return $driver

routes/web.php

@@ -16,14 +16,14 @@
 
 Route::middleware('guest')->group(function () {
     Route::get('auth/github/redirect', [GitHubController::class, 'redirect'])->name('auth.github.redirect');
-    Route::get('auth/github/callback', [GitHubController::class, 'callback'])->name('auth.github.callback');
 });
 
+Route::get('auth/github/callback', [GitHubController::class, 'callback'])->name('auth.github.callback');
+
 Route::middleware(['auth', 'verified'])->group(function () {
     Route::get('/', DashboardController::class)->name('dashboard');
 
     // GitHub connect (elevated scopes for git credentials)
-    Route::get('auth/github/connect/callback', [GitHubController::class, 'connectCallback'])->name('auth.github.connect.callback');
     Route::get('auth/github/connect/{organization:slug}', [GitHubController::class, 'connect'])->name('auth.github.connect');
 
     // Organizations

tests/Feature/Auth/GitHubAuthenticationTest.php

@@ -252,7 +252,7 @@ function mockSocialiteRedirect(string $expectedUrl = 'https://github.com/login/o
 
     $response = $this->actingAs($user)
         ->withSession(['github_connect_organization' => $organization->slug])
-        ->get(route('auth.github.connect.callback'));
+        ->get(route('auth.github.callback'));
 
     $response->assertRedirect(route('organizations.settings.git-credentials.index', $organization));
     $response->assertSessionHas('status', 'GitHub credentials connected successfully.');
@@ -283,23 +283,22 @@ function mockSocialiteRedirect(string $expectedUrl = 'https://github.com/login/o
 
     $response = $this->actingAs($user)
         ->withSession(['github_connect_organization' => $organization->slug])
-        ->get(route('auth.github.connect.callback'));
+        ->get(route('auth.github.callback'));
 
     $response->assertRedirect(route('organizations.settings.git-credentials.index', $organization));
     $response->assertSessionHas('error');
 
     expect(OrganizationGitCredential::where('organization_uuid', $organization->uuid)->count())->toBe(1);
 });
 
-test('connect callback redirects to dashboard when no organization in session', function () {
+test('callback without connect session performs normal login', function () {
     $user = User::factory()->withGitHub()->create();
 
     $socialiteUser = mockSocialiteUser(['id' => $user->github_id]);
     mockSocialiteCallback($socialiteUser);
 
-    $response = $this->actingAs($user)
-        ->get(route('auth.github.connect.callback'));
+    $response = $this->get(route('auth.github.callback'));
 
     $response->assertRedirect(route('dashboard'));
-    $response->assertSessionHas('error');
+    $this->assertAuthenticatedAs($user);
 });