Setting user id only if the user exist despite alive session (#428)

Co-authored-by: Artem Zherdev <[email protected]>
aimeos · Nov 14, 2021 · cbe1f8b · cbe1f8b · aimeos · Nov 14, 2021
1 parent 8c9aa7d
commit cbe1f8b
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/Aimeos/Shop/Base/Context.php b/src/Aimeos/Shop/Base/Context.php
@@ -268,12 +268,9 @@ protected function addUser( \Aimeos\MShop\Context\Item\Iface $context ) : \Aimeo
 		$key = collect( config( 'shop.routes' ) )->where( 'prefix', optional( Route::getCurrentRoute() )->getPrefix() )->keys()->first();
 		$guard = data_get( config( 'shop.guards' ), $key, Auth::getDefaultDriver() );
 
-		if( ( $userid = Auth::guard( $guard )->id() ) !== null ) {
-			$context->setUserId( $userid );
-		}
-
 		if( ( $user = Auth::guard( $guard )->user() ) !== null ) {
 			$context->setEditor( $user->name );
+			$context->setUserId( $user->id );
 		} elseif( $ip = \Request::ip() ) {
 			$context->setEditor( $ip );
 		}