refactor!: Removing reset password service, adding login link, refact…

…oring routes
dontdrinkandroot · Mar 19, 2024 · 84c30ec · 84c30ec
1 parent 9e0b97c
commit 84c30ec
Show file tree

Hide file tree

Showing 30 changed files with 275 additions and 404 deletions.
diff --git a/config/routes/health.php b/config/routes/health.php
diff --git a/config/routes/login.php b/config/routes/login.php
diff --git a/config/routes/reset_password.php b/config/routes/reset_password.php
diff --git a/config/services/login_link.php b/config/services/login_link.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Dontdrinkandroot\BridgeBundle\Config;
+
+use Dontdrinkandroot\BridgeBundle\Command\User\EditCommand;
+use Dontdrinkandroot\BridgeBundle\Controller\Security\LoginLink\CheckAction;
+use Dontdrinkandroot\BridgeBundle\Controller\Security\LoginAction;
+use Dontdrinkandroot\BridgeBundle\Controller\Security\LoginLink\RequestAction;
+use Dontdrinkandroot\BridgeBundle\Repository\User\UserRepository;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
+
+return function (ContainerConfigurator $configurator): void {
+    $services = $configurator->services();
+
+    $services->set(RequestAction::class)
+        ->autoconfigure()
+        ->autowire()
+        ->tag('controller.service_arguments');
+
+    $services->set(CheckAction::class)
+        ->autoconfigure()
+        ->autowire()
+        ->tag('controller.service_arguments');
+};
diff --git a/config/services/reset_password.php b/config/services/reset_password.php
diff --git a/config/services/services.php b/config/services/services.php
@@ -7,7 +7,9 @@
 use Dontdrinkandroot\BridgeBundle\Controller\ValueResolver\IdEntityArgumentValueResolver;
 use Dontdrinkandroot\BridgeBundle\Controller\ValueResolver\UuidEntityArgumentValueResolver;
 use Dontdrinkandroot\BridgeBundle\Form\Type\FlexDateType;
+use Dontdrinkandroot\BridgeBundle\Model\Container\ParamName;
 use Dontdrinkandroot\BridgeBundle\Model\Container\TagName;
+use Dontdrinkandroot\BridgeBundle\Routing\DdrBridgeLoader;
 use Dontdrinkandroot\BridgeBundle\Routing\NestedLoader;
 use Dontdrinkandroot\BridgeBundle\Service\EncryptionService;
 use Dontdrinkandroot\BridgeBundle\Service\Health\HttpHealthProvider;
@@ -17,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpFoundation\RequestStack;
 
+use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 
@@ -32,6 +35,11 @@
         ])
         ->tag('routing.loader');
 
+    $services->set(DdrBridgeLoader::class)#
+        ->arg('$userEnabled', param(ParamName::USER_ENABLED))
+        ->arg('$loginLinkEnabled', param(ParamName::USER_LOGIN_LINK_ENABLED))
+        ->tag('routing.loader');
+
     $services->set(EncryptionService::class);
 
     $services->set(GenerateKeyCommand::class)

diff --git a/config/services/user.php b/config/services/user.php
@@ -4,6 +4,7 @@
 
 use Dontdrinkandroot\BridgeBundle\Command\User\EditCommand;
 use Dontdrinkandroot\BridgeBundle\Controller\Security\LoginAction;
+use Dontdrinkandroot\BridgeBundle\Model\Container\ParamName;
 use Dontdrinkandroot\BridgeBundle\Repository\User\UserRepository;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -15,16 +16,17 @@
     $services->set(UserRepository::class, UserRepository::class)
         ->autoconfigure()
         ->autowire()
-        ->arg('$entityClass', param('ddr.bridge_bundle.user.class'));
+        ->arg('$entityClass', param(ParamName::USER_CLASS));
 
     $services->set(EditCommand::class, EditCommand::class)
         ->autoconfigure()
         ->autowire()
-        ->arg('$userClass', param('ddr.bridge_bundle.user.class'))
+        ->arg('$userClass', param(ParamName::USER_CLASS))
         ->tag('console.command');
 
     $services->set(LoginAction::class)
         ->autoconfigure()
         ->autowire()
+        ->arg('$loginLinkEnabled', param(ParamName::USER_LOGIN_LINK_ENABLED))
         ->tag('controller.service_arguments');
 };
diff --git a/recipe/config/routes/ddr_bridge.php b/recipe/config/routes/ddr_bridge.php
@@ -2,10 +2,9 @@
 
 namespace App\Config\Routes;
 
+use Dontdrinkandroot\BridgeBundle\Routing\DdrBridgeLoader;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
 return function (RoutingConfigurator $routes): void {
-    $routes->import('@DdrBridgeBundle/config/routes/health.php');
-//    $routes->import('@DdrBridgeBundle/config/routes/login.php');
-//    $routes->import('@DdrBridgeBundle/config/routes/reset_password.php');
+    $routes->import('.', DdrBridgeLoader::TYPE);
 };
diff --git a/src/Controller/Security/LoginAction.php b/src/Controller/Security/LoginAction.php
@@ -11,8 +11,8 @@
 class LoginAction extends AbstractController
 {
     public function __construct(
-        private readonly UrlGeneratorInterface $urlGenerator,
-        private readonly AuthenticationUtils $authenticationUtils
+        private readonly AuthenticationUtils $authenticationUtils,
+        private readonly bool $loginLinkEnabled
     ) {
     }
 
@@ -24,16 +24,10 @@ public function __invoke(): Response
         /* last username entered by the user */
         $lastUsername = $this->authenticationUtils->getLastUsername();
 
-        try {
-            $pathPasswordReset = $this->urlGenerator->generate('ddr.bridge.security.reset_password');
-        } catch (RouteNotFoundException) {
-            $pathPasswordReset = null;
-        }
-
         return $this->render('@DdrBridge/Security/login.html.twig', [
             'last_username'     => $lastUsername,
             'error'             => $error,
-            'pathPasswordReset' => $pathPasswordReset
+            'loginLinkEnabled'  => $this->loginLinkEnabled,
         ]);
     }
 }
diff --git a/src/Controller/Security/LoginLink/CheckAction.php b/src/Controller/Security/LoginLink/CheckAction.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Dontdrinkandroot\BridgeBundle\Controller\Security\LoginLink;
+
+use Dontdrinkandroot\BridgeBundle\Model\Container\RouteName;
+use LogicException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Attribute\Route;
+
+class CheckAction extends AbstractController
+{
+    public function __invoke(): never
+    {
+        throw new LogicException('This code should never be reached');
+    }
+}
diff --git a/src/Controller/Security/LoginLink/RequestAction.php b/src/Controller/Security/LoginLink/RequestAction.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Dontdrinkandroot\BridgeBundle\Controller\Security\LoginLink;
+
+use Dontdrinkandroot\BridgeBundle\Model\Container\RouteName;
+use Dontdrinkandroot\BridgeBundle\Repository\User\UserRepository;
+use Dontdrinkandroot\BridgeBundle\Service\Mail\MailServiceInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Http\LoginLink\LoginLinkHandlerInterface;
+use Symfony\Component\Translation\TranslatableMessage;
+
+class RequestAction extends AbstractController
+{
+    public function __construct(
+        private readonly LoginLinkHandlerInterface $loginLinkHandler,
+        private readonly TokenStorageInterface $tokenStorage,
+        private readonly UserRepository $userRepository,
+        private readonly MailServiceInterface $mailService,
+    ) {
+    }
+
+    public function __invoke(Request $request): Response
+    {
+        if (null !== ($user = $this->tokenStorage->getToken()?->getUser())) {
+            return $this->redirectToRoute('app.index');
+        }
+
+        $form = $this->createFormBuilder()
+            ->add('email', EmailType::class)
+            ->getForm();
+
+        $success = false;
+        $form->handleRequest($request);
+        if ($form->isSubmitted() && $form->isValid()) {
+            $email = $form->getData()['email'];
+            $user = $this->userRepository->findOneByEmail($email);
+            if (null !== $user) {
+                $loginLinkDetails = $this->loginLinkHandler->createLoginLink($user);
+                $loginLink = $loginLinkDetails->getUrl();
+                $this->mailService->sendMailMarkdownTemplate(
+                    to: new Address($user->email),
+                    subject: 'Login Link',
+                    template: '@DdrBridge/Security/login_link.mail.md.twig',
+                    templateParameters: [
+                        'user' => $user,
+                        'link' => $loginLink,
+                    ]
+                );
+            }
+            $this->addFlash(
+                'success',
+                new TranslatableMessage('login_link.flash.success', [], 'ddr_security')
+            );
+            $success = true;
+        }
+
+        return $this->render('@DdrBridge/Security/request_login_link.html.twig', [
+            'form' => $form->createView(),
+            'success' => $success,
+        ]);
+    }
+}
diff --git a/src/Controller/Security/ResetPasswordAction.php b/src/Controller/Security/ResetPasswordAction.php
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -21,7 +21,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->addDefaultsIfNotSet()
                 ->children()
                     ->scalarNode('class')->defaultValue('App\Entity\User')->end()
-                    ->booleanNode('reset_password')->defaultFalse()->end()
+                    ->booleanNode('login_link')->defaultFalse()->end()
                 ->end()
             ->end()
             ->arrayNode('mail')