Add test for the resending of a new email confirmation token

Author: silverbackdan

features/bootstrap/DoctrineContext.php

@@ -216,7 +216,7 @@ public function createForm(string $type)
     }
 
     /**
-     * @Given /^there is a user with the username "([^"]*)" password "([^"]*)" and role "([^"]*)"(?: and the email address "([^"]*)"|)$/i
+     * @Given /^there is a user with the username "([^" ]*)" password "([^" ]*)" and role "([^" ]*)"(?: and the email address "([^" ]*)"|)$/i
      */
     public function thereIsAUserWithUsernamePasswordAndRole(string $username, string $password, string $role, string $emailAddress = 'test.user@example.com'): void
     {

features/bootstrap/ProfilerContext.php

@@ -199,7 +199,7 @@ public function iShouldNotReceiveAnyEmails()
     }
 
     /**
-     * @Then /^I should get a(?:n|) "(.+)" email sent(?:| to the email address "(.+)")$/i
+     * @Then /^I should get a(?:n|) "([^" ]*)" email sent(?:| to the email address "([^" ]*)")$/i
      */
     public function iShouldGetAnEmail(string $emailType, string $emailAddress = 'user@example.com')
     {
@@ -242,7 +242,7 @@ public function iShouldGetAnEmail(string $emailType, string $emailAddress = 'use
                 $this->validateChangeEmailVerification($context, $headers, true);
                 break;
             case 'change_email_confirmation':
-                $this->validateChangeEmailVerification($context, $headers);
+                $this->validateChangeEmailVerification($context, $headers, false, $context['user']->getUsername());
                 break;
             case 'change_password_notification':
                 $this->validateChangePasswordNotification($headers);
@@ -283,13 +283,16 @@ private function validateEnabledNotification(Headers $headers): void
         Assert::assertStringStartsWith(UserEnabledEmailFactory::MESSAGE_ID_PREFIX, $headers->get('x-message-id')->getBodyAsString());
     }
 
-    private function validateChangeEmailVerification(array $context, Headers $headers, bool $customPath = false): void
+    private function validateChangeEmailVerification(array $context, Headers $headers, bool $customPath = false, ?string $username = null): void
     {
+        if (!$username) {
+            $username = 'new_user';
+        }
         $pathInsert = $customPath ? 'another-path' : 'confirm-new-email';
         Assert::assertEquals('Please confirm your new email address', $headers->get('subject')->getBodyAsString());
         Assert::assertStringStartsWith(ChangeEmailConfirmationEmailFactory::MESSAGE_ID_PREFIX, $headers->get('x-message-id')->getBodyAsString());
         Assert::assertIsString($context['user']->getNewEmailConfirmationToken());
-        Assert::assertMatchesRegularExpression('/^http:\/\/www.website.com\/' . $pathInsert . '\/new_user\/new%40example.com\/([a-z0-9]+)$/i', $context['redirect_url']);
+        Assert::assertMatchesRegularExpression('/^http:\/\/www\.website\.com\/' . $pathInsert . '\/' . $username . '\/new%40example.com\/([a-z0-9]+)$/i', $context['redirect_url']);
     }
 
     private function validateChangePasswordNotification(Headers $headers): void

features/user/new_email_address.feature

@@ -164,12 +164,12 @@ Feature: Register process via a form
   @loginUser
   Scenario: I can resend a new email address confirmation email with a new token
     Given there is a "new_email" form
-    And there is a user with the username "another_user" password "password" and role "ROLE_USER"
+    And there is a user with the username "my_username" password "password" and role "ROLE_USER" and the email address "user@example.com"
+    And the user has a new email address "new@example.com" and confirmation token abc123
     And I add "referer" header equal to "http://www.website.com"
-    When I send a "GET" request to "/confirm-email/my_username/new@email.com/abc123"
-    Then the response status code should be 201
-    And the JSON node "newEmailConfirmationToken" should not exist
-    And I should not receive any emails
+    When I send a "GET" request to "/resend-verify-new-email/my_username"
+    Then the response status code should be 200
+    And I should get a "change_email_confirmation" email sent to the email address "user@example.com"
 
   Scenario: I can verify my new email address
     Given there is a user with the username "my_username" password "password" and role "ROLE_USER" and the email address "old@email.com"

src/Action/User/ResendVerifyEmailAddressAction.php

@@ -38,6 +38,7 @@ public function __invoke(string $username): Response
                 's_maxage' => 0,
                 'max_age' => 0,
             ]);
+
             return $response;
         }
 

src/Action/User/ResendVerifyNewEmailAddressAction.php

@@ -38,6 +38,7 @@ public function __invoke(string $username): Response
                 's_maxage' => 0,
                 'max_age' => 0,
             ]);
+
             return $response;
         }
         $emailSuccess = $this->userMailer->sendChangeEmailConfirmationEmail($user);

src/Helper/User/UserDataProcessor.php

@@ -109,6 +109,7 @@ private function findUserByUsername(string $usernameQuery): ?AbstractUser
         if (!$user) {
             throw new InvalidArgumentException('Username not found');
         }
+
         return $user;
     }
 
@@ -119,6 +120,7 @@ public function updateNewEmailToken(string $usernameQuery): ?AbstractUser
             return null;
         }
         $this->setNewEmailConfirmationToken($user);
+
         return $user;
     }
 
@@ -129,6 +131,7 @@ public function updateVerifyEmailToken(string $usernameQuery): ?AbstractUser
             return null;
         }
         $this->setEmailAddressVerifyToken($user);
+
         return $user;
     }
 

src/Resources/config/services.php

@@ -26,6 +26,8 @@
 use Silverback\ApiComponentsBundle\Action\Uploadable\UploadAction;
 use Silverback\ApiComponentsBundle\Action\User\EmailAddressConfirmAction;
 use Silverback\ApiComponentsBundle\Action\User\PasswordRequestAction;
+use Silverback\ApiComponentsBundle\Action\User\ResendVerifyEmailAddressAction;
+use Silverback\ApiComponentsBundle\Action\User\ResendVerifyNewEmailAddressAction;
 use Silverback\ApiComponentsBundle\Action\User\VerifyEmailAddressAction;
 use Silverback\ApiComponentsBundle\ApiPlatform\Api\IriConverter;
 use Silverback\ApiComponentsBundle\ApiPlatform\Api\MercureIriConverter;
@@ -1269,6 +1271,23 @@
         )
         ->tag('controller.service_arguments');
 
+    $services
+        ->set(ResendVerifyEmailAddressAction::class)
+        ->args([
+            new Reference(UserMailer::class),
+            new Reference(UserDataProcessor::class),
+        ])
+        ->tag('controller.service_arguments');
+
+    $services
+        ->set(ResendVerifyNewEmailAddressAction::class)
+        ->args([
+            new Reference(UserMailer::class),
+            new Reference(UserDataProcessor::class),
+        ])
+        ->tag('controller.service_arguments');
+
+
     $services
         ->set(VerifyEmailFactory::class)
         ->parent(AbstractUserEmailFactory::class);