Merge pull request #51 from Jubeki/swap-nova-recording-actions

Swap recording of leaving and entering impersonate actions
KABBOUCHI · May 28, 2019 · 3cfc32c · 3cfc32c
2 parents c8670e7 + bbfa9ec
commit 3cfc32c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Http/Controllers/ImpersonateController.php b/src/Http/Controllers/ImpersonateController.php
@@ -33,10 +33,6 @@ public function take(Request $request, $id)
             abort(403);
         }
 
-        if (config('nova-impersonate.actionable')) {
-            $this->recordAction($request->user()->getKey(), $user_to_impersonate, 'Impersonate');
-        }
-
         if (config('nova-impersonate.leave_before_impersonate') && $this->manager->isImpersonating()) {
             if (config('nova-impersonate.actionable')) {
                 $this->recordAction($this->manager->getImpersonatorId(), auth()->user(), 'Leave Impersonation');
@@ -45,6 +41,10 @@ public function take(Request $request, $id)
             $this->manager->leave();
         }
 
+        if (config('nova-impersonate.actionable')) {
+            $this->recordAction($request->user()->getKey(), $user_to_impersonate, 'Impersonate');
+        }
+
         $this->manager->take($request->user(), $user_to_impersonate);
 
         $redirectBack = config('nova-impersonate.redirect_back');