Ensure middleware and reverse ui uses the correct guard when dealing …

…with multiple guard impersonation
KABBOUCHI · Nov 12, 2021 · 03f3d4e · 03f3d4e
1 parent 5e1163e
commit 03f3d4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/resources/views/reverse.blade.php b/resources/views/reverse.blade.php
@@ -26,8 +26,8 @@
     "
 >
     <p>
-        @if( auth()->user()->name )
-            {{ __('Impersonating as') }} {{ auth()->user()->name }}
+        @if( auth($impersonatorGuardName)->user()->name )
+            {{ __('Impersonating as') }} {{ auth($impersonatorGuardName)->user()->name }}
         @endif
     </p>
 

diff --git a/src/Http/Middleware/Impersonate.php b/src/Http/Middleware/Impersonate.php
@@ -23,11 +23,11 @@ public function handle($request, $next)
         $response = $next($request);
 
         $manager = app('impersonate');
-
+        $impersonatorGuardName = $manager->getImpersonatorGuardUsingName();
         if (
             $manager->isImpersonating() &&
 
-            auth()->check() &&
+            auth($impersonatorGuardName)->check() &&
 
             ! ($response instanceof RedirectResponse) &&
 
@@ -47,7 +47,9 @@ public function handle($request, $next)
             /** @var Response $response * */
             $content = $response->getContent();
 
-            $content .= view('nova-impersonate::reverse')->render();
+            $content .= view('nova-impersonate::reverse', [
+                'impersonatorGuardName' => $impersonatorGuardName,
+            ])->render();
 
             $response->setContent($content);
         }