[AdminBundle] Allow new password hashing component to fix sf5 depreca…

…tion
Kunstmaan · Oct 13, 2021 · 1108f4d · 1108f4d
1 parent cd182fc
commit 1108f4d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/InjectPasswordHasherPass.php b/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/InjectPasswordHasherPass.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Kunstmaan\AdminBundle\DependencyInjection\Compiler;
+
+use Kunstmaan\AdminBundle\Service\UserManager;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class InjectPasswordHasherPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->has('security.password_hasher_factory')) {
+            return;
+        }
+
+        $container->getDefinition(UserManager::class)->setArgument('$hasherFactory', $container->getDefinition('security.password_hasher_factory'));
+    }
+}
diff --git a/src/Kunstmaan/AdminBundle/KunstmaanAdminBundle.php b/src/Kunstmaan/AdminBundle/KunstmaanAdminBundle.php
@@ -6,6 +6,7 @@
 use Kunstmaan\AdminBundle\DependencyInjection\Compiler\AdminPanelCompilerPass;
 use Kunstmaan\AdminBundle\DependencyInjection\Compiler\DataCollectorPass;
 use Kunstmaan\AdminBundle\DependencyInjection\Compiler\EnablePermissionsPass;
+use Kunstmaan\AdminBundle\DependencyInjection\Compiler\InjectPasswordHasherPass;
 use Kunstmaan\AdminBundle\DependencyInjection\Compiler\MenuCompilerPass;
 use Kunstmaan\AdminBundle\DependencyInjection\KunstmaanAdminExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -28,6 +29,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new AddLogProcessorsCompilerPass());
         $container->addCompilerPass(new DataCollectorPass());
         $container->addCompilerPass(new EnablePermissionsPass());
+        $container->addCompilerPass(new InjectPasswordHasherPass());
 
         $container->registerExtension(new KunstmaanAdminExtension());
     }

diff --git a/src/Kunstmaan/AdminBundle/Service/UserManager.php b/src/Kunstmaan/AdminBundle/Service/UserManager.php
@@ -5,6 +5,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Kunstmaan\AdminBundle\Entity\UserInterface;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 
 class UserManager
@@ -13,14 +14,19 @@ class UserManager
     private $em;
     /** @var string */
     private $class;
-    /** @var string */
+    /** @var EncoderFactoryInterface|PasswordHasherFactoryInterface */
     private $encoderFactory;
 
-    public function __construct(EncoderFactoryInterface $encoderFactory, EntityManagerInterface $em, string $class)
+    public function __construct($hasherFactory, EntityManagerInterface $em, string $class)
     {
+        //NEXT_MAJOR When symfony <5.3 is removed, add PasswordHasherFactoryInterface typehint and remove BC layer and compiler pass
+        if (!$hasherFactory instanceof EncoderFactoryInterface && !$hasherFactory instanceof PasswordHasherFactoryInterface) {
+            throw new \InvalidArgumentException(sprintf('The "$hasherFactory" parameter should be instance of "%s" or "%s"', EncoderFactoryInterface::class, PasswordHasherFactoryInterface::class));
+        }
+
         $this->em = $em;
         $this->class = $class;
-        $this->encoderFactory = $encoderFactory;
+        $this->encoderFactory = $hasherFactory;
     }
 
     public function deleteUser(UserInterface $user): void
@@ -66,10 +72,16 @@ public function updatePassword(UserInterface $user, bool $andFlush = true): void
             return;
         }
 
-        $encoder = $this->encoderFactory->getEncoder($user);
-        $user->setSalt(null);
+        if ($this->encoderFactory instanceof EncoderFactoryInterface) {
+            $encoder = $this->encoderFactory->getEncoder($user);
+            $user->setSalt(null);
+
+            $hashedPassword = $encoder->encodePassword($plainPassword, $user->getSalt());
+        } else {
+            $hasher = $this->encoderFactory->getPasswordHasher($user);
+            $hashedPassword = $hasher->hash($hasher);
+        }
 
-        $hashedPassword = $encoder->encodePassword($plainPassword, $user->getSalt());
         $user->setPassword($hashedPassword);
         $user->setPasswordChanged(true);
         $user->setConfirmationToken(null);

diff --git a/src/Kunstmaan/AdminBundle/composer.json b/src/Kunstmaan/AdminBundle/composer.json
@@ -58,7 +58,8 @@
         "kunstmaan/user-management-bundle": "^5.9|^6.0",
         "kunstmaan/media-bundle": "^5.9|^6.0",
         "doctrine/doctrine-migrations-bundle": "^1.3|^2.1",
-        "symfony/mailer": "For symfony mailer support in the authentication mailer (^4.4)"
+        "symfony/mailer": "For symfony mailer support in the authentication mailer (^4.4)",
+        "symfony/password-hasher": "Use the new password-hasher component in the authentication system"
     },
     "require-dev": {
         "kunstmaan/media-bundle": "^5.9|^6.0",