Merge pull request #6622 from christianbeeznest/GH-2791

User: Associate new users to current AccessUrl - refs #2791

Author: christianbeeznest

src/CoreBundle/Entity/Listener/UserListener.php

@@ -8,6 +8,7 @@
 
 use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\User;
+use Chamilo\CoreBundle\Helpers\AccessUrlHelper;
 use Chamilo\CoreBundle\Repository\Node\UserRepository;
 use Doctrine\ORM\Event\PrePersistEventArgs;
 use Doctrine\ORM\Event\PreRemoveEventArgs;
@@ -21,7 +22,8 @@ class UserListener
     public function __construct(
         private UserRepository $userRepository,
         private Security $security,
-        private readonly TranslatorInterface $translator
+        private readonly TranslatorInterface $translator,
+        private AccessUrlHelper $accessUrlHelper
     ) {}
 
     /**
@@ -32,6 +34,13 @@ public function prePersist(User $user, PrePersistEventArgs $args): void
         $this->userRepository->updateCanonicalFields($user);
         $this->userRepository->updatePassword($user);
 
+        if ($user->getPortals()->isEmpty()) {
+            $currentUrl = $this->accessUrlHelper->getCurrent();
+            if (null !== $currentUrl) {
+                $user->setCurrentUrl($currentUrl);
+            }
+        }
+
         if ($user->isSkipResourceNode()) {
             return;
         }

src/CoreBundle/Resources/config/listeners.yml

@@ -87,8 +87,13 @@ services:
 
     # When the User entity is created/updated        -
     Chamilo\CoreBundle\Entity\Listener\UserListener:
-        tags:
-            - {name: doctrine.orm.entity_listener, entity_manager: default, lazy: true}
+      arguments:
+        - '@Chamilo\CoreBundle\Repository\Node\UserRepository'
+        - '@security.helper'
+        - '@translator'
+        - '@Chamilo\CoreBundle\Helpers\AccessUrlHelper'
+      tags:
+        - { name: doctrine.orm.entity_listener, entity_manager: default, lazy: true }
 
     Chamilo\CoreBundle\Entity\Listener\UserRelUserListener:
         tags: