Converts IsGranted to new attribute

SchulIT · Jul 28, 2024 · 83ca8b9 · 83ca8b9
1 parent 086377e
commit 83ca8b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Controller/Api/ActiveDirectoryConnectController.php b/src/Controller/Api/ActiveDirectoryConnectController.php
@@ -12,11 +12,11 @@
 use App\Security\UserCreator;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Attributes as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use App\Response\ActiveDirectoryUser as ActiveDirectoryUserResponse;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 /**
  * Endpunkte für den Active Directory Connect Client

diff --git a/src/Controller/MarkdownController.php b/src/Controller/MarkdownController.php
@@ -3,11 +3,11 @@
 namespace App\Controller;
 
 use League\CommonMark\MarkdownConverterInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[IsGranted('ROLE_ADMIN')]
 class MarkdownController extends AbstractController {

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
@@ -29,8 +29,8 @@
 use DateTime;
 use SchulIT\CommonBundle\Form\ConfirmType;
 use SchulIT\CommonBundle\Utils\RefererHelper;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -39,6 +39,11 @@
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+#[IsGranted(
+    new Expression(
+        "is_granted('ROLE_ADMIN') or is_granted('ROLE_PASSWORD_MANAGER')"
+    )
+)]
 class UserController extends AbstractController {
 
     use AttributeDataTrait;
@@ -107,7 +112,6 @@ private function internalDisplay(Request $request, UserTypeFilter $typeFilter, U
     }
 
     #[Route(path: '/users', name: 'users')]
-    #[Security("is_granted('ROLE_ADMIN') or is_granted('ROLE_PASSWORD_MANAGER')")]
     public function index(Request $request, UserTypeFilter $typeFilter, UserRoleFilter $roleFilter): Response {
         return $this->internalDisplay($request, $typeFilter, $roleFilter, false);
     }