Skip intermediate login page with single provider

[bookstack] / app / Http / Kernel.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 027e469c805c6e81a7464a9525905035db7ac53f..91dbdd9634c2bfa02624a69b2f0e188726ef83f8 100644 (file)
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http;
+<?php
+
+namespace BookStack\Http;

 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 


@@ -6,13 +8,10 @@ class Kernel extends HttpKernel
 {
     /**
      * The application's global HTTP middleware stack.
 {
     /**
      * The application's global HTTP middleware stack.

-     *

      * These middleware are run during every request to your application.
      * These middleware are run during every request to your application.

-     *
-     * @var array

      */
     protected $middleware = [
      */
     protected $middleware = [

-        \BookStack\Http\Middleware\CheckForMaintenanceMode::class,
+        \BookStack\Http\Middleware\PreventRequestsDuringMaintenance::class,

         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BookStack\Http\Middleware\TrimStrings::class,
         \BookStack\Http\Middleware\TrustProxies::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \BookStack\Http\Middleware\TrimStrings::class,
         \BookStack\Http\Middleware\TrustProxies::class,


@@ -25,24 +24,24 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
      */
     protected $middlewareGroups = [
         'web' => [

+            \BookStack\Http\Middleware\ApplyCspRules::class,

             \BookStack\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \BookStack\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,

-            \Illuminate\Routing\Middleware\ThrottleRequests::class,

             \BookStack\Http\Middleware\VerifyCsrfToken::class,
             \BookStack\Http\Middleware\VerifyCsrfToken::class,

-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \BookStack\Http\Middleware\PreventAuthenticatedResponseCaching::class,
+            \BookStack\Http\Middleware\CheckEmailConfirmed::class,
+            \BookStack\Http\Middleware\RunThemeActions::class,

             \BookStack\Http\Middleware\Localization::class,
             \BookStack\Http\Middleware\Localization::class,

-            \BookStack\Http\Middleware\GlobalViewData::class,

         ],
         'api' => [
         ],
         'api' => [

-            'throttle:60,1',
-            'bindings',
-        ],
-        'saml' => [
+            \BookStack\Http\Middleware\ThrottleApiRequests::class,

             \BookStack\Http\Middleware\EncryptCookies::class,
             \BookStack\Http\Middleware\EncryptCookies::class,

-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+            \BookStack\Http\Middleware\StartSessionIfCookieExists::class,
+            \BookStack\Http\Middleware\ApiAuthenticate::class,
+            \BookStack\Http\Middleware\PreventAuthenticatedResponseCaching::class,
+            \BookStack\Http\Middleware\CheckEmailConfirmed::class,

         ],
     ];
 
         ],
     ];
 


@@ -53,10 +52,10 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,
      */
     protected $routeMiddleware = [
         'auth'       => \BookStack\Http\Middleware\Authenticate::class,

-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'can'        => \Illuminate\Auth\Middleware\Authorize::class,
+        'can'        => \BookStack\Http\Middleware\CheckUserHasPermission::class,

         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
         'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,

-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'perm'       => \BookStack\Http\Middleware\PermissionMiddleware::class
+        'throttle'   => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'guard'      => \BookStack\Http\Middleware\CheckGuard::class,
+        'mfa-setup'  => \BookStack\Http\Middleware\AuthenticatedOrPendingMfa::class,

     ];
 }
     ];
 }