[Maintenance][Admin] Slight password reset cleanup

src/Sylius/Behat/Context/Api/Admin/ResettingPasswordContext.php

@@ -168,7 +168,7 @@ public function iShouldBeNotifiedThatTheEnteredPasswordsDoNotMatch(): void
     }
 
     /**
-     * @Then /^I should be notified that the password should be ([^"]+)$/
+     * @Then I should be notified that the password should be :validationMessage
      */
     public function iShouldBeNotifiedThatThePasswordShouldBe(string $validationMessage): void
     {

src/Sylius/Behat/Context/Ui/Admin/ResettingPasswordContext.php

@@ -121,7 +121,10 @@ public function iShouldBeNotifiedThatTheEmailIsNotValid(): void
      */
     public function iShouldBeNotifiedThatMyPasswordHasBeenSuccessfullyChanged(): void
     {
-        $this->notificationChecker->checkNotification('has been changed successfully!', NotificationType::success());
+        $this->notificationChecker->checkNotification(
+            'Your password has been changed successfully!',
+            NotificationType::success(),
+        );
     }
 
     /**
@@ -139,7 +142,10 @@ public function iShouldNotBeAbleToChangeMyPasswordAgainWithTheSameToken(): void
      */
     public function iShouldBeNotifiedThatThePasswordResetTokenHasExpired(): void
     {
-        $this->notificationChecker->checkNotification('has expired', NotificationType::failure());
+        $this->notificationChecker->checkNotification(
+            'The password reset token has expired',
+            NotificationType::failure(),
+        );
     }
 
     /**
@@ -148,7 +154,7 @@ public function iShouldBeNotifiedThatThePasswordResetTokenHasExpired(): void
     public function iShouldBeNotifiedThatTheNewPasswordIsRequired(): void
     {
         Assert::contains(
-            $this->resetPasswordPage->getValidationMessageFor('new_password'),
+            $this->resetPasswordPage->getValidationMessageForNewPassword(),
             'Please enter the password.',
         );
     }
@@ -159,18 +165,18 @@ public function iShouldBeNotifiedThatTheNewPasswordIsRequired(): void
     public function iShouldBeNotifiedThatTheEnteredPasswordsDoNotMatch(): void
     {
         Assert::contains(
-            $this->resetPasswordPage->getValidationMessageFor('new_password'),
+            $this->resetPasswordPage->getValidationMessageForNewPassword(),
             'The entered passwords do not match.',
         );
     }
 
     /**
-     * @Then /^I should be notified that the password should be ([^"]+)$/
+     * @Then I should be notified that the password should be :validationMessage
      */
     public function iShouldBeNotifiedThatThePasswordShouldBe(string $validationMessage): void
     {
         Assert::contains(
-            $this->resetPasswordPage->getValidationMessageFor('new_password'),
+            $this->resetPasswordPage->getValidationMessageForNewPassword(),
             $validationMessage,
         );
     }

src/Sylius/Behat/Element/Admin/Account/ResetElement.php

@@ -19,6 +19,13 @@ final class ResetElement extends Element implements ResetElementInterface
 {
     public function reset(): void
     {
-        $this->getDocument()->find('css', 'button[type="submit"]:contains("Reset")')->click();
+        $this->getElement('reset')->click();
+    }
+
+    protected function getDefinedElements(): array
+    {
+        return array_merge(parent::getDefinedElements(), [
+            'reset' => 'button[type="submit"]:contains("Reset")',
+        ]);
     }
 }

src/Sylius/Behat/Page/Admin/Account/ResetPasswordPage.php

@@ -28,9 +28,9 @@ public function specifyPasswordConfirmation(string $password): void
         $this->getElement('confirm_new_password')->setValue($password);
     }
 
-    public function getValidationMessageFor(string $element): string
+    public function getValidationMessageForNewPassword(): string
     {
-        $errorLabel = $this->getElement($element)->getParent()->find('css', '[data-test-validation-error]');
+        $errorLabel = $this->getElement('new_password')->getParent()->find('css', '[data-test-validation-error]');
 
         if (null === $errorLabel) {
             throw new ElementNotFoundException($this->getSession(), 'Validation message', 'css', '[data-test-validation-error]');

src/Sylius/Behat/Page/Admin/Account/ResetPasswordPageInterface.php

@@ -21,5 +21,5 @@ public function specifyNewPassword(string $password): void;
 
     public function specifyPasswordConfirmation(string $password): void;
 
-    public function getValidationMessageFor(string $element): string;
+    public function getValidationMessageForNewPassword(): string;
 }

src/Sylius/Bundle/AdminBundle/Action/Account/RenderResetPasswordPageAction.php

@@ -48,19 +48,7 @@ public function __invoke(Request $request, string $token): Response
         $lifetime = new \DateInterval($this->tokenTtl);
 
         if (!$admin->isPasswordRequestNonExpired($lifetime)) {
-            $this->flashBag->add('error', 'sylius.admin.password_reset.token_expired');
-
-            $attributes = $request->attributes->get('_sylius');
-            $redirect = $attributes['redirect'] ?? 'sylius_admin_login';
-
-            if (is_array($redirect)) {
-                return new RedirectResponse($this->router->generate(
-                    $redirect['route'] ?? 'sylius_admin_login',
-                    $redirect['params'] ?? [],
-                ));
-            }
-
-            return new RedirectResponse($this->router->generate($redirect));
+            return $this->handleExpiredPasswordRequest($request);
         }
 
         $form = $this->formFactory->create(ResetPasswordType::class);
@@ -71,4 +59,21 @@ public function __invoke(Request $request, string $token): Response
             ]),
         );
     }
+
+    private function handleExpiredPasswordRequest(Request $request): RedirectResponse
+    {
+        $this->flashBag->add('error', 'sylius.admin.password_reset.token_expired');
+
+        $attributes = $request->attributes->get('_sylius');
+        $redirect = $attributes['redirect'] ?? 'sylius_admin_login';
+
+        if (is_array($redirect)) {
+            return new RedirectResponse($this->router->generate(
+                $redirect['route'] ?? 'sylius_admin_login',
+                $redirect['params'] ?? [],
+            ));
+        }
+
+        return new RedirectResponse($this->router->generate($redirect));
+    }
 }

src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml

@@ -19,7 +19,7 @@
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\AdminBundle\Action\Account\RenderResetPasswordPageAction" public="true">
+        <service id="Sylius\Bundle\AdminBundle\Action\Account\RenderResetPasswordPageAction">
             <argument type="service" id="sylius.repository.admin_user" />
             <argument type="service" id="form.factory" />
             <argument type="service" id="session.flash_bag" />

src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpired.php

@@ -15,6 +15,7 @@
 
 use Symfony\Component\Validator\Constraint;
 
+/** @experimental */
 final class AdminResetPasswordTokenNonExpired extends Constraint
 {
     public string $message = 'sylius.admin.expired_password_reset_token';

src/Sylius/Bundle/ApiBundle/Validator/Constraints/AdminResetPasswordTokenNonExpiredValidator.php

@@ -20,6 +20,7 @@
 use Symfony\Component\Validator\ConstraintValidator;
 use Webmozart\Assert\Assert;
 
+/** @experimental */
 final class AdminResetPasswordTokenNonExpiredValidator extends ConstraintValidator
 {
     public function __construct(
@@ -45,9 +46,7 @@ public function validate($value, Constraint $constraint): void
         $lifetime = new \DateInterval($this->tokenTtl);
 
         if (!$user->isPasswordRequestNonExpired($lifetime)) {
-            $this->context->addViolation(
-                $constraint->message,
-            );
+            $this->context->addViolation($constraint->message);
         }
     }
 }