Fix login url

Author: silverbackdan

features/bootstrap/ProfilerContext.php

@@ -236,7 +236,7 @@ public function iShouldGetAnEmail(string $emailType, string $emailAddress = 'use
                 $this->usernameChangedNotification($headers);
                 break;
             case 'enabled_notification':
-                $this->validateEnabledNotification($headers);
+                $this->validateEnabledNotification($context, $headers);
                 break;
             case 'custom_change_email_confirmation':
                 $this->validateChangeEmailVerification($context, $headers, true);
@@ -277,10 +277,11 @@ private function usernameChangedNotification(Headers $headers): void
         Assert::assertStringStartsWith(UsernameChangedEmailFactory::MESSAGE_ID_PREFIX, $headers->get('x-message-id')->getBodyAsString());
     }
 
-    private function validateEnabledNotification(Headers $headers): void
+    private function validateEnabledNotification(array $context, Headers $headers): void
     {
         Assert::assertEquals('Your account has been enabled', $headers->get('subject')->getBodyAsString());
         Assert::assertStringStartsWith(UserEnabledEmailFactory::MESSAGE_ID_PREFIX, $headers->get('x-message-id')->getBodyAsString());
+        Assert::assertMatchesRegularExpression('/^http:\/\/www\.website\.com\/login$/i', $context['redirect_url']);
     }
 
     private function validateChangeEmailVerification(array $context, Headers $headers, bool $customPath = false, ?string $username = null): void

src/Factory/User/Mailer/UserEnabledEmailFactory.php

@@ -14,6 +14,7 @@
 namespace Silverback\ApiComponentsBundle\Factory\User\Mailer;
 
 use Silverback\ApiComponentsBundle\Entity\User\AbstractUser;
+use Silverback\ApiComponentsBundle\Helper\RefererUrlResolver;
 use Symfony\Component\Mime\RawMessage;
 
 /**
@@ -30,6 +31,8 @@ public function create(AbstractUser $user, array $context = []): ?RawMessage
         }
         $this->initUser($user);
 
+        $context['login_url'] = $this->container->get(RefererUrlResolver::class)?->getAbsoluteUrl('/login');
+
         return $this->createEmailMessage($context);
     }
 

src/Resources/views/emails/user_enabled.html.twig

@@ -7,6 +7,6 @@
 
     <p>Hello {{ user.username }},</p>
     <p>We have reviewed your website registration and your account has now been enabled. You can sign in with the password you provided during the sign up process.</p>
-    <button class="large expand" href="https://addictovocab.org/login">Login</button>
+    <button class="large expand" href="{{ login_url }}">Login</button>
     {% include "@SilverbackApiComponents/emails/_signature.html.twig" %}
 {% endblock %}

tests/Factory/User/Mailer/AbstractFinalEmailFactoryTestCase.php

@@ -38,13 +38,12 @@ protected function setUp(): void
         $this->eventDispatcherMock = $this->createMock(EventDispatcherInterface::class);
     }
 
-    protected function assertCommonMockMethodsCalled(bool $tokenPathExpected = false): void
+    protected function assertCommonMockMethodsCalled(bool $tokenPathExpected = false, array $additionalExpectations = []): void
     {
         $loaderMock = $this->createMock(LoaderInterface::class);
         $twig = new Environment($loaderMock);
 
-        $containerWith = [];
-        $willReturn = [];
+        $expectations = [...$additionalExpectations];
 
         if ($tokenPathExpected) {
             $requestStackMock = $this->createMock(RequestStack::class);
@@ -60,25 +59,32 @@ protected function assertCommonMockMethodsCalled(bool $tokenPathExpected = false
                 ->with('/default-path')
                 ->willReturn('/transformed-path');
 
-            $containerWith[] = [RequestStack::class];
-            $containerWith[] = [RefererUrlResolver::class];
-            $willReturn[] = $requestStackMock;
-            $willReturn[] = $refererUrlMock;
+            $expectations[] = [
+                [RequestStack::class],
+                $requestStackMock,
+            ];
+            $expectations[] = [
+                [RefererUrlResolver::class],
+                $refererUrlMock,
+            ];
         }
 
-        $containerWith[] = ['twig'];
-        $willReturn[] = $twig;
+        $expectations[] = [
+            ['twig'],
+            $twig,
+        ];
 
-        $invokedCount = self::exactly(\count($willReturn));
+        $invokedCount = self::exactly(\count($expectations));
 
         $this->containerInterfaceMock
             ->expects($invokedCount)
             ->method('get')
-            ->willReturnCallback(function (...$parameters) use ($invokedCount, $containerWith, $willReturn) {
+            ->willReturnCallback(function (...$parameters) use ($invokedCount, $expectations) {
                 $currentInvocationCount = $invokedCount->numberOfInvocations();
-                $this->assertSame($containerWith[$currentInvocationCount - 1], $parameters);
+                $currentExpectation = $expectations[$currentInvocationCount - 1];
+                $this->assertSame($currentExpectation[0], $parameters);
 
-                return $willReturn[$currentInvocationCount - 1];
+                return $currentExpectation[1];
             });
     }
 }

tests/Factory/User/Mailer/UserEnabledEmailFactoryTest.php

@@ -15,6 +15,7 @@
 
 use Silverback\ApiComponentsBundle\Entity\User\AbstractUser;
 use Silverback\ApiComponentsBundle\Factory\User\Mailer\UserEnabledEmailFactory;
+use Silverback\ApiComponentsBundle\Helper\RefererUrlResolver;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mime\Address;
 
@@ -41,7 +42,14 @@ public function test_redirect_url_context_added_and_html_template_passed(): void
 
         $factory = new UserEnabledEmailFactory($this->containerInterfaceMock, $this->eventDispatcherMock, 'subject', true, '/default-path');
 
-        $this->assertCommonMockMethodsCalled();
+        $referrerUrlMock = $this->createMock(RefererUrlResolver::class);
+        $referrerUrlMock
+            ->method('getAbsoluteUrl')
+            ->willReturn('https://login');
+        $this->assertCommonMockMethodsCalled(false, [[
+            [RefererUrlResolver::class],
+            $referrerUrlMock,
+        ]]);
 
         $email = (new TemplatedEmail())
             ->to(Address::create('[email protected]'))
@@ -51,6 +59,7 @@ public function test_redirect_url_context_added_and_html_template_passed(): void
                 [
                     'website_name' => 'my website',
                     'user' => $user,
+                    'login_url' => 'https://login',
                 ]
             );
 

tests/Helper/User/UserMailerTest.php

@@ -100,7 +100,7 @@ public function test_exception_thrown_if_mailer_send_throws_exception(): void
         $additionalExpectations = $this->createEmMockExpectation();
 
         $loggerMock = $this->createMock(Logger::class);
-        $factoryMock = $this->getFactoryFromContainerMock(PasswordResetEmailFactory::class, [...$additionalExpectations, ['logger', $loggerMock]]);
+        $factoryMock = $this->getFactoryFromContainerMock(PasswordResetEmailFactory::class, [...$additionalExpectations, [['logger'], $loggerMock]]);
 
         $factoryMock
             ->expects(self::once())
@@ -215,7 +215,7 @@ private function createEmMockExpectation(): array
 
         return [
             [
-                'doctrine.orm.entity_manager',
+                ['doctrine.orm.entity_manager'],
                 $emMock,
             ],
         ];
@@ -225,7 +225,7 @@ private function getFactoryFromContainerMock(string $factory, array $additionalE
     {
         $factoryMock = $this->createMock(AbstractUserEmailFactory::class);
         $expectations = [
-            [$factory, $factoryMock],
+            [[$factory], $factoryMock],
             ...$additionalExpectations,
         ];
 
@@ -234,7 +234,7 @@ private function getFactoryFromContainerMock(string $factory, array $additionalE
         $this->containerMock
             ->expects($invokedCount)
             ->method('get')
-            ->willReturnCallback(function ($parameters) use ($invokedCount, $expectations) {
+            ->willReturnCallback(function (...$parameters) use ($invokedCount, $expectations) {
                 $currentInvocationCount = $invokedCount->numberOfInvocations();
                 $currentExpectation = $expectations[$currentInvocationCount - 1];
                 $this->assertSame($currentExpectation[0], $parameters);