From 29961b3c7a721839b8c979dee365f94a74f452f9 Mon Sep 17 00:00:00 2001
From: SuperDJ <6484766+SuperDJ@users.noreply.github.com>
Date: Fri, 21 Jul 2023 16:53:19 +0200
Subject: [PATCH] Fix tests

---
 src/Middlewares/PermissionMiddleware.php       | 2 +-
 src/Middlewares/RoleMiddleware.php             | 2 +-
 src/Middlewares/RoleOrPermissionMiddleware.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Middlewares/PermissionMiddleware.php b/src/Middlewares/PermissionMiddleware.php
index d3491bc9..49f1c5e8 100644
--- a/src/Middlewares/PermissionMiddleware.php
+++ b/src/Middlewares/PermissionMiddleware.php
@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $permission, $guard = null)
         // For machine-to-machine Passport clients
         $bearerToken = $request->bearerToken();
         if ($bearerToken) {
-            if (! $authGuard instanceof TokenGuard) {
+            if (! $authGuard instanceof TokenGuard && !$guard) {
                 $authGuard = Auth::guard('api');
             }
 
diff --git a/src/Middlewares/RoleMiddleware.php b/src/Middlewares/RoleMiddleware.php
index 28dc3fb9..20868b14 100644
--- a/src/Middlewares/RoleMiddleware.php
+++ b/src/Middlewares/RoleMiddleware.php
@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $role, $guard = null)
         // For machine-to-machine Passport clients
         $bearerToken = $request->bearerToken();
         if ($bearerToken) {
-            if (! $authGuard instanceof TokenGuard) {
+            if (! $authGuard instanceof TokenGuard && !$guard) {
                 $authGuard = Auth::guard('api');
             }
 
diff --git a/src/Middlewares/RoleOrPermissionMiddleware.php b/src/Middlewares/RoleOrPermissionMiddleware.php
index 2fa75af2..8a4a85ca 100644
--- a/src/Middlewares/RoleOrPermissionMiddleware.php
+++ b/src/Middlewares/RoleOrPermissionMiddleware.php
@@ -16,7 +16,7 @@ public function handle($request, Closure $next, $roleOrPermission, $guard = null
         // For machine-to-machine Passport clients
         $bearerToken = $request->bearerToken();
         if ($bearerToken) {
-            if (! $authGuard instanceof TokenGuard) {
+            if (! $authGuard instanceof TokenGuard && !$guard) {
                 $authGuard = Auth::guard('api');
             }