SSO: Fix adding user in url - refs BT#21881

Author: AngelFQC

src/CoreBundle/Security/Authenticator/OAuth2/AbstractAuthenticator.php

@@ -10,6 +10,7 @@
 use Chamilo\CoreBundle\Repository\Node\UserRepository;
 use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper;
 use Chamilo\CoreBundle\ServiceHelper\AuthenticationConfigHelper;
+use Doctrine\ORM\EntityManagerInterface;
 use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
 use KnpU\OAuth2ClientBundle\Client\OAuth2ClientInterface;
 use KnpU\OAuth2ClientBundle\Security\Authenticator\OAuth2Authenticator;
@@ -37,6 +38,7 @@ public function __construct(
         protected readonly UserRepository $userRepository,
         protected readonly AuthenticationConfigHelper $authenticationConfigHelper,
         protected readonly AccessUrlHelper $urlHelper,
+        protected readonly EntityManagerInterface $entityManager,
     ) {
         $this->client = $this->clientRegistry->getClient($this->providerName);
     }

src/CoreBundle/Security/Authenticator/OAuth2/FacebookAuthenticator.php

@@ -11,6 +11,7 @@
 use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper;
 use Chamilo\CoreBundle\ServiceHelper\AuthenticationConfigHelper;
 use Cocur\Slugify\SlugifyInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
 use League\OAuth2\Client\Provider\FacebookUser;
 use League\OAuth2\Client\Token\AccessToken;
@@ -27,6 +28,7 @@ public function __construct(
         UserRepository $userRepository,
         AuthenticationConfigHelper $authenticationConfigHelper,
         AccessUrlHelper $urlHelper,
+        EntityManagerInterface $entityManager,
         protected readonly SlugifyInterface $slugify,
     ) {
         parent::__construct(
@@ -35,6 +37,7 @@ public function __construct(
             $userRepository,
             $authenticationConfigHelper,
             $urlHelper,
+            $entityManager,
         );
     }
 
@@ -73,6 +76,8 @@ protected function userLoader(AccessToken $accessToken): User
         $url = $this->urlHelper->getCurrent();
         $url->addUser($user);
 
+        $this->entityManager->flush();
+
         return $user;
     }
 

src/CoreBundle/Security/Authenticator/OAuth2/GenericAuthenticator.php

@@ -40,17 +40,18 @@ public function __construct(
         UserRepository $userRepository,
         AuthenticationConfigHelper $authenticationConfigHelper,
         AccessUrlHelper $urlHelper,
+        EntityManagerInterface $entityManager,
         protected readonly ExtraFieldRepository $extraFieldRepository,
         protected readonly ExtraFieldValuesRepository $extraFieldValuesRepository,
         protected readonly AccessUrlRepository $accessUrlRepository,
-        protected readonly EntityManagerInterface $entityManager,
     ) {
         parent::__construct(
             $clientRegistry,
             $router,
             $userRepository,
             $authenticationConfigHelper,
             $urlHelper,
+            $entityManager,
         );
     }
 
@@ -177,6 +178,8 @@ public function saveUserInfo(User $user, array $resourceOwnerData, array $provid
 
         $url = $this->urlHelper->getCurrent();
         $url->addUser($user);
+
+        $this->entityManager->flush();
     }
 
     private function getUserStatus(array $resourceOwnerData, int $defaultStatus, array $providerParams): int

src/CoreBundle/Security/Authenticator/OAuth2/KeycloakAuthenticator.php

@@ -53,6 +53,8 @@ protected function userLoader(AccessToken $accessToken): User
         $url = $this->urlHelper->getCurrent();
         $url->addUser($user);
 
+        $this->entityManager->flush();
+
         return $user;
     }
 }