[BF] - admin 'log on as this user' updates last login date - fixes #652

inex · Jun 11, 2020 · 526da5b · 526da5b
1 parent 90c48a3
commit 526da5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Controllers/Auth/SwitchUserController.php b/app/Http/Controllers/Auth/SwitchUserController.php
@@ -67,12 +67,12 @@ public function switch( int $id ){
  AlertContainer::push( "This user doesnt have customer associated.", Alert::DANGER );
  return redirect()->to( "/" );
  }
-
- Auth::login( $nuser );
-
+
  session()->put( "switched_user_from", $user->getId() );
  session()->put( "redirect_after_switch_back", request()->headers->get('referer', "" ) );
 
+ Auth::login( $nuser );
+
  AlertContainer::push( "You are now logged in as {$nuser->getUsername()} ". "(" . Auth::getUser()->getName() . ")", Alert::SUCCESS );
 
  return redirect()->to( "/" );

diff --git a/app/Listeners/Auth/LoginSuccessful.php b/app/Listeners/Auth/LoginSuccessful.php
@@ -38,7 +38,7 @@ class LoginSuccessful {
  */
  public function handle( LoginEvent $e )
  {
- if( $e->user->getCurrentCustomerToUser() ) {
+ if( !session()->exists( "switched_user_from" ) && $e->user->getCurrentCustomerToUser() ) {
  if( Auth::viaRemember() ) {
  $e->user->getCurrentCustomerToUser()->setLastLoginVia( 'RememberMe' );
  } else {