diff --git a/app/Api/V1/Controllers/LogoutController.php b/app/Api/V1/Controllers/LogoutController.php index d8a86d4..ef3a3d5 100644 --- a/app/Api/V1/Controllers/LogoutController.php +++ b/app/Api/V1/Controllers/LogoutController.php @@ -14,7 +14,7 @@ class LogoutController extends Controller */ public function __construct() { - $this->middleware('auth:api', []); + $this->middleware('jwt.auth', []); } /** diff --git a/app/Api/V1/Controllers/UserController.php b/app/Api/V1/Controllers/UserController.php index fa8828c..4fc53bf 100644 --- a/app/Api/V1/Controllers/UserController.php +++ b/app/Api/V1/Controllers/UserController.php @@ -19,7 +19,7 @@ class UserController extends Controller */ public function __construct() { - $this->middleware('auth:api', []); + $this->middleware('jwt.auth', []); } /** diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index e7cf417..7932864 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -2,9 +2,8 @@ namespace App\Http; -use Tymon\JWTAuth\Middleware\RefreshToken; -use Tymon\JWTAuth\Middleware\GetUserFromToken; use Illuminate\Foundation\Http\Kernel as HttpKernel; +use Tymon\JWTAuth\Http\Middleware\RefreshToken; class Kernel extends HttpKernel { @@ -55,7 +54,7 @@ class Kernel extends HttpKernel 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, - 'jwt.auth' => GetUserFromToken::class, - 'jwt.refresh' => RefreshToken::class, + 'jwt.auth' => \Tymon\JWTAuth\Http\Middleware\Authenticate::class, + 'jwt.refresh' => RefreshToken::class ]; } diff --git a/tests/Functional/Api/V1/Controllers/LogoutControllerTest.php b/tests/Functional/Api/V1/Controllers/LogoutControllerTest.php index 40ed6ec..f17af04 100644 --- a/tests/Functional/Api/V1/Controllers/LogoutControllerTest.php +++ b/tests/Functional/Api/V1/Controllers/LogoutControllerTest.php @@ -36,12 +36,7 @@ public function testLogout() $responseJSON = json_decode($response->getContent(), true); $token = $responseJSON['token']; - $this->post('api/auth/logout', [], [ - 'Authorization' => 'Bearer ' . $token - ])->assertStatus(200); - - $this->post('api/auth/logout', [], [ - 'Authorization' => 'Bearer ' . $token - ])->assertStatus(500); + $this->post('api/auth/logout?token=' . $token, [], [])->assertStatus(200); + $this->post('api/auth/logout?token=' . $token, [], [])->assertStatus(401); } } diff --git a/tests/Functional/Api/V1/Controllers/UserControllerTest.php b/tests/Functional/Api/V1/Controllers/UserControllerTest.php index 3f31e1e..d3d43d0 100644 --- a/tests/Functional/Api/V1/Controllers/UserControllerTest.php +++ b/tests/Functional/Api/V1/Controllers/UserControllerTest.php @@ -36,9 +36,7 @@ public function testMe() $responseJSON = json_decode($response->getContent(), true); $token = $responseJSON['token']; - $this->get('api/auth/me', [], [ - 'Authorization' => 'Bearer ' . $token - ])->assertJson([ + $this->get('api/auth/me?token=' . $token, [], [])->assertJson([ 'name' => 'Test', 'email' => 'test@email.com' ])->isOk();