From 31876ee8b6200027e1456ae7639de52695f55346 Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Fri, 25 Jan 2019 15:39:44 +0100
Subject: [PATCH] wip.. EVENT_SEE and _CREATE works in twig test, not in php
 test

---
 Menu/PersonMenuBuilder.php                   | 13 +++++++++++--
 Resources/views/Event/listByPerson.html.twig |  7 +++++++
 Security/Authorization/EventVoter.php        | 15 ++++++---------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Menu/PersonMenuBuilder.php b/Menu/PersonMenuBuilder.php
index 130622c2c..7411d482b 100644
--- a/Menu/PersonMenuBuilder.php
+++ b/Menu/PersonMenuBuilder.php
@@ -4,7 +4,6 @@ namespace Chill\EventBundle\Menu;
 
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Knp\Menu\MenuItem;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\EventBundle\Security\Authorization\EventVoter;
@@ -36,7 +35,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         /* @var $person \Chill\PersonBundle\Entity\Person */
-        $person  = $parameters['person'];
+        $person  = $parameters['person'] ?? null;
         
         if ($this->authorizationChecker->isGranted(EventVoter::SEE, $person)) {
             
@@ -49,7 +48,17 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
             ->setExtras([
                 'order' => 500
             ]);
+        } 
+        ////
+        else {
+            dump('not see');
         }
+        if ($this->authorizationChecker->isGranted(EventVoter::CREATE, $person)) {
+            dump('create');
+        } else {
+            dump('not create');
+        }
+        ////
     }
     
     public static function getMenuIds(): array
diff --git a/Resources/views/Event/listByPerson.html.twig b/Resources/views/Event/listByPerson.html.twig
index f0337b300..82742674f 100644
--- a/Resources/views/Event/listByPerson.html.twig
+++ b/Resources/views/Event/listByPerson.html.twig
@@ -50,6 +50,13 @@
                 <td>
                     <ul class="record_actions">
                         <li>
+                            {% if is_granted('CHILL_EVENT_SEE', participation.event) %}
+                                see {% else %} not see
+                            {% endif %}
+                            {% if is_granted('CHILL_EVENT_CREATE', participation.event) %}
+                                create {% else %} not create
+                            {% endif %}
+
                             {% if is_granted('CHILL_EVENT_SEE_DETAILS', participation.event) %}
                                 <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="sc-button black">
                                     {{ 'See'|trans }}
diff --git a/Security/Authorization/EventVoter.php b/Security/Authorization/EventVoter.php
index c41a200b1..0cdbabfb3 100644
--- a/Security/Authorization/EventVoter.php
+++ b/Security/Authorization/EventVoter.php
@@ -87,18 +87,15 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
         }
         
         if ($subject instanceof Event) {
-            if ($subject->getId() === null) {
-                throw new \LogicException("You should associate a person with event "
-                    . "in order to check autorizations");
-            }
-            $person = $subject->getId();     // liaison event --> person
-            
+            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
+        
         } elseif ($subject instanceof Person) {
-            $person = $subject;
-            
+            return $this->authorizationHelper->userHasAccess($token->getUser(), $subject, $attribute);
+        
         } else {
             // subject is null. We check that at least one center is reachable
-            $centers = $this->authorizationHelper->getReachableCenters($token->getUser(), new Role($attribute));
+            $centers = $this->authorizationHelper
+                ->getReachableCenters($token->getUser(), new Role($attribute));
             
             return count($centers) > 0;
         }