Fix http middlewares that redirect to routes

This commit is contained in:
James Brooks
2016-12-03 19:25:39 +00:00
parent 11c38a7aea
commit 77da0c9de1
4 changed files with 25 additions and 12 deletions

View File

@@ -13,9 +13,8 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure;
use Exception;
use Illuminate\Contracts\Config\Repository;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Redirect;
/**
* This is the ready for use middleware class.
@@ -26,6 +25,25 @@ use Illuminate\Support\Facades\Redirect;
*/
class ReadyForUse
{
/**
* The config repository instance.
*
* @var \Illuminate\Contracts\Config\Repository
*/
protected $config;
/**
* Creates a new setup already completed middleware instance.
*
* @param \Illuminate\Contracts\Config\Repository $config
*
* @return void
*/
public function __construct(Repository $config)
{
$this->config = $config;
}
/**
* Handle an incoming request.
*
@@ -36,12 +54,8 @@ class ReadyForUse
*/
public function handle(Request $request, Closure $next)
{
try {
if (!Config::get('setting.app_name')) {
return Redirect::to('setup');
}
} catch (Exception $e) {
return Redirect::to('setup');
if (!$this->config->get('setting.app_name')) {
return cachet_redirect('setup');
}
return $next($request);

View File

@@ -13,7 +13,6 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
/**
@@ -55,7 +54,7 @@ class RedirectIfAuthenticated
public function handle(Request $request, Closure $next)
{
if ($this->auth->check()) {
return new RedirectResponse(cachet_route('dashboard'));
return cachet_redirect('dashboard');
}
return $next($request);

View File

@@ -54,7 +54,7 @@ class SetupAlreadyCompleted
public function handle(Request $request, Closure $next)
{
if ($this->config->get('setting.app_name')) {
return cachet_route('dashboard');
return cachet_redirect('dashboard');
}
return $next($request);

View File

@@ -33,7 +33,7 @@ class SubscribersConfigured
public function handle(Request $request, Closure $next)
{
if (!subscribers_enabled()) {
return cachet_route('status-page');
return cachet_redirect('status-page');
}
return $next($request);