github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-01-19 04:32:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added tests to cover social login actions

Browse Source 
Closes #244
This commit is contained in:
Dan Brown 2017-01-02 14:56:58 +00:00
parent 7c8c4c2a05
commit f2917fc462
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Services/SocialAuthService.php
View File

@ -98,7 +98,6 @@ class SocialAuthService
// Get any attached social accounts or users
$socialAccount = $this->socialAccount->where('driver_id', '=', $socialId)->first();
$user = $this->userRepo->getByEmail($socialUser->getEmail());
$isLoggedIn = auth()->check();
$currentUser = user();

4
resources/views/auth/login.blade.php
View File

@ -34,10 +34,10 @@
<hr class="margin-top">
<h3 class="text-muted">{{ trans('auth.social_login') }}</h3>
@if(isset($socialDrivers['google']))
<a href="{{ baseUrl("/login/service/google") }}" style="color: #DC4E41;"><i class="zmdi zmdi-google-plus-box zmdi-hc-4x"></i></a>
<a id="social-login-google" href="{{ baseUrl("/login/service/google") }}" style="color: #DC4E41;"><i class="zmdi zmdi-google-plus-box zmdi-hc-4x"></i></a>
@endif
@if(isset($socialDrivers['github']))
<a href="{{ baseUrl("/login/service/github") }}" style="color:#444;"><i class="zmdi zmdi-github zmdi-hc-4x"></i></a>
<a id="social-login-github" href="{{ baseUrl("/login/service/github") }}" style="color:#444;"><i class="zmdi zmdi-github zmdi-hc-4x"></i></a>
@endif
@endif
</div>

44
tests/Auth/SocialAuthTest.php
View File

@ -32,4 +32,48 @@ class SocialAuthTest extends TestCase
$this->seeInDatabase('social_accounts', ['user_id' => $user->id]);
}
public function test_social_login()
{
$user = factory(\BookStack\User::class)->make();
config([
'GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc',
'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',
'APP_URL' => 'http://localhost'
]);
$mockSocialite = Mockery::mock('Laravel\Socialite\Contracts\Factory');
$this->app['Laravel\Socialite\Contracts\Factory'] = $mockSocialite;
$mockSocialDriver = Mockery::mock('Laravel\Socialite\Contracts\Provider');
$mockSocialUser = Mockery::mock('\Laravel\Socialite\Contracts\User');
$mockSocialUser->shouldReceive('getId')->twice()->andReturn('logintest123');
$mockSocialDriver->shouldReceive('user')->twice()->andReturn($mockSocialUser);
$mockSocialite->shouldReceive('driver')->twice()->with('google')->andReturn($mockSocialDriver);
$mockSocialite->shouldReceive('driver')->twice()->with('github')->andReturn($mockSocialDriver);
$mockSocialDriver->shouldReceive('redirect')->twice()->andReturn(redirect('/'));
// Test login routes
$this->visit('/login')->seeElement('#social-login-google')
->click('#social-login-google')
->seePageIs('/login');
// Test social callback
$this->visit('/login/service/google/callback')->seePageIs('/login')
->see(trans('errors.social_account_not_used', ['socialAccount' => 'Google']));
$this->visit('/login')->seeElement('#social-login-github')
->click('#social-login-github')
->seePageIs('/login');
// Test social callback with matching social account
DB::table('social_accounts')->insert([
'user_id' => $this->getAdmin()->id,
'driver' => 'github',
'driver_id' => 'logintest123'
]);
$this->visit('/login/service/github/callback')->seePageIs('/');
}
}