Skip intermediate login page with single provider

[bookstack] / tests / Auth / SocialAuthTest.php

diff --git a/tests/Auth/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php
index 60de8fbcbbcc07165081dbbfe7e6f8bd98e26740..90d7e37aa5e85065588346e22e91fd319d5ccf80 100644 (file)
--- a/tests/Auth/SocialAuthTest.php
+++ b/tests/Auth/SocialAuthTest.php
@@ -1,8 +1,11 @@
-<?php namespace Tests\Auth;
+<?php

 
 

+namespace Tests\Auth;
+
+use BookStack\Actions\ActivityType;

 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;
 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;

-use DB;
+use Illuminate\Support\Facades\DB;

 use Laravel\Socialite\Contracts\Factory;
 use Laravel\Socialite\Contracts\Provider;
 use Mockery;
 use Laravel\Socialite\Contracts\Factory;
 use Laravel\Socialite\Contracts\Provider;
 use Mockery;


@@ -10,10 +13,9 @@ use Tests\TestCase;
 
 class SocialAuthTest extends TestCase
 {
 
 class SocialAuthTest extends TestCase
 {

-

     public function test_social_registration()
     {
     public function test_social_registration()
     {

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);
 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);


@@ -43,7 +45,7 @@ class SocialAuthTest extends TestCase
         config([
             'GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc',
             'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',
         config([
             'GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc',
             'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',

-            'APP_URL' => 'http://localhost'
+            'APP_URL'       => 'http://localhost',

         ]);
 
         $mockSocialite = $this->mock(Factory::class);
         ]);
 
         $mockSocialite = $this->mock(Factory::class);


@@ -60,7 +62,7 @@ class SocialAuthTest extends TestCase
         // Test login routes
         $resp = $this->get('/login');
         $resp->assertElementExists('a#social-login-google[href$="/login/service/google"]');
         // Test login routes
         $resp = $this->get('/login');
         $resp->assertElementExists('a#social-login-google[href$="/login/service/google"]');

-        $resp = $this->followingRedirects()->get("/login/service/google");
+        $resp = $this->followingRedirects()->get('/login/service/google');

         $resp->assertSee('login-form');
 
         // Test social callback
         $resp->assertSee('login-form');
 
         // Test social callback


@@ -70,18 +72,18 @@ class SocialAuthTest extends TestCase
 
         $resp = $this->get('/login');
         $resp->assertElementExists('a#social-login-github[href$="/login/service/github"]');
 
         $resp = $this->get('/login');
         $resp->assertElementExists('a#social-login-github[href$="/login/service/github"]');

-        $resp = $this->followingRedirects()->get("/login/service/github");
+        $resp = $this->followingRedirects()->get('/login/service/github');

         $resp->assertSee('login-form');
 
         $resp->assertSee('login-form');
 

-

         // Test social callback with matching social account
         DB::table('social_accounts')->insert([
         // Test social callback with matching social account
         DB::table('social_accounts')->insert([

-            'user_id' => $this->getAdmin()->id,
-            'driver' => 'github',
-            'driver_id' => 'logintest123'
+            'user_id'   => $this->getAdmin()->id,
+            'driver'    => 'github',
+            'driver_id' => 'logintest123',

         ]);
         $resp = $this->followingRedirects()->get('/login/service/github/callback');
         ]);
         $resp = $this->followingRedirects()->get('/login/service/github/callback');

-        $resp->assertDontSee("login-form");
+        $resp->assertDontSee('login-form');
+        $this->assertActivityExists(ActivityType::AUTH_LOGIN, null, 'github; (' . $this->getAdmin()->id . ') ' . $this->getAdmin()->name);

     }
 
     public function test_social_account_detach()
     }
 
     public function test_social_account_detach()


@@ -89,12 +91,12 @@ class SocialAuthTest extends TestCase
         $editor = $this->getEditor();
         config([
             'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',
         $editor = $this->getEditor();
         config([
             'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',

-            'APP_URL' => 'http://localhost'
+            'APP_URL'       => 'http://localhost',

         ]);
 
         $socialAccount = SocialAccount::query()->forceCreate([
         ]);
 
         $socialAccount = SocialAccount::query()->forceCreate([

-            'user_id' => $editor->id,
-            'driver' => 'github',
+            'user_id'   => $editor->id,
+            'driver'    => 'github',

             'driver_id' => 'logintest123',
         ]);
 
             'driver_id' => 'logintest123',
         ]);
 


@@ -113,10 +115,10 @@ class SocialAuthTest extends TestCase
     {
         config([
             'services.google.client_id' => 'abc123', 'services.google.client_secret' => '123abc',
     {
         config([
             'services.google.client_id' => 'abc123', 'services.google.client_secret' => '123abc',

-            'APP_URL' => 'http://localhost'
+            'APP_URL'                   => 'http://localhost',

         ]);
 
         ]);
 

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);


@@ -151,10 +153,10 @@ class SocialAuthTest extends TestCase
     {
         config([
             'services.google.client_id' => 'abc123', 'services.google.client_secret' => '123abc',
     {
         config([
             'services.google.client_id' => 'abc123', 'services.google.client_secret' => '123abc',

-            'APP_URL' => 'http://localhost', 'services.google.auto_register' => true, 'services.google.auto_confirm' => true
+            'APP_URL'                   => 'http://localhost', 'services.google.auto_register' => true, 'services.google.auto_confirm' => true,

         ]);
 
         ]);
 

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);


@@ -186,7 +188,7 @@ class SocialAuthTest extends TestCase
 
     public function test_social_registration_with_no_name_uses_email_as_name()
     {
 
     public function test_social_registration_with_no_name_uses_email_as_name()
     {

-        $user = factory(User::class)->make(['email' => '[email protected]']);
+        $user = User::factory()->make(['email' => '[email protected]']);

 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);
 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);


@@ -210,5 +212,4 @@ class SocialAuthTest extends TestCase
         $user = $user->whereEmail($user->email)->first();
         $this->assertDatabaseHas('social_accounts', ['user_id' => $user->id]);
     }
         $user = $user->whereEmail($user->email)->first();
         $this->assertDatabaseHas('social_accounts', ['user_id' => $user->id]);
     }

-

 }
 }