Restructure security and icon services

pimcore · Apr 25, 2024 · 64bd343 · 64bd343
1 parent 52131c6
commit 64bd343
Show file tree

Hide file tree

Showing 29 changed files with 38 additions and 33 deletions.
diff --git a/config/icon.yaml b/config/icon.yaml
@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconService
diff --git a/config/security.yaml b/config/security.yaml
@@ -15,5 +15,5 @@ services:
     tags:
       - { name: security.voter }
 
-  Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Service\SecurityService
+  Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityService
diff --git a/config/services.yaml b/config/services.yaml
@@ -20,10 +20,6 @@ services:
         tags: [ 'controller.service_arguments' ]
 
 
-    Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface:
-        class: Pimcore\Bundle\StudioBackendBundle\Service\IconService
-
-
 
 
 

diff --git a/src/Asset/Controller/CollectionController.php b/src/Asset/Controller/CollectionController.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\Asset\Controller;
 
 use OpenApi\Attributes\Get;
-use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParameters;

diff --git a/src/Asset/Controller/GetController.php b/src/Asset/Controller/GetController.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\Asset\Controller;
 
 use OpenApi\Attributes\Get;
-use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content\OneOfAssetJson;

diff --git a/src/Authorization/Controller/AuthorizationController.php b/src/Authorization/Controller/AuthorizationController.php
@@ -22,7 +22,7 @@
 use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Refresh;
 use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Token;
 use Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenServiceInterface;
-use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request\CredentialsRequestBody;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request\TokenRequestBody;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
@@ -31,7 +31,7 @@
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
-use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface;
+use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
 use Pimcore\Security\User\User;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;

diff --git a/src/Controller/Api/AbstractApiController.php → src/Controller/AbstractApiController.php b/src/Controller/Api/AbstractApiController.php → src/Controller/AbstractApiController.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Controller\Api;
+namespace Pimcore\Bundle\StudioBackendBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;

diff --git a/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php b/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class ArchiveHydrator implements ArchiveHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/AudioHydrator.php b/src/DataIndex/Hydrator/Asset/AudioHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class AudioHydrator implements AudioHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/DocumentHydrator.php b/src/DataIndex/Hydrator/Asset/DocumentHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class DocumentHydrator implements DocumentHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/FolderHydrator.php b/src/DataIndex/Hydrator/Asset/FolderHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class FolderHydrator implements FolderHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/ImageHydrator.php b/src/DataIndex/Hydrator/Asset/ImageHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class ImageHydrator implements ImageHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/TextHydrator.php b/src/DataIndex/Hydrator/Asset/TextHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text as TextItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class TextHydrator implements TextHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/UnknownHydrator.php b/src/DataIndex/Hydrator/Asset/UnknownHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown as UnknownItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class UnknownHydrator implements UnknownHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/Asset/VideoHydrator.php b/src/DataIndex/Hydrator/Asset/VideoHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video as VideoItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class VideoHydrator implements VideoHydratorInterface
 {

diff --git a/src/DataIndex/Hydrator/AssetHydrator.php b/src/DataIndex/Hydrator/AssetHydrator.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\MetaDataHydratorInterface;
+use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Response\Asset;
-use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface;
 
 final readonly class AssetHydrator implements AssetHydratorInterface
 {

diff --git a/src/DataIndex/OpenSearchFilter.php b/src/DataIndex/OpenSearchFilter.php
@@ -22,8 +22,8 @@
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidFilterTypeException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException;
 use Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactoryInterface;
+use Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface;
-use Pimcore\Bundle\StudioBackendBundle\Service\FilterServiceInterface;
 
 /**
  * @internal

diff --git a/src/DataObject/Controller/CollectionController.php b/src/DataObject/Controller/CollectionController.php
@@ -17,7 +17,7 @@
 namespace Pimcore\Bundle\StudioBackendBundle\DataObject\Controller;
 
 use OpenApi\Attributes\Get;
-use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\DataObjectParameters;

diff --git a/src/DependencyInjection/PimcoreStudioBackendExtension.php b/src/DependencyInjection/PimcoreStudioBackendExtension.php
@@ -56,6 +56,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('data_objects.yaml');
         $loader->load('event_subscribers.yaml');
         $loader->load('factories.yaml');
+        $loader->load('icon.yaml');
         $loader->load('open_api.yaml');
         $loader->load('providers.yaml');
         $loader->load('security.yaml');

diff --git a/src/Service/FilterServiceInterface.php → ...Filter/Service/FilterServiceInterface.php b/src/Service/FilterServiceInterface.php → ...Filter/Service/FilterServiceInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\Filter\Service;
 
 interface FilterServiceInterface
 {

diff --git a/src/Service/IconService.php → src/Icon/Service/IconService.php b/src/Service/IconService.php → src/Icon/Service/IconService.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\Icon\Service;
 
 final class IconService implements IconServiceInterface
 {

diff --git a/src/Service/IconServiceInterface.php → src/Icon/Service/IconServiceInterface.php b/src/Service/IconServiceInterface.php → src/Icon/Service/IconServiceInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\Icon\Service;
 
 interface IconServiceInterface
 {

diff --git a/src/Service/SecurityService.php → src/Security/Service/SecurityService.php b/src/Service/SecurityService.php → src/Security/Service/SecurityService.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\Security\Service;
 
 use Pimcore\Bundle\StaticResolverBundle\Models\Tool\TmpStoreResolverInterface;
 use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials;

diff --git a/src/Service/SecurityServiceInterface.php → ...rity/Service/SecurityServiceInterface.php b/src/Service/SecurityServiceInterface.php → ...rity/Service/SecurityServiceInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\Security\Service;
 
 use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;

diff --git a/src/Security/Voter/AuthorizationVoter.php b/src/Security/Voter/AuthorizationVoter.php
@@ -18,7 +18,7 @@
 
 use Pimcore\Bundle\StudioBackendBundle\Exception\NoRequestException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\NotAuthorizedException;
-use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface;
+use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Traits\RequestTrait;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;

diff --git a/src/Security/Voter/PublicAuthorizationVoter.php b/src/Security/Voter/PublicAuthorizationVoter.php
@@ -19,7 +19,7 @@
 use Pimcore\Bundle\StudioBackendBundle\Exception\NonPublicTranslationException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\NoRequestException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\NotAuthorizedException;
-use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface;
+use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Traits\PublicTranslationTrait;
 use Pimcore\Bundle\StudioBackendBundle\Util\Traits\RequestTrait;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/Translation/Controller/TranslationController.php b/src/Translation/Controller/TranslationController.php
@@ -18,7 +18,7 @@
 
 use OpenApi\Attributes\JsonContent;
 use OpenApi\Attributes\Post;
-use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request\TranslationRequestBody;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse;

diff --git a/src/Util/Traits/StudioBackendPathTrait.php b/src/Util/Traits/StudioBackendPathTrait.php
@@ -16,7 +16,7 @@
 
 namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits;
 
-use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController;
+use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 
 /**
  * @internal

diff --git a/tests/Unit/Service/Security/SecurityServiceTest.php b/tests/Unit/Service/Security/SecurityServiceTest.php
@@ -21,8 +21,8 @@
 use Pimcore\Bundle\StaticResolverBundle\Models\Tool\TmpStoreResolverInterface;
 use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials;
 use Pimcore\Bundle\StudioBackendBundle\Exception\AccessDeniedException;
-use Pimcore\Bundle\StudioBackendBundle\Service\SecurityService;
-use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface;
+use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityService;
+use Pimcore\Bundle\StudioBackendBundle\Security\Service\SecurityServiceInterface;
 use Pimcore\Model\Tool\TmpStore;
 use Pimcore\Security\User\User;
 use Pimcore\Security\User\UserProvider;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,10 +20,6 @@ services:
		tags: [ 'controller.service_arguments' ]


		Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface:
		class: Pimcore\Bundle\StudioBackendBundle\Service\IconService





Expand Down