lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
James Brooks
2019-01-03 19:45:59 +00:00
committed by StyleCI Bot
parent a033d1498d
commit 6ce087e5ad
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Foundation/Providers/RouteServiceProvider.php
View File

@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Foundation\Providers;
use Barryvdh\Cors\HandleCors; use Barryvdh\Cors\HandleCors;
use CachetHQ\Cachet\Http\Middleware\Acceptable; use CachetHQ\Cachet\Http\Middleware\Acceptable;
use CachetHQ\Cachet\Http\Middleware\Authenticate; use CachetHQ\Cachet\Http\Middleware\Authenticate;
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
use CachetHQ\Cachet\Http\Middleware\Timezone; use CachetHQ\Cachet\Http\Middleware\Timezone;
use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes; use CachetHQ\Cachet\Http\Routes\ApiSystemRoutes;
use CachetHQ\Cachet\Http\Routes\AuthRoutes; use CachetHQ\Cachet\Http\Routes\AuthRoutes;
@@ -28,7 +29,6 @@ use Illuminate\Routing\Middleware\SubstituteBindings;
use Illuminate\Routing\Router; use Illuminate\Routing\Router;
use Illuminate\Session\Middleware\StartSession; use Illuminate\Session\Middleware\StartSession;
use Illuminate\View\Middleware\ShareErrorsFromSession; use Illuminate\View\Middleware\ShareErrorsFromSession;
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
/** /**
* This is the route service provider. * This is the route service provider.
@@ -150,7 +150,7 @@ class RouteServiceProvider extends ServiceProvider
VerifyCsrfToken::class, VerifyCsrfToken::class,
SubstituteBindings::class, SubstituteBindings::class,
]; ];
if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) { if ($applyAlwaysAuthenticate && !$this->isWhiteListedAuthRoute($routes)) {
$middleware[] = Authenticate::class; $middleware[] = Authenticate::class;
$middleware[] = RemoteUserAuthenticate::class; $middleware[] = RemoteUserAuthenticate::class;

2
app/Http/Kernel.php
View File

@@ -18,13 +18,13 @@ use CachetHQ\Cachet\Http\Middleware\Authenticate;
use CachetHQ\Cachet\Http\Middleware\Localize; use CachetHQ\Cachet\Http\Middleware\Localize;
use CachetHQ\Cachet\Http\Middleware\ReadyForUse; use CachetHQ\Cachet\Http\Middleware\ReadyForUse;
use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated; use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated;
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted; use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted;
use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured; use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured;
use CachetHQ\Cachet\Http\Middleware\TrustProxies; use CachetHQ\Cachet\Http\Middleware\TrustProxies;
use Illuminate\Auth\Middleware\Authorize; use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Foundation\Http\Kernel as HttpKernel; use Illuminate\Foundation\Http\Kernel as HttpKernel;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode; use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
use CachetHQ\Cachet\Http\Middleware\RemoteUserAuthenticate;
class Kernel extends HttpKernel class Kernel extends HttpKernel
{ {

13
app/Http/Middleware/RemoteUserAuthenticate.php
View File

@@ -1,5 +1,14 @@
<?php <?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace CachetHQ\Cachet\Http\Middleware; namespace CachetHQ\Cachet\Http\Middleware;
use CachetHQ\Cachet\Models\User; use CachetHQ\Cachet\Models\User;
@@ -13,7 +22,7 @@ class RemoteUserAuthenticate
* Create a new remote user authenticate instance. * Create a new remote user authenticate instance.
* *
* @param \Illuminate\Contracts\Auth\Guard $auth * @param \Illuminate\Contracts\Auth\Guard $auth
* *
* @return void * @return void
*/ */
public function __construct(Guard $auth) public function __construct(Guard $auth)
@@ -26,7 +35,7 @@ class RemoteUserAuthenticate
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Closure $next * @param \Closure $next
* *
* @return mixed * @return mixed
*/ */
public function handle(Request $request, Closure $next) public function handle(Request $request, Closure $next)