fixes, revert ApiPlatformSecurityClient and use ApiClient instead in …

…behat
Sylius · Feb 18, 2021 · 6d453ce · 6d453ce
1 parent 9740b92
commit 6d453ce
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 96 deletions.
diff --git a/src/Sylius/Behat/Client/ApiPlatformSecurityClient.php b/src/Sylius/Behat/Client/ApiPlatformSecurityClient.php
@@ -44,12 +44,6 @@ public function prepareLoginRequest(): void
         $this->request['method'] = 'POST';
     }
 
-    public function preparePasswordResetRequest(): void
-    {
-        $this->request['url'] = sprintf('/api/v2/%s/password-reset-request', $this->section);
-        $this->request['method'] = 'POST';
-    }
-
     public function setEmail(string $email): void
     {
         $this->request['body']['email'] = $email;
@@ -62,7 +56,14 @@ public function setPassword(string $password): void
 
     public function call(): void
     {
-        $this->callRequest();
+        $this->client->request(
+            $this->request['method'],
+            $this->request['url'],
+            [],
+            [],
+            ['CONTENT_TYPE' => 'application/json', 'HTTP_ACCEPT' => 'application/json'],
+            json_encode($this->request['body'])
+        );
 
         $response = $this->client->getResponse();
         $content = json_decode($response->getContent(), true);
@@ -96,26 +97,4 @@ public function logOut(): void
             $this->sharedStorage->set('cart_token', null);
         }
     }
-
-    public function resetPassword(): void
-    {
-        $this->callRequest();
-    }
-
-    private function callRequest(): void
-    {
-        $this->client->request(
-            $this->request['method'],
-            $this->request['url'],
-            [],
-            [],
-            ['CONTENT_TYPE' => 'application/json', 'HTTP_ACCEPT' => 'application/json'],
-            json_encode($this->request['body'])
-        );
-    }
-
-    public function getLastResponse(): Response
-    {
-        return $this->client->getResponse();
-    }
 }
diff --git a/src/Sylius/Behat/Client/ApiSecurityClientInterface.php b/src/Sylius/Behat/Client/ApiSecurityClientInterface.php
@@ -19,8 +19,6 @@ interface ApiSecurityClientInterface
 {
     public function prepareLoginRequest(): void;
 
-    public function preparePasswordResetRequest(): void;
-
     public function setEmail(string $email): void;
 
     public function setPassword(string $password): void;
@@ -32,8 +30,4 @@ public function isLoggedIn(): bool;
     public function getErrorMessage(): string;
 
     public function logOut(): void;
-
-    public function resetPassword(): void;
-
-    public function getLastResponse(): Response;
 }
diff --git a/src/Sylius/Behat/Context/Api/EmailContext.php b/src/Sylius/Behat/Context/Api/EmailContext.php
@@ -17,10 +17,8 @@ class EmailContext implements Context
     /** @var TranslatorInterface */
     private $translator;
 
-    public function __construct(
-        EmailCheckerInterface $emailChecker,
-        TranslatorInterface $translator
-    ) {
+    public function __construct(EmailCheckerInterface $emailChecker, TranslatorInterface $translator)
+    {
         $this->emailChecker = $emailChecker;
         $this->translator = $translator;
     }

diff --git a/src/Sylius/Behat/Context/Api/Shop/LoginContext.php b/src/Sylius/Behat/Context/Api/Shop/LoginContext.php
@@ -14,14 +14,23 @@
 namespace Sylius\Behat\Context\Api\Shop;
 
 use Behat\Behat\Context\Context;
+use Sylius\Behat\Client\ApiClientInterface;
 use Sylius\Behat\Client\ApiSecurityClientInterface;
+use Sylius\Behat\Client\Request;
 use Webmozart\Assert\Assert;
+use \Symfony\Component\HttpFoundation\Request as HTTPRequest;
 
 final class LoginContext implements Context
 {
     /** @var ApiSecurityClientInterface */
     private $client;
 
+    /** @var ApiClientInterface */
+    private $apiClient;
+
+    /** @var Request */
+    private $request;
+
     public function __construct(ApiSecurityClientInterface $client)
     {
         $this->client = $client;
@@ -48,26 +57,33 @@ public function iWantToLogIn(): void
      */
     public function iWantToResetPassword(): void
     {
-        $this->client->preparePasswordResetRequest();
+        $this->request = Request::custom('shop/password-reset-request', HTTPRequest::METHOD_POST);
     }
 
     /**
      * @When I reset it
      */
     public function iResetIt(): void
     {
-        $this->client->resetPassword();
+        $this->apiClient->executeCustomRequest($this->request);
     }
 
     /**
      * @When I specify the username as :username
-     * @When I specify the email as :username
      */
     public function iSpecifyTheUsername(string $username): void
     {
         $this->client->setEmail($username);
     }
 
+    /**
+     * @When I specify the email as :email
+     */
+    public function iSpecifyTheEmail(string $email): void
+    {
+        $this->request->setContent(['email' => $email]);
+    }
+
     /**
      * @When I specify the password as :password
      */

diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml
@@ -74,6 +74,7 @@
 
         <service id="sylius.behat.context.api.shop.login" class="Sylius\Behat\Context\Api\Shop\LoginContext">
             <argument type="service" id="sylius.behat.client.shop_api_platform_security_client" />
+            <argument type="service" id="sylius.behat.api_platform_client.shop.account" />
         </service>
 
         <service id="sylius.behat.context.api.shop.product" class="Sylius\Behat\Context\Api\Shop\ProductContext">

diff --git a/...piBundle/Command/ResetPasswordRequest.php → ...undle/ApiBundle/Command/ResetPassword.php b/...piBundle/Command/ResetPasswordRequest.php → ...undle/ApiBundle/Command/ResetPassword.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\Bundle\ApiBundle\Command;
 
-class ResetPasswordRequest implements ChannelCodeAwareInterface, LocaleCodeAwareInterface
+class ResetPassword implements ChannelCodeAwareInterface, LocaleCodeAwareInterface
 {
     /** @var string */
     public $email;

diff --git a/...ndHandler/ResetPasswordRequestHandler.php → ...e/CommandHandler/ResetPasswordHandler.php b/...ndHandler/ResetPasswordRequestHandler.php → ...e/CommandHandler/ResetPasswordHandler.php
@@ -4,15 +4,15 @@
 
 namespace Sylius\Bundle\ApiBundle\CommandHandler;
 
-use Sylius\Bundle\ApiBundle\Command\ResetPasswordRequest;
+use Sylius\Bundle\ApiBundle\Command\ResetPassword;
 use Sylius\Bundle\ApiBundle\Event\ResetPasswordRequested;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
 use Webmozart\Assert\Assert;
 
-class ResetPasswordRequestHandler
+class ResetPasswordHandler
 {
     /** @var UserRepositoryInterface */
     private $userRepository;
@@ -33,7 +33,7 @@ public function __construct(
         $this->generator = $generator;
     }
 
-    public function __invoke(ResetPasswordRequest $command): void
+    public function __invoke(ResetPassword $command): void
     {
         $user = $this->userRepository->findOneByEmail($command->getEmail());
         Assert::notNull($user);
@@ -45,7 +45,5 @@ public function __invoke(ResetPasswordRequest $command): void
             new ResetPasswordRequested($command->getEmail(), $command->getChannelCode(), $command->getLocaleCode()),
             [new DispatchAfterCurrentBusStamp()
         ]);
-
-
     }
 }
diff --git a/src/Sylius/Bundle/ApiBundle/Event/ResetPasswordRequested.php b/src/Sylius/Bundle/ApiBundle/Event/ResetPasswordRequested.php
@@ -13,7 +13,7 @@ class ResetPasswordRequested
     private $channelCode;
 
     /** @var string */
-    private $localeCode;
+    protected $localeCode;
 
     public function __construct(
         string $email,

diff --git a/src/Sylius/Bundle/ApiBundle/EventHandler/ResetPasswordRequestedHandler.php b/src/Sylius/Bundle/ApiBundle/EventHandler/ResetPasswordRequestedHandler.php
@@ -22,7 +22,7 @@ public function __invoke(ResetPasswordRequested $resetPasswordRequested): void
     {
         $this->commandBus->dispatch(
             new SendResetPasswordEmail(
-                $resetPasswordRequested->email,
+                $resetPasswordRequested->email(),
                 $resetPasswordRequested->channelCode(),
                 $resetPasswordRequested->localeCode()
             )

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Customer.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Customer.xml
@@ -33,6 +33,25 @@
                 <attribute name="input">Sylius\Bundle\ApiBundle\Command\RegisterShopUser</attribute>
                 <attribute name="output">false</attribute>
             </collectionOperation>
+
+            <collectionOperation name="shop_password_reset_request">
+                <attribute name="method">POST</attribute>
+                <attribute name="path">shop/password-reset-request</attribute>
+                <attribute name="messenger">input</attribute>
+                <attribute name="input">Sylius\Bundle\ApiBundle\Command\ResetPasswordRequest</attribute>
+                <attribute name="output">false</attribute>
+                <attribute name="status">202</attribute>
+                <attribute name="validation_groups">
+                    <attribute>sylius</attribute>
+                    <attribute>sylius_shop_password_reset</attribute>
+                </attribute>
+                <attribute name="normalization_context">
+                    <attribute name="groups">shop:shop_user:password_reset</attribute>
+                </attribute>
+                <attribute name="openapi_context">
+                    <attribute name="summary">Request password reset</attribute>
+                </attribute>
+            </collectionOperation>
         </collectionOperations>
 
         <itemOperations>

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/ShopUser.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/ShopUser.xml
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -102,7 +102,7 @@
             <tag name="messenger.message_handler" bus="sylius_default.bus"/>
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\CommandHandler\ResetPasswordRequestHandler">
+        <service id="ResetPasswordHandler">
             <argument type="service" id="sylius.repository.shop_user" />
             <argument type="service" id="sylius_event.bus" />
             <argument type="service" id="sylius.shop_user.token_generator.password_reset" />