Revert "comptoir access : instead of allowing all requests from UserAdmin…

Revert "comptoir access : instead of allowing all requests from UserAdmin object, only allow to show password in general user form, which is sufficient to change it ; add tav_env condition"

This reverts commit a6401cfe.

src/Application/Sonata/UserBundle/Admin/UserAdmin.php

@@ -194,10 +194,7 @@ class UserAdmin extends BaseUserAdmin
                     ->add('username')
                     ->add('email')
         ;
-        if (
-            'dev' == $_ENV['APP_ENV'] && ($this->isGranted('ROLE_SUPER_ADMIN')
-                || $this->getSecurityHandler()->grantChangeAdherentPasswordToNonSuperAdmin('ROLE_CHANGE_ADHERENT_PERSONAL_DATA'))
-        ) {
+        if ('dev' == $_ENV['APP_ENV'] && $this->isGranted('ROLE_SUPER_ADMIN')) {
             $formMapper
                 ->add('plainPassword', RepeatedType::class, [
                     'type' => PasswordType::class,

src/Security/Handler/VoterSecurityHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Security\Handler;
 
+use App\Application\Sonata\UserBundle\Admin\UserAdmin;
 use App\Entity\GlobalParameter;
 use App\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
@@ -45,7 +46,7 @@ class VoterSecurityHandler extends RoleSecurityHandler
             return $this->isAnyGranted($this->superAdminRoles)
                 || $this->isAnyGranted($attributes, $object)
                 || $this->isAnyGranted([$allRole], $object)
-                || $this->allowToModifyAdherentPersonalData($object);
+                || $this->allowToChangeAdherentPersonalData($object);
         } catch (AuthenticationCredentialsNotFoundException $e) {
             return false;
         }
@@ -67,15 +68,11 @@ class VoterSecurityHandler extends RoleSecurityHandler
         return false;
     }
 
-    private function allowToModifyAdherentPersonalData($object): bool
+    private function allowToChangeAdherentPersonalData($object): bool
     {
-        return $_ENV['TAV_ENV']
-            && $object instanceof User && $object->getAdherent()
-            && $this->authorizationChecker->isGranted('ROLE_CHANGE_ADHERENT_PERSONAL_DATA');
-    }
-
-    public function grantChangeAdherentPasswordToNonSuperAdmin($str): bool
-    {
-        return $_ENV['TAV_ENV'] && ($str === 'ROLE_CHANGE_ADHERENT_PERSONAL_DATA');
+        //var_dump(get_class($object));
+        $res = (($object instanceof User && $object->getAdherent()) || ($object instanceof UserAdmin)) && $this->authorizationChecker->isGranted('ROLE_CHANGE_ADHERENT_PERSONAL_DATA');
+        //var_dump($res);
+        return $res;
     }
 }