Skip intermediate login page with single provider

[bookstack] / tests / Auth / OidcTest.php

diff --git a/tests/Auth/OidcTest.php b/tests/Auth/OidcTest.php
index 9fa4d0012a41c9460b0cf35f5d9b9e89fa832b58..34fd70115e345a839b0ea2441d18494d72a62555 100644 (file)
--- a/tests/Auth/OidcTest.php
+++ b/tests/Auth/OidcTest.php
@@ -6,14 +6,13 @@ use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use BookStack\Auth\User;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;

-use Illuminate\Filesystem\Cache;

 use Tests\Helpers\OidcJwtHelper;
 use Tests\TestCase;
 use Tests\TestResponse;
 
 class OidcTest extends TestCase
 {
 use Tests\Helpers\OidcJwtHelper;
 use Tests\TestCase;
 use Tests\TestResponse;
 
 class OidcTest extends TestCase
 {

-    protected $keyFilePath;
+    protected string $keyFilePath;

     protected $keyFile;
 
     protected function setUp(): void
     protected $keyFile;
 
     protected function setUp(): void


@@ -27,6 +26,7 @@ class OidcTest extends TestCase
 
         config()->set([
             'auth.method'                 => 'oidc',
 
         config()->set([
             'auth.method'                 => 'oidc',

+            'auth.auto_redirect'          => false,

             'auth.defaults.guard'         => 'oidc',
             'oidc.name'                   => 'SingleSignOn-Testing',
             'oidc.display_name_claims'    => ['name'],
             'auth.defaults.guard'         => 'oidc',
             'oidc.name'                   => 'SingleSignOn-Testing',
             'oidc.display_name_claims'    => ['name'],


@@ -112,6 +112,19 @@ class OidcTest extends TestCase
         $this->assertPermissionError($resp);
     }
 
         $this->assertPermissionError($resp);
     }
 

+    public function test_automatic_redirect_on_login()
+    {
+        config()->set([
+            'auth.auto_redirect'        => true,
+            'services.google.client_id' => false,
+            'services.github.client_id' => false,
+        ]);
+        $req = $this->get('/login');
+        $req->assertSeeText('SingleSignOn-Testing');
+        $req->assertElementExists('form[action$="/oidc/login"][method=POST] button');
+        $req->assertElementExists('div#loginredirect-wrapper');
+    }
+

     public function test_login()
     {
         $req = $this->post('/oidc/login');
     public function test_login()
     {
         $req = $this->post('/oidc/login');


@@ -236,22 +249,24 @@ class OidcTest extends TestCase
 
         $this->assertFalse(auth()->check());
 
 
         $this->assertFalse(auth()->check());
 

-        $this->runLogin([
+        $resp = $this->runLogin([

             'email' => $editor->email,
             'sub'   => 'benny505',
         ]);
             'email' => $editor->email,
             'sub'   => 'benny505',
         ]);

+        $resp = $this->followRedirects($resp);

 
 

-        $this->assertSessionError('A user with the email ' . $editor->email . ' already exists but with different credentials.');
+        $resp->assertSeeText('A user with the email ' . $editor->email . ' already exists but with different credentials.');

         $this->assertFalse(auth()->check());
     }
 
     public function test_auth_login_with_invalid_token_fails()
     {
         $this->assertFalse(auth()->check());
     }
 
     public function test_auth_login_with_invalid_token_fails()
     {

-        $this->runLogin([
+        $resp = $this->runLogin([

             'sub' => null,
         ]);
             'sub' => null,
         ]);

+        $resp = $this->followRedirects($resp);

 
 

-        $this->assertSessionError('ID token validate failed with error: Missing token subject value');
+        $resp->assertSeeText('ID token validate failed with error: Missing token subject value');

         $this->assertFalse(auth()->check());
     }
 
         $this->assertFalse(auth()->check());
     }
 


@@ -287,9 +302,9 @@ class OidcTest extends TestCase
             new Response(404, [], 'Not found'),
         ]);
 
             new Response(404, [], 'Not found'),
         ]);
 

-        $this->runLogin();
+        $resp = $this->followRedirects($this->runLogin());

         $this->assertFalse(auth()->check());
         $this->assertFalse(auth()->check());

-        $this->assertSessionError('Login using SingleSignOn-Testing failed, system did not provide successful authorization');
+        $resp->assertSeeText('Login using SingleSignOn-Testing failed, system did not provide successful authorization');

     }
 
     public function test_autodiscovery_calls_are_cached()
     }
 
     public function test_autodiscovery_calls_are_cached()