Merge pull request #1283 from tarlepp/refactor/isgranted-attribute-in…

…stead-of-security-attribute Refactor/Attributes - Use `IsGranted` instead of `Security`
tarlepp · Jun 17, 2021 · 9364177 · 9364177
2 parents ec5db13 + f356538
commit 9364177
Show file tree

Hide file tree

Showing 56 changed files with 166 additions and 112 deletions.
diff --git a/src/ArgumentResolver/LoggedInUserValueResolver.php b/src/ArgumentResolver/LoggedInUserValueResolver.php
@@ -23,7 +23,7 @@
  * Example how to use this within your controller;
  *
  *  #[Route(path: 'some-path')]
- *  #[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+ *  #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
  *  public function someMethod(\App\Entity\User $loggedInUser): Response
  *  {
  *      ...

diff --git a/src/Controller/ApiKeyController.php b/src/Controller/ApiKeyController.php
@@ -15,8 +15,9 @@
 use App\Rest\Controller;
 use App\Rest\Traits\Actions;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Class ApiKeyController
@@ -31,7 +32,7 @@
 #[Route(
     path: '/api_key',
 )]
-#[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+#[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
 class ApiKeyController extends Controller
 {
     use Actions\Root\CountAction;

diff --git a/src/Controller/Profile/GroupsController.php b/src/Controller/Profile/GroupsController.php
@@ -12,10 +12,11 @@
 use App\Entity\UserGroup;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -88,7 +89,7 @@ public function __construct(
         path: '/profile/groups',
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+    #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
     public function __invoke(User $loggedInUser): JsonResponse
     {
         return new JsonResponse(

diff --git a/src/Controller/Profile/IndexController.php b/src/Controller/Profile/IndexController.php
@@ -14,10 +14,11 @@
 use JsonException;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -78,7 +79,7 @@ public function __construct(
         path: '/profile',
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+    #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
     public function __invoke(User $loggedInUser): JsonResponse
     {
         /** @var array<string, string|array<string, string>> $output */

diff --git a/src/Controller/Profile/RolesController.php b/src/Controller/Profile/RolesController.php
@@ -11,10 +11,11 @@
 use App\Entity\User;
 use App\Security\RolesService;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Class RolesController
@@ -69,7 +70,7 @@ public function __construct(
         path: '/profile/roles',
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+    #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
     public function __invoke(User $loggedInUser): JsonResponse
     {
         return new JsonResponse($this->rolesService->getInheritedRoles($loggedInUser->getRoles()));

diff --git a/src/Controller/Role/FindOneRoleController.php b/src/Controller/Role/FindOneRoleController.php
@@ -12,10 +12,11 @@
 use App\Rest\Controller;
 use App\Rest\Traits\Methods;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 use Throwable;
 
 /**
@@ -43,7 +44,7 @@ public function __construct(
         requirements: ['role' => '^ROLE_\w+$'],
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+    #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
     public function __invoke(Request $request, string $role): Response
     {
         return $this->findOneMethod($request, $role);

diff --git a/src/Controller/Role/InheritedRolesController.php b/src/Controller/Role/InheritedRolesController.php
@@ -12,11 +12,12 @@
 use App\Resource\RoleResource;
 use App\Security\RolesService;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Class InheritedRolesController
@@ -76,7 +77,7 @@ public function __construct(
         requirements: ['role' => '^ROLE_\w+$'],
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+    #[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
     #[ParamConverter(
         data: 'role',
         class: RoleResource::class,

diff --git a/src/Controller/Role/RoleController.php b/src/Controller/Role/RoleController.php
@@ -12,8 +12,9 @@
 use App\Rest\Controller;
 use App\Rest\Traits\Actions;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Class RoleController
@@ -28,7 +29,7 @@
 #[Route(
     path: '/role',
 )]
-#[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+#[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
 class RoleController extends Controller
 {
     use Actions\Admin\CountAction;

diff --git a/src/Controller/User/AttachUserGroupController.php b/src/Controller/User/AttachUserGroupController.php
@@ -12,10 +12,11 @@
 use App\Entity\UserGroup;
 use App\Resource\UserGroupResource;
 use App\Resource\UserResource;
+use App\Security\RolesService;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -133,7 +134,7 @@ public function __construct(
         ],
         methods: [Request::METHOD_POST],
     )]
-    #[Security('is_granted("ROLE_ROOT")')]
+    #[IsGranted(RolesService::ROLE_ROOT)]
     #[ParamConverter(
         data: 'user',
         class: UserResource::class,

diff --git a/src/Controller/User/DeleteUserController.php b/src/Controller/User/DeleteUserController.php
@@ -12,9 +12,10 @@
 use App\Resource\UserResource;
 use App\Rest\Controller;
 use App\Rest\Traits\Methods;
+use App\Security\RolesService;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -48,7 +49,7 @@ public function __construct(
         ],
         methods: [Request::METHOD_DELETE],
     )]
-    #[Security('is_granted("ROLE_ROOT")')]
+    #[IsGranted(RolesService::ROLE_ROOT)]
     #[ParamConverter(
         data: 'requestUser',
         class: UserResource::class,

diff --git a/src/Controller/User/DetachUserGroupController.php b/src/Controller/User/DetachUserGroupController.php
@@ -12,13 +12,13 @@
 use App\Entity\UserGroup;
 use App\Resource\UserGroupResource;
 use App\Resource\UserResource;
+use App\Security\RolesService;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Serializer\SerializerInterface;
 use Throwable;
@@ -120,7 +120,7 @@ public function __construct(
         ],
         methods: [Request::METHOD_DELETE],
     )]
-    #[Security('is_granted("ROLE_ROOT")')]
+    #[IsGranted(RolesService::ROLE_ROOT)]
     #[ParamConverter(
         data: 'user',
         class: UserResource::class,

diff --git a/src/Controller/User/UserController.php b/src/Controller/User/UserController.php
@@ -15,8 +15,9 @@
 use App\Rest\Controller;
 use App\Rest\Traits\Actions;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Class UserController
@@ -31,7 +32,7 @@
 #[Route(
     path: '/user',
 )]
-#[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+#[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
 class UserController extends Controller
 {
     use Actions\Admin\CountAction;

diff --git a/src/Controller/UserGroup/AttachUserController.php b/src/Controller/UserGroup/AttachUserController.php
@@ -12,10 +12,11 @@
 use App\Entity\UserGroup;
 use App\Resource\UserGroupResource;
 use App\Resource\UserResource;
+use App\Security\RolesService;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -121,7 +122,7 @@ public function __construct(
         ],
         methods: [Request::METHOD_POST],
     )]
-    #[Security('is_granted("ROLE_ROOT")')]
+    #[IsGranted(RolesService::ROLE_ROOT)]
     #[ParamConverter(
         data: 'userGroup',
         class: UserGroupResource::class,

diff --git a/src/Controller/UserGroup/DetachUserController.php b/src/Controller/UserGroup/DetachUserController.php
@@ -12,10 +12,11 @@
 use App\Entity\UserGroup;
 use App\Resource\UserGroupResource;
 use App\Resource\UserResource;
+use App\Security\RolesService;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -108,7 +109,7 @@ public function __construct(
         ],
         methods: [Request::METHOD_DELETE],
     )]
-    #[Security('is_granted("ROLE_ROOT")')]
+    #[IsGranted(RolesService::ROLE_ROOT)]
     #[ParamConverter(
         data: 'userGroup',
         class: UserGroupResource::class,

diff --git a/src/Controller/UserGroup/UserGroupController.php b/src/Controller/UserGroup/UserGroupController.php
@@ -15,8 +15,9 @@
 use App\Rest\Controller;
 use App\Rest\Traits\Actions;
 use OpenApi\Annotations as OA;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 
 /**
  * Class UserGroupController
@@ -31,7 +32,7 @@
 #[Route(
     path: '/user_group',
 )]
-#[Security('is_granted("IS_AUTHENTICATED_FULLY")')]
+#[IsGranted(AuthenticatedVoter::IS_AUTHENTICATED_FULLY)]
 class UserGroupController extends Controller
 {
     use Actions\Admin\CountAction;

diff --git a/src/Controller/UserGroup/UsersController.php b/src/Controller/UserGroup/UsersController.php
@@ -13,10 +13,11 @@
 use App\Resource\UserGroupResource;
 use App\Resource\UserResource;
 use App\Rest\ResponseHandler;
+use App\Security\RolesService;
 use Nelmio\ApiDocBundle\Annotation\Model;
 use OpenApi\Annotations as OA;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -84,7 +85,7 @@ public function __construct(
         ],
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("ROLE_ADMIN")')]
+    #[IsGranted(RolesService::ROLE_ADMIN)]
     #[ParamConverter(
         data: 'userGroup',
         class: UserGroupResource::class,

diff --git a/src/Rest/Traits/Actions/Admin/CountAction.php b/src/Rest/Traits/Actions/Admin/CountAction.php
@@ -9,7 +9,8 @@
 namespace App\Rest\Traits\Actions\Admin;
 
 use App\Rest\Traits\Methods\CountMethod;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use App\Security\RolesService;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -36,7 +37,7 @@ trait CountAction
         path: '/count',
         methods: [Request::METHOD_GET],
     )]
-    #[Security('is_granted("ROLE_ADMIN")')]
+    #[IsGranted(RolesService::ROLE_ADMIN)]
     public function countAction(Request $request): Response
     {
         return $this->countMethod($request);

diff --git a/src/Rest/Traits/Actions/Admin/CreateAction.php b/src/Rest/Traits/Actions/Admin/CreateAction.php
@@ -10,7 +10,8 @@
 
 use App\DTO\RestDtoInterface;
 use App\Rest\Traits\Methods\CreateMethod;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use App\Security\RolesService;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -37,7 +38,7 @@ trait CreateAction
         path: '',
         methods: [Request::METHOD_POST],
     )]
-    #[Security('is_granted("ROLE_ADMIN")')]
+    #[IsGranted(RolesService::ROLE_ADMIN)]
     public function createAction(Request $request, RestDtoInterface $restDto): Response
     {
         return $this->createMethod($request, $restDto);

diff --git a/src/Rest/Traits/Actions/Admin/DeleteAction.php b/src/Rest/Traits/Actions/Admin/DeleteAction.php
@@ -9,7 +9,8 @@
 namespace App\Rest\Traits\Actions\Admin;
 
 use App\Rest\Traits\Methods\DeleteMethod;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use App\Security\RolesService;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -39,7 +40,7 @@ trait DeleteAction
         ],
         methods: [Request::METHOD_DELETE],
     )]
-    #[Security('is_granted("ROLE_ADMIN")')]
+    #[IsGranted(RolesService::ROLE_ADMIN)]
     public function deleteAction(Request $request, string $id): Response
     {
         return $this->deleteMethod($request, $id);