The Connect button on /settings/authentication pointed at the
auth.{provider}.redirect routes that live behind `guest` middleware,
so authenticated users were bounced to /app/home before reaching
Socialite. The OAuth callback also needed to handle two flows
(signup/login vs link to current user) but had no branch for the
second case — meaning a different-email GitHub account would have
been registered as a new user, logging the original session out.
Splits the flows by intent:
- New `app.authentication.connect-provider` route in the auth group,
handled by the settings controller (where it sits next to
disconnect-provider). Replaces the OAuth signup link as the
Connect button's target.
- Auth callbacks moved out of the guest group (still one URL per
provider, since OAuth apps only register one) and gain a single
Auth::check() branch that calls connectToCurrentUser().
- connectToCurrentUser() rejects if the provider id already belongs
to a different user; otherwise sets it on the current user and
redirects back to settings with a flash message.
175 lines
5.8 KiB
PHP
175 lines
5.8 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\User;
|
|
use Laravel\Socialite\Facades\Socialite;
|
|
use Laravel\Socialite\Two\User as SocialiteUser;
|
|
|
|
test('authenticated user can hit the connect-provider route for github', function () {
|
|
$user = User::factory()->create();
|
|
|
|
$driver = Mockery::mock();
|
|
$driver->shouldReceive('scopes')->andReturnSelf();
|
|
$driver->shouldReceive('redirect')->andReturn(redirect('https://github.com/login/oauth/authorize'));
|
|
Socialite::shouldReceive('driver')->with('github')->andReturn($driver);
|
|
|
|
$this->actingAs($user)
|
|
->get(route('app.authentication.connect-provider', 'github'))
|
|
->assertRedirect('https://github.com/login/oauth/authorize');
|
|
});
|
|
|
|
test('authenticated user can hit the connect-provider route for google', function () {
|
|
$user = User::factory()->create();
|
|
|
|
$driver = Mockery::mock();
|
|
$driver->shouldReceive('redirect')->andReturn(redirect('https://accounts.google.com/o/oauth2/auth'));
|
|
Socialite::shouldReceive('driver')->with('google-auth')->andReturn($driver);
|
|
|
|
$this->actingAs($user)
|
|
->get(route('app.authentication.connect-provider', 'google'))
|
|
->assertRedirect('https://accounts.google.com/o/oauth2/auth');
|
|
});
|
|
|
|
test('connect-provider route rejects unknown provider', function () {
|
|
$user = User::factory()->create();
|
|
|
|
$this->actingAs($user)
|
|
->get(route('app.authentication.connect-provider', 'twitter'))
|
|
->assertNotFound();
|
|
});
|
|
|
|
test('connect-provider route requires authentication', function () {
|
|
$this->get(route('app.authentication.connect-provider', 'github'))
|
|
->assertRedirect(route('login'));
|
|
});
|
|
|
|
test('authenticated callback connects github to the current user', function () {
|
|
$user = User::factory()->create([
|
|
'email' => 'me@example.com',
|
|
'google_id' => 'g-me',
|
|
'github_id' => null,
|
|
]);
|
|
|
|
$socialiteUser = new SocialiteUser;
|
|
$socialiteUser->id = 'gh-me';
|
|
$socialiteUser->name = 'Me';
|
|
$socialiteUser->email = 'me@example.com';
|
|
|
|
Socialite::shouldReceive('driver')
|
|
->with('github')
|
|
->andReturn($driver = Mockery::mock());
|
|
|
|
$driver->shouldReceive('user')->andReturn($socialiteUser);
|
|
|
|
$this->actingAs($user)
|
|
->get(route('auth.github.callback'))
|
|
->assertRedirect(route('app.authentication.edit'))
|
|
->assertSessionHas('flash.success');
|
|
|
|
expect($user->fresh()->github_id)->toBe('gh-me');
|
|
});
|
|
|
|
test('authenticated callback links github by current user, not by email', function () {
|
|
$user = User::factory()->create([
|
|
'email' => 'work@example.com',
|
|
'google_id' => 'g-me',
|
|
'github_id' => null,
|
|
]);
|
|
|
|
$socialiteUser = new SocialiteUser;
|
|
$socialiteUser->id = 'gh-personal';
|
|
$socialiteUser->name = 'Me';
|
|
$socialiteUser->email = 'personal@example.com';
|
|
|
|
Socialite::shouldReceive('driver')
|
|
->with('github')
|
|
->andReturn($driver = Mockery::mock());
|
|
|
|
$driver->shouldReceive('user')->andReturn($socialiteUser);
|
|
|
|
$this->actingAs($user)
|
|
->get(route('auth.github.callback'))
|
|
->assertRedirect(route('app.authentication.edit'))
|
|
->assertSessionHas('flash.success');
|
|
|
|
expect($user->fresh()->github_id)->toBe('gh-personal');
|
|
expect(User::where('email', 'personal@example.com')->exists())->toBeFalse();
|
|
$this->assertAuthenticatedAs($user);
|
|
});
|
|
|
|
test('authenticated callback rejects when github account is already linked to another user', function () {
|
|
User::factory()->create(['github_id' => 'gh-taken']);
|
|
|
|
$me = User::factory()->create(['email' => 'me@example.com', 'github_id' => null]);
|
|
|
|
$socialiteUser = new SocialiteUser;
|
|
$socialiteUser->id = 'gh-taken';
|
|
$socialiteUser->name = 'Me';
|
|
$socialiteUser->email = 'me@example.com';
|
|
|
|
Socialite::shouldReceive('driver')
|
|
->with('github')
|
|
->andReturn($driver = Mockery::mock());
|
|
|
|
$driver->shouldReceive('user')->andReturn($socialiteUser);
|
|
|
|
$this->actingAs($me)
|
|
->get(route('auth.github.callback'))
|
|
->assertRedirect(route('app.authentication.edit'))
|
|
->assertSessionHas('flash.error');
|
|
|
|
expect($me->fresh()->github_id)->toBeNull();
|
|
$this->assertAuthenticatedAs($me);
|
|
});
|
|
|
|
test('authenticated callback connects google to the current user', function () {
|
|
$user = User::factory()->create([
|
|
'email' => 'me@example.com',
|
|
'github_id' => 'gh-me',
|
|
'google_id' => null,
|
|
]);
|
|
|
|
$socialiteUser = new SocialiteUser;
|
|
$socialiteUser->id = 'g-me';
|
|
$socialiteUser->name = 'Me';
|
|
$socialiteUser->email = 'me@example.com';
|
|
|
|
Socialite::shouldReceive('driver')
|
|
->with('google-auth')
|
|
->andReturn($driver = Mockery::mock());
|
|
|
|
$driver->shouldReceive('user')->andReturn($socialiteUser);
|
|
|
|
$this->actingAs($user)
|
|
->get(route('auth.google.callback'))
|
|
->assertRedirect(route('app.authentication.edit'))
|
|
->assertSessionHas('flash.success');
|
|
|
|
expect($user->fresh()->google_id)->toBe('g-me');
|
|
});
|
|
|
|
test('authenticated callback rejects when google account is already linked to another user', function () {
|
|
User::factory()->create(['google_id' => 'g-taken']);
|
|
|
|
$me = User::factory()->create(['email' => 'me@example.com', 'google_id' => null]);
|
|
|
|
$socialiteUser = new SocialiteUser;
|
|
$socialiteUser->id = 'g-taken';
|
|
$socialiteUser->name = 'Me';
|
|
$socialiteUser->email = 'me@example.com';
|
|
|
|
Socialite::shouldReceive('driver')
|
|
->with('google-auth')
|
|
->andReturn($driver = Mockery::mock());
|
|
|
|
$driver->shouldReceive('user')->andReturn($socialiteUser);
|
|
|
|
$this->actingAs($me)
|
|
->get(route('auth.google.callback'))
|
|
->assertRedirect(route('app.authentication.edit'))
|
|
->assertSessionHas('flash.error');
|
|
|
|
expect($me->fresh()->google_id)->toBeNull();
|
|
$this->assertAuthenticatedAs($me);
|
|
});
|