From 6ce087e5adce90774f58d6196c70f4c167b47c72 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 3 Jan 2019 19:45:59 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Foundation/Providers/RouteServiceProvider.php | 4 ++-- app/Http/Kernel.php | 2 +- app/Http/Middleware/RemoteUserAuthenticate.php | 13 +++++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Foundation/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php index 26171a78..907522dc 100644 --- a/app/Foundation/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Foundation\Providers; use Barryvdh\Cors\HandleCors; use CachetHQ\Cachet\Http\Middleware\Acceptable; use CachetHQ\Cachet\Http\Middleware\Authenticate; +use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; use CachetHQ\Cachet\Http\Middleware\Timezone; use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes; use CachetHQ\Cachet\Http\Routes\AuthRoutes; @@ -28,7 +29,6 @@ use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Router; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; -use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; /** * This is the route service provider. @@ -150,7 +150,7 @@ class RouteServiceProvider extends ServiceProvider VerifyCsrfToken::class, SubstituteBindings::class, ]; - + if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) { $middleware[] = Authenticate::class; $middleware[] = RemoteUserAuthenticate::class; diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 565e064b..22b3a679 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -18,13 +18,13 @@ use CachetHQ\Cachet\Http\Middleware\Authenticate; 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\TrustProxies; use Illuminate\Auth\Middleware\Authorize; use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode; -use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate; class Kernel extends HttpKernel { diff --git a/app/Http/Middleware/RemoteUserAuthenticate.php b/app/Http/Middleware/RemoteUserAuthenticate.php index 5bf6cf7f..075c0c4a 100644 --- a/app/Http/Middleware/RemoteUserAuthenticate.php +++ b/app/Http/Middleware/RemoteUserAuthenticate.php @@ -1,5 +1,14 @@