Changed order of check

spatie · Jul 26, 2023 · 99a90ec · 99a90ec
1 parent 2355c86
commit 99a90ec
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Middlewares/PermissionMiddleware.php b/src/Middlewares/PermissionMiddleware.php
@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $permission, $guard = null)
         $user = $authGuard->user();
 
         // For machine-to-machine Passport clients
-        if (config('permission.use_passport_client_credentials') && ! $user && $request->bearerToken()) {
+        if (! $user && $request->bearerToken() && config('permission.use_passport_client_credentials')) {
             $user = Guard::getPassportClient($guard);
         }
 

diff --git a/src/Middlewares/RoleMiddleware.php b/src/Middlewares/RoleMiddleware.php
@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $role, $guard = null)
         $user = $authGuard->user();
 
         // For machine-to-machine Passport clients
-        if (config('permission.use_passport_client_credentials') && ! $user && $request->bearerToken()) {
+        if (! $user && $request->bearerToken() && config('permission.use_passport_client_credentials')) {
             $user = Guard::getPassportClient($guard);
         }
 

diff --git a/src/Middlewares/RoleOrPermissionMiddleware.php b/src/Middlewares/RoleOrPermissionMiddleware.php
@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $roleOrPermission, $guard = null
         $user = $authGuard->user();
 
         // For machine-to-machine Passport clients
-        if (config('permission.use_passport_client_credentials') && ! $user && $request->bearerToken()) {
+        if (! $user && $request->bearerToken() && config('permission.use_passport_client_credentials')) {
             $user = Guard::getPassportClient($guard);
         }