Merge branch '2.4' into feature/remote-user-authenticate

app/Http/Kernel.php

@@ -11,16 +11,18 @@
 
 namespace CachetHQ\Cachet\Http;
 
-use AltThree\Throttle\ThrottlingMiddleware;
+use Barryvdh\Cors\HandleCors;
 use CachetHQ\Cachet\Http\Middleware\Admin;
 use CachetHQ\Cachet\Http\Middleware\ApiAuthentication;
 use CachetHQ\Cachet\Http\Middleware\Authenticate;
+use CachetHQ\Cachet\Http\Middleware\CacheControl;
 use CachetHQ\Cachet\Http\Middleware\Localize;
 use CachetHQ\Cachet\Http\Middleware\ReadyForUse;
 use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated;
 use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
 use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted;
 use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured;
+use CachetHQ\Cachet\Http\Middleware\Throttler;
 use CachetHQ\Cachet\Http\Middleware\TrustProxies;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
@@ -44,16 +46,18 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'admin'           => Admin::class,
-        'can'             => Authorize::class,
-        'auth'            => Authenticate::class,
-        'auth.api'        => ApiAuthentication::class,
+        'admin'       => Admin::class,
+        'auth.api'    => ApiAuthentication::class,
         'auth.remoteuser' => RemoteUserAuthenticate::class,
-        'guest'           => RedirectIfAuthenticated::class,
-        'localize'        => Localize::class,
-        'ready'           => ReadyForUse::class,
-        'setup'           => SetupAlreadyCompleted::class,
-        'subscribers'     => SubscribersConfigured::class,
-        'throttle'        => ThrottlingMiddleware::class,
+        'auth'        => Authenticate::class,
+        'cache'       => CacheControl::class,
+        'can'         => Authorize::class,
+        'cors'        => HandleCors::class,
+        'guest'       => RedirectIfAuthenticated::class,
+        'localize'    => Localize::class,
+        'ready'       => ReadyForUse::class,
+        'setup'       => SetupAlreadyCompleted::class,
+        'subscribers' => SubscribersConfigured::class,
+        'throttle'    => Throttler::class,
     ];
 }