only upgrading password if user has password

weaverryan · weaverryan · commit f5110908f935 · 2019-08-12T22:16:15.000-04:00
diff --git a/src/Maker/MakeUser.php b/src/Maker/MakeUser.php
@@ -108,7 +108,6 @@ class_exists(DoctrineBundle::class)
         $userWillHavePassword = $io->confirm('Does this app need to hash/check user passwords?');
         $input->setOption('with-password', $userWillHavePassword);
 
-        $useArgon2Encoder = false;
         if ($userWillHavePassword && !class_exists(NativePasswordEncoder::class) && Argon2iPasswordEncoder::isSupported()) {
             $io->writeln('The newer <comment>Argon2i</comment> password hasher requires PHP 7.2, libsodium or paragonie/sodium_compat. Your system DOES support this algorithm.');
             $io->writeln('You should use <comment>Argon2i</comment> unless your production system will not support it.');
@@ -140,7 +139,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $classPath = $entityClassGenerator->generateEntityClass(
                 $userClassNameDetails,
                 false, // api resource
-                interface_exists(PasswordUpgraderInterface::class) // security user
+                $userClassConfiguration->hasPassword() && interface_exists(PasswordUpgraderInterface::class) // security user
             );
         } else {
             $classPath = $generator->generateClass($userClassNameDetails->getFullName(), 'Class.tpl.php');
diff --git a/src/Resources/skeleton/authenticator/LoginFormAuthenticator.tpl.php b/src/Resources/skeleton/authenticator/LoginFormAuthenticator.tpl.php
@@ -87,6 +87,9 @@ public function checkCredentials($credentials, UserInterface $user)
     }
 
 <?php if ($password_authenticated): ?>
+    /**
+     * Used to upgrade (rehash) the user's password automatically over time.
+     */
     public function getPassword($credentials)
     {
         return $credentials['password'];

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,9 @@ public function checkCredentials($credentials, UserInterface $user)`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`<?php if ($password_authenticated): ?>`
	`90`	`+ /**`
	`91`	`+ * Used to upgrade (rehash) the user's password automatically over time.`
	`92`	`+ */`
`90`	`93`	`public function getPassword($credentials)`
`91`	`94`	`{`
`92`	`95`	`return $credentials['password'];`