Merge Jetstream

Compability with Laravel Jetstream
OctopyID · Nov 9, 2023 · 4c9705d · 4c9705d
2 parents a3340ec + 7b33215
commit 4c9705d
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 21 deletions.
diff --git a/src/Impersonate.php b/src/Impersonate.php
@@ -3,10 +3,10 @@
 namespace Octopy\Impersonate;
 
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Contracts\Auth\Factory as Auth;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Auth;
+use Laravel\Jetstream\Jetstream;
 use Octopy\Impersonate\Concerns\HasImpersonation;
 use Octopy\Impersonate\Events\BeginImpersonation;
 use Octopy\Impersonate\Events\LeaveImpersonation;
@@ -15,11 +15,6 @@
 
 class Impersonate
 {
-    /**
-     * @var StatefulGuard
-     */
-    protected StatefulGuard $guard;
-
     /**
      * @var Repository
      */
@@ -28,15 +23,15 @@ class Impersonate
     /**
      * @var SessionStorage
      */
-    protected SessionStorage $storage;
+    protected SessionStorage $session;
 
     /**
      * Impersonate constructor.
      */
-    public function __construct()
+    public function __construct(protected Auth $auth)
     {
         $this->repository = new Repository;
-        $this->storage = new SessionStorage;
+        $this->session = new SessionStorage;
 
         $this->guard(config(
             'impersonate.guard'
@@ -51,7 +46,7 @@ public function __construct()
      */
     public function guard(string $guard) : self
     {
-        $this->guard = Auth::guard($guard);
+        $this->auth->guard($guard);
 
         return $this;
     }
@@ -61,7 +56,7 @@ public function guard(string $guard) : self
      */
     public function check() : bool
     {
-        return $this->storage->isInImpersonatingMode();
+        return $this->session->isInImpersonatingMode();
     }
 
     /**
@@ -73,7 +68,7 @@ public function authorized() : bool
             return false;
         }
 
-        return $this->guard->check() && app('impersonate.authorization')->isImpersonator($this->impersonator());
+        return $this->auth->check() && app('impersonate.authorization')->isImpersonator($this->impersonator());
     }
 
     /**
@@ -82,18 +77,18 @@ public function authorized() : bool
     public function impersonator() : Model|Authenticatable
     {
         if ($this->check()) {
-            return $this->repository->find($this->storage->getImpersonator());
+            return $this->repository->find($this->session->getImpersonator());
         }
 
-        return $this->guard->user();
+        return $this->auth->user();
     }
 
     /**
      * @return Model|Authenticatable
      */
     public function impersonated() : Model|Authenticatable
     {
-        return $this->repository->find($this->storage->getImpersonated());
+        return $this->repository->find($this->session->getImpersonated());
     }
 
     /**
@@ -108,11 +103,17 @@ public function begin(mixed $impersonator, mixed $impersonated) : Impersonate
         $impersonated = $this->fetchModel($impersonated);
 
         if ($this->validate($impersonator, $impersonated)) {
-            $this->storage
+            $this->session
                 ->setImpersonator($impersonator)
                 ->setImpersonated($impersonated);
 
-            $this->guard->login($impersonated);
+            $this->auth->login($impersonated);
+
+            if (class_exists(Jetstream::class)) {
+                $this->session->setPasswordHash(
+                    $this->auth->user()->getAuthPassword()
+                );
+            }
 
             event(new BeginImpersonation(
                 $impersonator, $impersonated
@@ -131,8 +132,14 @@ public function leave() : Impersonate
             $impersonator = $this->impersonator();
             $impersonated = $this->impersonated();
 
-            if ($this->storage->flush()) {
-                $this->guard->login($impersonator);
+            if ($this->session->flush()) {
+                $this->auth->login($impersonator);
+
+                if (class_exists(Jetstream::class)) {
+                    $this->session->setPasswordHash(
+                        $this->auth->user()->getAuthPassword()
+                    );
+                }
 
                 event(new LeaveImpersonation(
                     $impersonator, $impersonated

diff --git a/src/Storage/SessionStorage.php b/src/Storage/SessionStorage.php
@@ -2,7 +2,6 @@
 
 namespace Octopy\Impersonate\Storage;
 
-use Illuminate\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;
 
 class SessionStorage
@@ -70,4 +69,15 @@ public function flush() : bool
 
         return true;
     }
+
+    /**
+     * @param  string $password
+     * @return void
+     */
+    public function setPasswordHash(string $password) : void
+    {
+        session()->put([
+            'password_hash_sanctum' => $password,
+        ]);
+    }
 }