Move reset password to user management instead of auth

pimcore · Jun 4, 2024 · 1bd650a · 1bd650a
1 parent d29b769
commit 1bd650a
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 32 deletions.
diff --git a/config/authorization.yaml b/config/authorization.yaml
@@ -15,13 +15,3 @@ services:
 
   Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenServiceInterface:
     class: Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenService
-
-  Pimcore\Bundle\StudioBackendBundle\Authorization\RateLimiter\RateLimiterInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Authorization\RateLimiter\RateLimiter
-
-  Pimcore\Bundle\StudioBackendBundle\Authorization\Service\UserServiceInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Authorization\Service\UserService
-
-  Pimcore\Bundle\StudioBackendBundle\Authorization\Service\MailServiceInterface:
-    class: Pimcore\Bundle\StudioBackendBundle\Authorization\Service\MailService
-    arguments: ['@Pimcore\Bundle\StudioBackendBundle\Setting\Provider\SystemSettingsProvider']
diff --git a/config/users.yaml b/config/users.yaml
@@ -0,0 +1,22 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  # controllers are imported separately to make sure they're public
+  # and have a tag that allows actions to type-hint services
+  Pimcore\Bundle\StudioBackendBundle\User\Controller\:
+    resource: '../src/User/Controller'
+    public: true
+    tags: [ 'controller.service_arguments' ]
+
+  Pimcore\Bundle\StudioBackendBundle\User\RateLimiter\RateLimiterInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\User\RateLimiter\RateLimiter
+
+  Pimcore\Bundle\StudioBackendBundle\User\Service\UserServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\User\Service\UserService
+
+  Pimcore\Bundle\StudioBackendBundle\User\Service\MailServiceInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\User\Service\MailService
+    arguments: [ '@Pimcore\Bundle\StudioBackendBundle\Setting\Provider\SystemSettingsProvider' ]
diff --git a/src/DependencyInjection/PimcoreStudioBackendExtension.php b/src/DependencyInjection/PimcoreStudioBackendExtension.php
@@ -69,6 +69,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('settings.yaml');
         $loader->load('translation.yaml');
         $loader->load('updater.yaml');
+        $loader->load('users.yaml');
         $loader->load('versions.yaml');
 
         $definition = $container->getDefinition(TokenServiceInterface::class);

diff --git a/src/OpenApi/Config/Tags.php b/src/OpenApi/Config/Tags.php
@@ -65,6 +65,10 @@
     name: Tags::Settings->name,
     description: 'Get Settings'
 )]
+#[Tag(
+    name: Tags::User->value,
+    description: 'User Management operations'
+)]
 #[Tag(
     name: Tags::Versions->name,
     description: 'Versions operations to get/list/publish/delete and cleanup versions'
@@ -87,6 +91,8 @@ enum Tags: string
     case Schedule = 'Schedule';
     case Settings = 'Settings';
     case Translation = 'Translation';
+
+    case User = 'User Management';
     case Versions = 'Versions';
     case Workflows = 'Workflows';
 }
diff --git a/...utes/Request/ResetPasswordRequestBody.php → ...utes/Request/ResetPasswordRequestBody.php b/...utes/Request/ResetPasswordRequestBody.php → ...utes/Request/ResetPasswordRequestBody.php
@@ -14,12 +14,12 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Attributes\Request;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Attributes\Request;
 
 use Attribute;
 use OpenApi\Attributes\JsonContent;
 use OpenApi\Attributes\RequestBody;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\ResetPassword;
+use Pimcore\Bundle\StudioBackendBundle\User\Schema\ResetPassword;
 
 #[Attribute(Attribute::TARGET_METHOD)]
 final class ResetPasswordRequestBody extends RequestBody

diff --git a/...on/Controller/ResetPasswordController.php → ...er/Controller/ResetPasswordController.php b/...on/Controller/ResetPasswordController.php → ...er/Controller/ResetPasswordController.php
@@ -14,19 +14,19 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Controller;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Controller;
 
 use OpenApi\Attributes\Post;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Attributes\Request\ResetPasswordRequestBody;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\ResetPassword;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Service\UserServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Controller\AbstractApiController;
 use Pimcore\Bundle\StudioBackendBundle\Exception\DomainConfigurationException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\RateLimitException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\SendMailException;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\DefaultResponses;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse;
 use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags;
+use Pimcore\Bundle\StudioBackendBundle\User\Attributes\Request\ResetPasswordRequestBody;
+use Pimcore\Bundle\StudioBackendBundle\User\Schema\ResetPassword;
+use Pimcore\Bundle\StudioBackendBundle\User\Service\UserServiceInterface;
 use Pimcore\Bundle\StudioBackendBundle\Util\Constants\HttpResponseCodes;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
@@ -48,12 +48,12 @@ public function __construct(
     /**
      * @throws RateLimitException|DomainConfigurationException|SendMailException
      */
-    #[Route('/reset-password', name: 'pimcore_studio_api_reset_password', methods: ['POST'])]
+    #[Route('/user/reset-password', name: 'pimcore_studio_api_user_reset_password', methods: ['POST'])]
     #[Post(
-        path: self::API_PATH . '/reset-password',
-        operationId: 'rest-password',
+        path: self::API_PATH . '/user/reset-password',
+        operationId: 'reset-password',
         summary: 'Sending username to reset password',
-        tags: [Tags::Authorization->name]
+        tags: [Tags::User->value]
     )]
     #[ResetPasswordRequestBody]
     #[SuccessResponse]

diff --git a/...Authorization/Event/LostPasswordEvent.php → src/User/Event/LostPasswordEvent.php b/...Authorization/Event/LostPasswordEvent.php → src/User/Event/LostPasswordEvent.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Event;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Event;
 
 use Pimcore\Model\User;
 use Symfony\Contracts\EventDispatcher\Event;

diff --git a/...Authorization/RateLimiter/RateLimiter.php → src/User/RateLimiter/RateLimiter.php b/...Authorization/RateLimiter/RateLimiter.php → src/User/RateLimiter/RateLimiter.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\RateLimiter;
+namespace Pimcore\Bundle\StudioBackendBundle\User\RateLimiter;
 
 use Pimcore\Bundle\StudioBackendBundle\Exception\RateLimitException;
 use Pimcore\Bundle\StudioBackendBundle\Util\Traits\RequestTrait;

diff --git a/...tion/RateLimiter/RateLimiterInterface.php → ...User/RateLimiter/RateLimiterInterface.php b/...tion/RateLimiter/RateLimiterInterface.php → ...User/RateLimiter/RateLimiterInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\RateLimiter;
+namespace Pimcore\Bundle\StudioBackendBundle\User\RateLimiter;
 
 use Pimcore\Bundle\StudioBackendBundle\Exception\RateLimitException;
 

diff --git a/src/Authorization/Schema/ResetPassword.php → src/User/Schema/ResetPassword.php b/src/Authorization/Schema/ResetPassword.php → src/User/Schema/ResetPassword.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Schema;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Schema;
 
 use OpenApi\Attributes\Property;
 use OpenApi\Attributes\Schema;

diff --git a/src/Authorization/Service/MailService.php → src/User/Service/MailService.php b/src/Authorization/Service/MailService.php → src/User/Service/MailService.php
@@ -14,14 +14,14 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Service;
 
 use Exception;
 use Pimcore\Bundle\StaticResolverBundle\Lib\ToolResolverInterface;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Event\LostPasswordEvent;
 use Pimcore\Bundle\StudioBackendBundle\Exception\DomainConfigurationException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\SendMailException;
 use Pimcore\Bundle\StudioBackendBundle\Setting\Provider\SettingsProviderInterface;
+use Pimcore\Bundle\StudioBackendBundle\User\Event\LostPasswordEvent;
 use Pimcore\Model\User;
 use Pimcore\Model\UserInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;

diff --git a/...rization/Service/MailServiceInterface.php → src/User/Service/MailServiceInterface.php b/...rization/Service/MailServiceInterface.php → src/User/Service/MailServiceInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Service;
 
 use Pimcore\Model\UserInterface;
 

diff --git a/src/Authorization/Service/UserService.php → src/User/Service/UserService.php b/src/Authorization/Service/UserService.php → src/User/Service/UserService.php
@@ -14,15 +14,15 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Service;
 
 use Pimcore\Bundle\StaticResolverBundle\Lib\Tools\Authentication\AuthenticationResolverInterface;
 use Pimcore\Bundle\StaticResolverBundle\Models\User\UserResolverInterface;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\RateLimiter\RateLimiterInterface;
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\ResetPassword;
 use Pimcore\Bundle\StudioBackendBundle\Exception\DomainConfigurationException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\RateLimitException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\SendMailException;
+use Pimcore\Bundle\StudioBackendBundle\User\RateLimiter\RateLimiterInterface;
+use Pimcore\Bundle\StudioBackendBundle\User\Schema\ResetPassword;
 use Pimcore\Model\UserInterface;
 use Psr\Log\LoggerInterface;
 

diff --git a/...rization/Service/UserServiceInterface.php → src/User/Service/UserServiceInterface.php b/...rization/Service/UserServiceInterface.php → src/User/Service/UserServiceInterface.php
@@ -14,12 +14,12 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Service;
+namespace Pimcore\Bundle\StudioBackendBundle\User\Service;
 
-use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\ResetPassword;
 use Pimcore\Bundle\StudioBackendBundle\Exception\DomainConfigurationException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\RateLimitException;
 use Pimcore\Bundle\StudioBackendBundle\Exception\SendMailException;
+use Pimcore\Bundle\StudioBackendBundle\User\Schema\ResetPassword;
 
 /**
  * @internal