From 77da0c9de14462c6bc20e92153618a098f8c116d Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 3 Dec 2016 19:25:39 +0000
Subject: [PATCH] Fix http middlewares that redirect to routes

---
 app/Http/Middleware/ReadyForUse.php           | 30 ++++++++++++++-----
 .../Middleware/RedirectIfAuthenticated.php    |  3 +-
 app/Http/Middleware/SetupAlreadyCompleted.php |  2 +-
 app/Http/Middleware/SubscribersConfigured.php |  2 +-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/Http/Middleware/ReadyForUse.php b/app/Http/Middleware/ReadyForUse.php
index b6c33281..a5bbf5aa 100644
--- a/app/Http/Middleware/ReadyForUse.php
+++ b/app/Http/Middleware/ReadyForUse.php
@@ -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);
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index cf2c8333..7c85f668 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -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);
diff --git a/app/Http/Middleware/SetupAlreadyCompleted.php b/app/Http/Middleware/SetupAlreadyCompleted.php
index 50bcce5a..605e932e 100644
--- a/app/Http/Middleware/SetupAlreadyCompleted.php
+++ b/app/Http/Middleware/SetupAlreadyCompleted.php
@@ -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);
diff --git a/app/Http/Middleware/SubscribersConfigured.php b/app/Http/Middleware/SubscribersConfigured.php
index 3069d1ed..378caa20 100644
--- a/app/Http/Middleware/SubscribersConfigured.php
+++ b/app/Http/Middleware/SubscribersConfigured.php
@@ -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);