X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/cca1e1f30e713018035c6960761476320ae9b397..ae0d339ee9f1003b9e9cea62f18c5859d8b87b54:/Controller/CalendarController.php?ds=sidebyside

diff --git a/Controller/CalendarController.php b/Controller/CalendarController.php
index 7b61e9e..d4a9bc7 100644
--- a/Controller/CalendarController.php
+++ b/Controller/CalendarController.php
@@ -25,25 +25,25 @@ 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
 		$form = $this->createForm('Rapsys\AirBundle\Form\CalendarType', ['calendar' => $this->config['calendar']['calendar'], 'prefix' => $this->config['calendar']['prefix']], [
-			'action' => $this->generateUrl('rapsys_air_calendar'),
+			'action' => $this->generateUrl('rapsysair_calendar'),
 			'method' => 'POST'
 		]);
 
@@ -70,7 +70,7 @@ class CalendarController extends DefaultController {
 						'application_name' => $data['project'],
 						'client_id' => $data['client'],
 						'client_secret' => $data['secret'],
-						'redirect_uri' => $redirect = $this->generateUrl('rapsys_air_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
+						'redirect_uri' => $redirect = $this->generateUrl('rapsysair_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL),
 						'scopes' => [Calendar::CALENDAR, Calendar::CALENDAR_EVENTS],
 						'access_type' => 'offline',
 						'approval_prompt' => 'force'
@@ -93,7 +93,7 @@ class CalendarController extends DefaultController {
 #				$googleClient->addScope(Calendar::CALENDAR_EVENTS);
 #
 #				//Set redirect uri
-#				$googleClient->setRedirectUri($redirect = $this->generateUrl('rapsys_air_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL));
+#				$googleClient->setRedirectUri($redirect = $this->generateUrl('rapsysair_calendar_callback', [], UrlGeneratorInterface::ABSOLUTE_URL));
 #
 #				//Set offline access
 #				$googleClient->setAccessType('offline');
@@ -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);
 	}
 }