Fix tests

spatie · Jul 21, 2023 · 29961b3 · 29961b3
1 parent 707712d
commit 29961b3
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)
  // 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
@@ -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
@@ -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');
  }