From 1ef28cbc0259f737fce0aff4cd47c4af347ad3cd Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 4 Feb 2018 13:41:59 +0100
Subject: [PATCH] Changes to repair API auth

---
 app/Http/Middleware/Authenticate.php   | 4 ++--
 app/Providers/RouteServiceProvider.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index c5d91b1510..3e6263c80f 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -50,9 +50,9 @@ class Authenticate
 
             return redirect()->guest('login');
         }
-        if (1 === intval(auth()->user()->blocked)) {
+        if (1 === intval(Auth::guard($guard)->user()->blocked)) {
             $message = strval(trans('firefly.block_account_logout'));
-            if ('email_changed' === auth()->user()->blocked_code) {
+            if ('email_changed' === Auth::guard($guard)->user()->blocked_code) {
                 $message = strval(trans('firefly.email_changed_logout'));
             }
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 8a57b746f4..cb0dcb9b33 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -65,8 +65,8 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapApiRoutes()
     {
-        Route::prefix('api')
-             ->middleware('api')
+        Route::prefix('api/v1')
+             ->middleware('auth:api')
              ->namespace($this->namespace)
              ->group(base_path('routes/api.php'));
     }