X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/be4f3d62cd37c7b83eb86bbf5fffa00d20acf2ec..refs/pull/2023/head:/tests/Auth/SocialAuthTest.php

diff --git a/tests/Auth/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php
index 5bfe0c222..d448b567e 100644
--- a/tests/Auth/SocialAuthTest.php
+++ b/tests/Auth/SocialAuthTest.php
@@ -1,20 +1,26 @@
-<?php namespace Tests;
+<?php namespace Tests\Auth;
+
+use BookStack\Auth\User;
+use DB;
+use Laravel\Socialite\Contracts\Factory;
+use Laravel\Socialite\Contracts\Provider;
+use Mockery;
+use Tests\TestCase;
 
 class SocialAuthTest extends TestCase
 {
 
     public function test_social_registration()
     {
-        // http://docs.mockery.io/en/latest/reference/startup_methods.html
-        $user = factory(\BookStack\User::class)->make();
+        $user = factory(User::class)->make();
 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_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');
+        $mockSocialite = Mockery::mock(Factory::class);
+        $this->app[Factory::class] = $mockSocialite;
+        $mockSocialDriver = Mockery::mock(Provider::class);
+        $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
 
         $mockSocialite->shouldReceive('driver')->twice()->with('google')->andReturn($mockSocialDriver);
         $mockSocialDriver->shouldReceive('redirect')->once()->andReturn(redirect('/'));
@@ -40,10 +46,10 @@ class SocialAuthTest extends TestCase
             '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');
+        $mockSocialite = Mockery::mock(Factory::class);
+        $this->app[Factory::class] = $mockSocialite;
+        $mockSocialDriver = Mockery::mock(Provider::class);
+        $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
 
         $mockSocialUser->shouldReceive('getId')->twice()->andReturn('logintest123');
 
@@ -70,7 +76,7 @@ class SocialAuthTest extends TestCase
 
 
         // Test social callback with matching social account
-        \DB::table('social_accounts')->insert([
+        DB::table('social_accounts')->insert([
             'user_id' => $this->getAdmin()->id,
             'driver' => 'github',
             'driver_id' => 'logintest123'
@@ -86,11 +92,11 @@ class SocialAuthTest extends TestCase
             'APP_URL' => 'http://localhost'
         ]);
 
-        $user = factory(\BookStack\User::class)->make();
-        $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');
+        $user = factory(User::class)->make();
+        $mockSocialite = Mockery::mock(Factory::class);
+        $this->app[Factory::class] = $mockSocialite;
+        $mockSocialDriver = Mockery::mock(Provider::class);
+        $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
 
         $mockSocialUser->shouldReceive('getId')->times(4)->andReturn(1);
         $mockSocialUser->shouldReceive('getEmail')->times(2)->andReturn($user->email);
@@ -125,11 +131,11 @@ class SocialAuthTest extends TestCase
             'APP_URL' => 'http://localhost', 'services.google.auto_register' => true, 'services.google.auto_confirm' => true
         ]);
 
-        $user = factory(\BookStack\User::class)->make();
-        $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');
+        $user = factory(User::class)->make();
+        $mockSocialite = Mockery::mock(Factory::class);
+        $this->app[Factory::class] = $mockSocialite;
+        $mockSocialDriver = Mockery::mock(Provider::class);
+        $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
 
         $mockSocialUser->shouldReceive('getId')->times(3)->andReturn(1);
         $mockSocialUser->shouldReceive('getEmail')->times(2)->andReturn($user->email);
@@ -148,4 +154,40 @@ class SocialAuthTest extends TestCase
         $this->assertDatabaseHas('social_accounts', ['user_id' => $user->id]);
     }
 
+    public function test_google_select_account_option_changes_redirect_url()
+    {
+        config()->set('services.google.select_account', 'true');
+
+        $resp = $this->get('/login/service/google');
+        $this->assertStringContainsString('prompt=select_account', $resp->headers->get('Location'));
+    }
+
+    public function test_social_registration_with_no_name_uses_email_as_name()
+    {
+        $user = factory(User::class)->make(['email' => 'nonameuser@example.com']);
+
+        $this->setSettings(['registration-enabled' => 'true']);
+        config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);
+
+        $mockSocialite = Mockery::mock(Factory::class);
+        $this->app[Factory::class] = $mockSocialite;
+        $mockSocialDriver = Mockery::mock(Provider::class);
+        $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
+
+        $mockSocialite->shouldReceive('driver')->twice()->with('github')->andReturn($mockSocialDriver);
+        $mockSocialDriver->shouldReceive('redirect')->once()->andReturn(redirect('/'));
+        $mockSocialDriver->shouldReceive('user')->once()->andReturn($mockSocialUser);
+
+        $mockSocialUser->shouldReceive('getId')->twice()->andReturn(1);
+        $mockSocialUser->shouldReceive('getEmail')->twice()->andReturn($user->email);
+        $mockSocialUser->shouldReceive('getName')->once()->andReturn('');
+        $mockSocialUser->shouldReceive('getAvatar')->once()->andReturn('avatar_placeholder');
+
+        $this->get('/register/service/github');
+        $this->get('/login/service/github/callback');
+        $this->assertDatabaseHas('users', ['name' => 'nonameuser', 'email' => $user->email]);
+        $user = $user->whereEmail($user->email)->first();
+        $this->assertDatabaseHas('social_accounts', ['user_id' => $user->id]);
+    }
+
 }