Fix impersonated method

Author: ukeloop

src/Guards/ImpersonatableSessionGuard.php

@@ -17,11 +17,9 @@ class ImpersonatableSessionGuard extends BaseSessionGuard implements Impersonata
 {
     protected ?AuthenticatableContract $originalUser = null;
 
-    protected bool $impersonated = false;
-
     public function impersonate(AuthenticatableContract $user): void
     {
-        $originalUser = $this->impersonated ? $this->originalUser() : $this->user();
+        $originalUser = $this->impersonated() ? $this->originalUser() : $this->user();
 
         $this->updateImpersonateSession($originalUser?->getAuthIdentifier());
 
@@ -34,7 +32,7 @@ public function impersonate(AuthenticatableContract $user): void
 
     public function onceImpersonate(AuthenticatableContract $user): void
     {
-        $originalUser = $this->impersonated ? $this->originalUser() : $this->user();
+        $originalUser = $this->impersonated() ? $this->originalUser() : $this->user();
 
         $this->setOriginalUser($originalUser);
 
@@ -57,8 +55,6 @@ public function exitImpersonation(): void
         $this->fireExitImpersonationEvent(user: $impersonatedUser, originalUser: $originalUser);
 
         $this->originalUser = null;
-
-        $this->impersonated = false;
     }
 
     protected function updateImpersonateSession(mixed $id): void
@@ -72,8 +68,6 @@ public function setOriginalUser(?AuthenticatableContract $originalUser): static
     {
         $this->originalUser = $originalUser;
 
-        $this->impersonated = true;
-
         if ($this->originalUser) {
             $this->fireImpersonatedEvent(originalUser: $this->originalUser);
         }
@@ -83,14 +77,14 @@ public function setOriginalUser(?AuthenticatableContract $originalUser): static
 
     public function originalUser(): ?AuthenticatableContract
     {
-        if (! $this->impersonated) {
-            return null;
-        }
-
         if (! is_null($this->originalUser)) {
             return $this->originalUser;
         }
 
+        if (! $this->impersonated()) {
+            return null;
+        }
+
         $id = $this->session->get($this->getOriginalUserName());
 
         if (! is_null($id) && $this->originalUser = $this->getProvider()->retrieveById($id)) {
@@ -102,7 +96,7 @@ public function originalUser(): ?AuthenticatableContract
 
     public function impersonated(): bool
     {
-        return $this->impersonated;
+        return $this->session->exists($this->getOriginalUserName());
     }
 
     /**

tests/Guards/ImpersonatableSessionGuardTest.php

@@ -171,6 +171,29 @@ public function it_exit_impersonation_with_original_user(): void
         Event::assertDispatched(fn (ExitImpersonation $e) => $e->guard === $guard && $user->is($e->user) && $originalUser->is($e->originalUser));
     }
 
+    #[Test]
+    public function it_can_set_set_original_user(): void
+    {
+        $guard = 'testbentch';
+
+        $impersonatableGuard = Auth::guard($guard);
+
+        $this->assertInstanceOf(ImpersonatableSessionGuard::class, $impersonatableGuard);
+
+        /** @var User $user */
+        $user = User::query()->forceCreate([
+            'name' => 'user',
+            'email' => 'user@localhost',
+            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+        ]);
+
+        $this->assertNull($impersonatableGuard->originalUser());
+
+        $impersonatableGuard->setOriginalUser($user);
+
+        $this->assertTrue($user->is($impersonatableGuard->originalUser()));
+    }
+
     #[Test]
     public function it_inherits_base_guard_session(): void
     {