Charles-Edouard
/
Easy_solution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review of access logic

This commit is contained in:
Charles 2025-08-07 12:06:31 +02:00
parent 9da1edaa92
commit ccd44e3560
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Controller/UserController.php
View File

@ -165,33 +165,60 @@ class UserController extends AbstractController
#[Route('/edit/{id}', name: 'edit', requirements: ['id' => '\d+'], methods: ['GET', 'PUT', 'POST'])] #[Route('/edit/{id}', name: 'edit', requirements: ['id' => '\d+'], methods: ['GET', 'PUT', 'POST'])]
public function edit(int $id, EntityManagerInterface $entityManager, Request $request): Response public function edit(int $id, EntityManagerInterface $entityManager, Request $request): Response
{ {
//Handle access control // Fetch user by ID and handle not found case
if (!$this->isGranted('ROLE_SUPER_ADMIN')) {
throw $this->createAccessDeniedException(self::ACCESS_DENIED);
}
//Fetch user by ID and handle not found case
$user = $entityManager->getRepository(User::class)->find($id); $user = $entityManager->getRepository(User::class)->find($id);
if (!$user) { if (!$user) {
throw $this->createNotFoundException(self::NOT_FOUND); throw $this->createNotFoundException(self::NOT_FOUND);
} }
//Create form for editing user // Get the acting user (the one making the request)
$actingUser = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND);
$actingUser = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $actingUser->getUserIdentifier()]);
// Check if acting user is the same as the user being edited
$isSameUser = $user->getUserIdentifier() === $actingUser->getUserIdentifier();
// Get all organizations of the user being edited
$userOrganizations = $this->userOrganizationService->getUserOrganizations($user);
// Check if acting user is admin in any of the user's organizations
$isAdminOrg = false;
foreach ($userOrganizations as $userOrganization) {
$organization = $userOrganization['organization'];
if ($this->userService->isUserAdminInOrganization($actingUser->getId(), $organization->getId())) {
$isAdminOrg = true;
break;
}
}
// Access control: allow if super admin, same user, or admin in org
if (
!$this->isGranted('ROLE_SUPER_ADMIN') &&
!$isSameUser &&
!$isAdminOrg
) {
throw $this->createAccessDeniedException(self::ACCESS_DENIED);
}
// Create form for editing user
$form = $this->createForm(UserForm::class, $user); $form = $this->createForm(UserForm::class, $user);
//Handle form submission // Handle form submission
$form->handleRequest($request); $form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) { if ($form->isSubmitted() && $form->isValid()) {
//Persist changes to the user entity // Persist changes to the user entity
$entityManager->persist($user); $entityManager->persist($user);
//Log the action
$user = $this->getUser() ?? throw $this->createNotFoundException(self::NOT_FOUND); // Log the action
$user = $this->entityManager->getRepository(User::class)->findOneBy(['email' => $user->getUserIdentifier()]); $this->actionService->createAction(
$this->actionService->createAction("Création d'une organisation", $user, null, "{$user->getIdentifier()} a modifié l'utilisateur {$user->getUserIdentifier()}"); "Modification d'un utilisateur",
$actingUser,
null,
"{$actingUser->getIdentifier()} a modifié l'utilisateur {$user->getUserIdentifier()}"
);
$entityManager->flush(); $entityManager->flush();
//Redirect to user profile after successful edit // Redirect to user profile after successful edit
return $this->redirectToRoute('user_show', ['id' => $user->getId()]); return $this->redirectToRoute('user_show', ['id' => $user->getId()]);
} }