From 70c44e49440bac1d3fdcdbc035862cccb283f3c6 Mon Sep 17 00:00:00 2001
From: Axel Guckelsberger <info@guite.de>
Date: Sun, 2 Apr 2023 15:26:30 +0200
Subject: [PATCH] cs

---
 .../LegalBundle/Controller/UserController.php      | 14 ++++++++++----
 src/system/UsersBundle/Entity/User.php             |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/system/LegalBundle/Controller/UserController.php b/src/system/LegalBundle/Controller/UserController.php
index 95bd9fde10..9467867598 100644
--- a/src/system/LegalBundle/Controller/UserController.php
+++ b/src/system/LegalBundle/Controller/UserController.php
@@ -15,7 +15,9 @@
 
 use Doctrine\Persistence\ManagerRegistry;
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
+use Nucleos\UserBundle\Security\LoginManager;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -28,16 +30,21 @@
 use Zikula\ThemeBundle\Controller\Dashboard\UserDashboardController;
 use Zikula\UsersBundle\Api\ApiInterface\CurrentUserApiInterface;
 use Zikula\UsersBundle\Entity\User;
-use Zikula\UsersBundle\Helper\AccessHelper;
 use Zikula\UsersBundle\Repository\UserRepositoryInterface;
 
 #[Route('/legal')]
 class UserController extends AbstractController
 {
+    private string $firewallName;
+
     public function __construct(
         private readonly SiteDefinitionInterface $site,
-        private readonly array $legalConfig
+        private readonly array $legalConfig,
+        private readonly LoginManager $loginManager,
+        #[Autowire(service: 'nucleos_user.firewall_name')]
+        string $firewallName
     ) {
+        $this->firewallName = $firewallName;
     }
 
     /**
@@ -155,7 +162,6 @@ public function acceptPolicies(
         ManagerRegistry $doctrine,
         CurrentUserApiInterface $currentUserApi,
         UserRepositoryInterface $userRepository,
-        AccessHelper $accessHelper,
         AcceptPoliciesHelper $acceptPoliciesHelper
     ): Response {
         // Retrieve and delete any session variables being sent in by the log-in process before we give the function a chance to
@@ -200,7 +206,7 @@ public function acceptPolicies(
             }
             $doctrine->getManager()->flush();
             if ($data['acceptedpolicies_policies'] && $data['login']) {
-                $accessHelper->login($userEntity);
+                $this->loginManager->logInUser($this->firewallName, $userEntity);
             }
 
             return $this->redirectToRoute('home');
diff --git a/src/system/UsersBundle/Entity/User.php b/src/system/UsersBundle/Entity/User.php
index dad6f88b0d..7a81848df3 100644
--- a/src/system/UsersBundle/Entity/User.php
+++ b/src/system/UsersBundle/Entity/User.php
@@ -20,6 +20,7 @@
 use Nucleos\UserBundle\Validator\Constraints\Pattern as PasswordPattern;
 use Symfony\Component\Validator\Constraints as Assert;
 use Zikula\CoreBundle\Doctrine\DBAL\CustomTypes;
+use Zikula\UsersBundle\UsersConstant;
 
 // #[ORM\Entity(repositoryClass: UserRepository::class)] TODO remove if unneeded
 #[ORM\Entity]