diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php index 9b2a988..e155d2a 100644 --- a/src/Controller/SecurityController.php +++ b/src/Controller/SecurityController.php @@ -144,6 +144,7 @@ class SecurityController extends AbstractController if ($uo) { $uo->setStatut("ACCEPTED"); $uo->setIsActive(true); + $user->setIsActive(true); $this->entityManager->persist($uo); $this->entityManager->flush(); $this->loggerService->logOrganizationInformation($orgId, $user->getId(), 'User accepted organization invitation during password reset.'); diff --git a/src/Service/UserService.php b/src/Service/UserService.php index bc28352..06c6c70 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -596,7 +596,7 @@ class UserService // Generate token here if it's part of the user persistence flow $token = $this->generatePasswordToken($user); - + $user->setisActive(false); $this->entityManager->persist($user); $this->entityManager->flush(); diff --git a/templates/organization/edit.html.twig b/templates/organization/edit.html.twig index bd1b225..8f93d6a 100644 --- a/templates/organization/edit.html.twig +++ b/templates/organization/edit.html.twig @@ -8,7 +8,7 @@