From ddc5ce10eea0aa556d248eb9a61998099f159390 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 29 Feb 2024 15:18:26 +0100 Subject: [PATCH] Replace dropped calls with checker, factory and security replacements Fix title tree Cleanup --- Controller/CalendarController.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Controller/CalendarController.php b/Controller/CalendarController.php index 7b61e9e..3e6f65d 100644 --- a/Controller/CalendarController.php +++ b/Controller/CalendarController.php @@ -25,20 +25,20 @@ class CalendarController extends DefaultController { * @return Response The rendered view */ public function index(Request $request): Response { - //Prevent non-admin to access here - $this->denyAccessUnlessGranted('ROLE_ADMIN', null, $this->translator->trans('Unable to access this page without role %role%!', ['%role%' => $this->translator->trans('Admin')])); - - //Fetch doctrine - #$doctrine = $this->getDoctrine(); - - //Set section - $section = $this->translator->trans('Calendar oauth form'); + //Without admin role + if (!$this->checker->isGranted('ROLE_ADMIN')) { + //Throw 403 + throw $this->createAccessDeniedException($this->translator->trans('Unable to access this page without role %role%!', ['%role%' => $this->translator->trans('Admin')])); + } //Set description $this->context['description'] = $this->translator->trans('Initiate calendar oauth process'); //Set title - $title = $this->translator->trans($this->config['site']['title']).' - '.$section; + $this->context['title']['page'] = $this->translator->trans('Oauth form'); + + //Set section + $this->context['title']['section'] = $this->translator->trans('Calendar'); //Create the form according to the FormType created previously. //And give the proper parameters @@ -129,7 +129,7 @@ class CalendarController extends DefaultController { } //Render template - return $this->render('@RapsysAir/calendar/index.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context); + return $this->render('@RapsysAir/calendar/index.html.twig', ['form' => $form->createView()]+$this->context); } /** @@ -152,7 +152,10 @@ class CalendarController extends DefaultController { $this->context['description'] = $this->translator->trans('Finish calendar oauth process'); //Set title - $title = $this->translator->trans($this->config['site']['title']).' - '.$section; + $this->context['title']['page'] = $this->translator->trans('Oauth callback'); + + //Set section + $this->context['title']['section'] = $this->translator->trans('Calendar'); //With code if (!empty($code = $request->get('code'))) { @@ -257,6 +260,6 @@ class CalendarController extends DefaultController { } //Render template - return $this->render('@RapsysAir/calendar/callback.html.twig', ['title' => $title, 'section' => $section]+$this->context); + return $this->render('@RapsysAir/calendar/callback.html.twig', $this->context); } } -- 2.41.1