From 3a4f70f9080035c24635f45c465f284e11cbcef4 Mon Sep 17 00:00:00 2001 From: Joel von Allmen Date: Mon, 28 Feb 2022 23:08:10 +0100 Subject: [PATCH] decouple user models with interface --- src/Http/Middleware/Stateful/Authenticate.php | 2 +- src/Http/Middleware/Stateful/AuthenticateOptional.php | 2 +- src/Http/Middleware/Stateless/Authorize.php | 2 +- src/Http/Middleware/Stateless/AuthorizeOptional.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Http/Middleware/Stateful/Authenticate.php b/src/Http/Middleware/Stateful/Authenticate.php index a8c59243..00a4e932 100644 --- a/src/Http/Middleware/Stateful/Authenticate.php +++ b/src/Http/Middleware/Stateful/Authenticate.php @@ -22,7 +22,7 @@ public function handle( ) { $user = auth()->guard('auth0')->user(); - if ($user !== null && $user instanceof \Auth0\Laravel\Model\Stateful\User) { + if ($user !== null && $user instanceof \Auth0\Laravel\Contract\Model\Stateful\User) { auth()->guard('auth0')->login($user); return $next($request); } diff --git a/src/Http/Middleware/Stateful/AuthenticateOptional.php b/src/Http/Middleware/Stateful/AuthenticateOptional.php index de4daaa9..d7e93ae0 100644 --- a/src/Http/Middleware/Stateful/AuthenticateOptional.php +++ b/src/Http/Middleware/Stateful/AuthenticateOptional.php @@ -22,7 +22,7 @@ public function handle( ) { $user = auth()->guard('auth0')->user(); - if ($user !== null && $user instanceof \Auth0\Laravel\Model\Stateful\User) { + if ($user !== null && $user instanceof \Auth0\Laravel\Contract\Model\Stateful\User) { auth()->guard('auth0')->login($user); } diff --git a/src/Http/Middleware/Stateless/Authorize.php b/src/Http/Middleware/Stateless/Authorize.php index c16354c7..eca524d9 100644 --- a/src/Http/Middleware/Stateless/Authorize.php +++ b/src/Http/Middleware/Stateless/Authorize.php @@ -22,7 +22,7 @@ public function handle( ) { $user = auth()->guard('auth0')->user(); - if ($user !== null && $user instanceof \Auth0\Laravel\Model\Stateless\User) { + if ($user !== null && $user instanceof \Auth0\Laravel\Contract\Model\Stateless\User) { if (strlen($scope) >= 1 && auth()->guard('auth0')->hasScope($scope) === false) { return abort(403, 'Unauthorized'); } diff --git a/src/Http/Middleware/Stateless/AuthorizeOptional.php b/src/Http/Middleware/Stateless/AuthorizeOptional.php index 24336569..1ae72a50 100644 --- a/src/Http/Middleware/Stateless/AuthorizeOptional.php +++ b/src/Http/Middleware/Stateless/AuthorizeOptional.php @@ -20,7 +20,7 @@ public function handle( ) { $user = auth()->guard('auth0')->user(); - if ($user !== null && $user instanceof \Auth0\Laravel\Model\Stateless\User) { + if ($user !== null && $user instanceof \Auth0\Laravel\Contract\Model\Stateless\User) { auth()->guard('auth0')->login($user); }