From eba8171588c58d04a5f5bafa1ed98bf11fe0a714 Mon Sep 17 00:00:00 2001 From: Too Date: Fri, 22 Jun 2018 22:52:06 +0800 Subject: [PATCH] revert back previous changes. Add tymon to config/app.php --- app/Http/Kernel.php | 2 -- app/Http/Middleware/TokenEntrustAbility.php | 1 - config/app.php | 4 ++++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d9c1a0f3..da7a7f5c 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -61,7 +61,5 @@ class Kernel extends HttpKernel 'ability' => 'App\Http\Middleware\TokenEntrustAbility', 'role' => \Zizaco\Entrust\Middleware\EntrustRole::class, 'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class, - 'jwt.auth' => 'Tymon\JWTAuth\Middleware\BaseMiddleware', - 'jwt.refresh' => 'Tymon\JWTAuth\Middleware\RefreshToken', ]; } diff --git a/app/Http/Middleware/TokenEntrustAbility.php b/app/Http/Middleware/TokenEntrustAbility.php index 90e96453..da6c0696 100644 --- a/app/Http/Middleware/TokenEntrustAbility.php +++ b/app/Http/Middleware/TokenEntrustAbility.php @@ -3,7 +3,6 @@ namespace App\Http\Middleware; use Closure; -use JWTAuth; use Tymon\JWTAuth\Exceptions\JWTException; use Tymon\JWTAuth\Exceptions\TokenExpiredException; use Tymon\JWTAuth\Middleware\BaseMiddleware; diff --git a/config/app.php b/config/app.php index 9d2e4b07..4c9dc2d7 100644 --- a/config/app.php +++ b/config/app.php @@ -169,6 +169,7 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + Tymon\JWTAuth\Providers\LaravelServiceProvider::class ], /* @@ -219,6 +220,9 @@ return [ 'View' => Illuminate\Support\Facades\View::class, 'Html' => Collective\Html\HtmlFacade::class, 'Entrust' => Zizaco\Entrust\EntrustFacade::class, + 'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class, + 'JWTFactory' => Tymon\JWTAuth\Facades\JWTFactory::class, + ], ];