From: Raphaƫl Gertz Date: Thu, 29 Feb 2024 14:19:05 +0000 (+0100) Subject: Replace dropped calls with checker, factory and security replacements X-Git-Tag: 0.3.0~23 X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/2361fd9ab05767886f84cde6f8b3199fd323ebf7?hp=ddc5ce10eea0aa556d248eb9a61998099f159390 Replace dropped calls with checker, factory and security replacements --- diff --git a/Controller/UserController.php b/Controller/UserController.php index 8dc6d65..ecbddb3 100644 --- a/Controller/UserController.php +++ b/Controller/UserController.php @@ -38,14 +38,14 @@ class UserController extends BaseUserController { } //Prevent access when not admin, user is not guest and not currently logged user - if (!$this->isGranted('ROLE_ADMIN') && $user != $this->getUser() || !$this->isGranted('IS_AUTHENTICATED_FULLY')) { + if (!$this->checker->isGranted('ROLE_ADMIN') && $user != $this->security->getUser() || !$this->checker->isGranted('IS_AUTHENTICATED_FULLY')) { //Throw access denied //XXX: prevent slugger reverse engineering by not displaying decoded mail throw $this->createAccessDeniedException($this->translator->trans('Unable to access user: %mail%', ['%mail%' => $smail])); } //Create the RegisterType form and give the proper parameters - $edit = $this->createForm($this->config['edit']['view']['edit'], $user, [ + $edit = $this->factory->create($this->config['edit']['view']['edit'], $user, [ //Set action to register route name and context 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']), //Set civility class @@ -59,9 +59,9 @@ class UserController extends BaseUserController { //Set country favorites 'country_favorites' => $this->doctrine->getRepository($this->config['class']['country'])->findByTitle($this->config['default']['country_favorites']), //Disable mail - 'mail' => $this->isGranted('ROLE_ADMIN'), + 'mail' => $this->checker->isGranted('ROLE_ADMIN'), //Disable pseudonym - 'pseudonym' => $this->isGranted('ROLE_GUEST'), + 'pseudonym' => $this->checker->isGranted('ROLE_GUEST'), //Disable password 'password' => false, //Set method @@ -69,9 +69,9 @@ class UserController extends BaseUserController { ]+$this->config['edit']['field']); //With admin role - if ($this->isGranted('ROLE_ADMIN')) { + if ($this->checker->isGranted('ROLE_ADMIN')) { //Create the LoginType form and give the proper parameters - $reset = $this->createForm($this->config['edit']['view']['reset'], $user, [ + $reset = $this->factory->create($this->config['edit']['view']['reset'], $user, [ //Set action to register route name and context 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']), //Disable mail @@ -142,7 +142,7 @@ class UserController extends BaseUserController { } //Without admin role //XXX: prefer a reset on login to force user unspam action - } elseif (!$this->isGranted('ROLE_ADMIN')) { + } elseif (!$this->checker->isGranted('ROLE_ADMIN')) { //Add notice $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure')); }