Merge pull request #22 from sumocoders/fixes

jonasdekeukelaere · web-flow · commit 9b48e9fb7354 · 2024-09-10T15:48:27.000+01:00
Fixes
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
@@ -39,6 +39,7 @@ security:
         ROLE_SUPER_ADMIN: [ ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ]
 
     access_control:
+        - { path: ^/admin/users/ajax/password-strength, roles: PUBLIC_ACCESS }
         - { path: ^/admin, roles: ROLE_ADMIN }
         - { path: ^/profile, roles: ROLE_USER }
         - { path: ^/login, roles: PUBLIC_ACCESS }
diff --git a/migrations/Version20210413143447.php b/migrations/Version20210413143447.php
@@ -12,20 +12,25 @@
  */
 final class Version20210413143447 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function getDescription(): string
     {
-        return 'Set up the user table for MySQL';
+        return '';
     }
 
-    public function up(Schema $schema) : void
+    public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE `user` (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) DEFAULT NULL, enabled TINYINT(1) NOT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, confirmation_requested_at DATETIME DEFAULT NULL, confirmed_at DATETIME DEFAULT NULL, password_reset_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE user (id INT AUTO_INCREMENT NOT NULL, password VARCHAR(255) DEFAULT NULL, enabled TINYINT(1) NOT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, confirmation_requested_at DATETIME DEFAULT NULL, confirmed_at DATETIME DEFAULT NULL, password_reset_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
     }
 
-    public function down(Schema $schema) : void
+    public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE `user`');
+        $this->addSql('DROP TABLE user');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
     }
 }
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
@@ -12,6 +12,6 @@ class HomeController extends AbstractController
     #[Route('/', name: 'home')]
     public function __invoke(): Response
     {
-        return $this->redirectToRoute(ProfileController::class);
+        return $this->redirectToRoute('profile');
     }
 }
diff --git a/src/Controller/User/Admin/AddUserController.php b/src/Controller/User/Admin/AddUserController.php
@@ -33,7 +33,7 @@ public function __invoke(
                 $translator->trans('User successfully added.')
             );
 
-            return $this->redirectToRoute(OverviewController::class);
+            return $this->redirectToRoute('user_overview');
         }
 
         return $this->render('user/admin/add.html.twig', [
diff --git a/src/Controller/User/Admin/DisableUserController.php b/src/Controller/User/Admin/DisableUserController.php
@@ -25,6 +25,6 @@ public function __invoke(
             $translator->trans('User successfully disabled.')
         );
 
-        return $this->redirectToRoute(OverviewController::class);
+        return $this->redirectToRoute('user_overview');
     }
 }
diff --git a/src/Controller/User/Admin/EditUserController.php b/src/Controller/User/Admin/EditUserController.php
@@ -35,7 +35,7 @@ public function __invoke(
                 $translator->trans('User successfully edited.')
             );
 
-            return $this->redirectToRoute(OverviewController::class);
+            return $this->redirectToRoute('user_overview');
         }
 
         return $this->render('user/admin/edit.html.twig', [
diff --git a/src/Controller/User/Admin/EnableUserController.php b/src/Controller/User/Admin/EnableUserController.php
@@ -25,6 +25,6 @@ public function __invoke(
             $translator->trans('User successfully enabled.')
         );
 
-        return $this->redirectToRoute(OverviewController::class);
+        return $this->redirectToRoute('user_overview');
     }
 }
diff --git a/src/Controller/User/Admin/RequestConfirmationController.php b/src/Controller/User/Admin/RequestConfirmationController.php
@@ -24,7 +24,7 @@ public function __invoke(
                 $translator->trans('User is already confirmed.')
             );
 
-            $this->redirectToRoute(EditUserController::class, ['user' => $user->getId()]);
+            $this->redirectToRoute('user_edit', ['user' => $user->getId()]);
         }
 
         $bus->dispatch(new SendConfirmation($user));
@@ -34,6 +34,6 @@ public function __invoke(
             $translator->trans('Confirmation mail successfully sent')
         );
 
-        return $this->redirectToRoute(EditUserController::class, ['user' => $user->getId()]);
+        return $this->redirectToRoute('user_edit', ['user' => $user->getId()]);
     }
 }
diff --git a/src/Controller/User/Ajax/PasswordStrengthController.php b/src/Controller/User/Ajax/PasswordStrengthController.php
@@ -6,7 +6,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use SumoCoders\FrameworkCoreBundle\Security\PasswordStrengthService;
+use Symfony\Component\Routing\Attribute\Route;
 
+#[Route('/admin/users/ajax/password-strength', name: 'admin_user_ajax_password_strength')]
 class PasswordStrengthController extends AbstractController
 {
     public function __invoke(
@@ -16,7 +18,7 @@ public function __invoke(
         $password = json_decode($request->getContent(), true)['password'] ?? '';
 
         return $this->json([
-              'strength' => $passwordStrengthService->estimateStrength($password),
+            'strength' => $passwordStrengthService->estimateStrength($password),
         ]);
     }
 }
diff --git a/src/Controller/User/ConfirmController.php b/src/Controller/User/ConfirmController.php
@@ -31,7 +31,7 @@ public function __invoke(
                 $translator->trans('It looks like you clicked on an invalid account activation link. Please try again.')
             );
 
-            return $this->redirectToRoute(LoginController::class);
+            return $this->redirectToRoute('login');
         }
 
         $confirmForm = $this->createForm(ConfirmType::class, new ConfirmUser($user));
@@ -51,12 +51,12 @@ public function __invoke(
              */
             if ($user->getPasswordResetToken() !== null) {
                 return $this->redirectToRoute(
-                    ResetPasswordController::class,
+                    'reset_password',
                     ['token' => $user->getPasswordResetToken()]
                 );
             }
 
-            return $this->redirectToRoute(LoginController::class);
+            return $this->redirectToRoute('login');
         }
 
         return $this->render('user/confirm.html.twig', [
diff --git a/src/Controller/User/LoginController.php b/src/Controller/User/LoginController.php
@@ -16,7 +16,7 @@ public function __invoke(
         AuthenticationUtils $authenticationUtils
     ): Response {
         if ($this->getUser() instanceof User) {
-            return $this->redirectToRoute(ProfileController::class);
+            return $this->redirectToRoute('profile');
         }
 
         $form = $this->createForm(LoginType::class, [
diff --git a/src/Controller/User/ResendConfirmationController.php b/src/Controller/User/ResendConfirmationController.php
@@ -28,13 +28,13 @@ public function __invoke(
                 $translator->trans('Invalid confirmation token.')
             );
 
-            return $this->redirectToRoute(LoginController::class);
+            return $this->redirectToRoute('login');
         }
 
         $bus->dispatch(new SendConfirmation($user));
 
         $this->addFlash('success', $translator->trans('Confirmation mail successfully resent'));
 
-        return $this->redirectToRoute(LoginController::class);
+        return $this->redirectToRoute('login');
     }
 }
diff --git a/src/Controller/User/ResetPasswordController.php b/src/Controller/User/ResetPasswordController.php
@@ -31,7 +31,7 @@ public function __invoke(
                 $translator->trans('It looks like you clicked on an invalid password reset link. Please try again.')
             );
 
-            return $this->redirectToRoute(ForgotPasswordController::class);
+            return $this->redirectToRoute('forgot_password');
         }
 
         $form = $this->createForm(ResetPasswordType::class, new ResetPassword($user));
@@ -46,7 +46,7 @@ public function __invoke(
                 $translator->trans('New password set successfully.')
             );
 
-            return $this->redirectToRoute(LoginController::class);
+            return $this->redirectToRoute('login');
         }
 
         return $this->render('user/reset.html.twig', [
diff --git a/src/MessageHandler/User/SendConfirmationHandler.php b/src/MessageHandler/User/SendConfirmationHandler.php
@@ -45,7 +45,7 @@ public function __invoke(SendConfirmation $message): User
             ->htmlTemplate('user/mails/confirm.html.twig')
             ->context([
                 'confirmationLink' => $this->router->generate(
-                    ConfirmController::class,
+                    'confirm',
                     [
                         'token' => $user->getConfirmationToken(),
                     ],
diff --git a/src/MessageHandler/User/SendPasswordResetHandler.php b/src/MessageHandler/User/SendPasswordResetHandler.php
@@ -48,7 +48,7 @@ public function __invoke(SendPasswordReset $message): void
                 ->htmlTemplate('user/mails/reset.html.twig')
                 ->context([
                     'resetLink' => $this->router->generate(
-                        ResetPasswordController::class,
+                        'reset_password',
                         [
                             'token' => $user->getPasswordResetToken(),
                         ],
diff --git a/src/Security/AuthenticationEntryPoint.php b/src/Security/AuthenticationEntryPoint.php
@@ -24,6 +24,6 @@ public function start(Request $request, AuthenticationException $authException =
             $session->getFlashBag()->add('note', 'You have to login in order to access this page.');
         }
 
-        return new RedirectResponse($this->urlGenerator->generate(LoginController::class));
+        return new RedirectResponse($this->urlGenerator->generate('login'));
     }
 }
diff --git a/src/Security/CustomAuthenticator.php b/src/Security/CustomAuthenticator.php
@@ -22,7 +22,7 @@ class CustomAuthenticator extends AbstractLoginFormAuthenticator
 {
     use TargetPathTrait;
 
-    final public const LOGIN_ROUTE = LoginController::class;
+    final public const LOGIN_ROUTE = 'login';
 
     public function __construct(private readonly UrlGeneratorInterface $urlGenerator)
     {
@@ -56,7 +56,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
             return new RedirectResponse($targetPath);
         }
 
-        return new RedirectResponse($this->urlGenerator->generate(ProfileController::class));
+        return new RedirectResponse($this->urlGenerator->generate('profile'));
     }
 
     protected function getLoginUrl(Request $request): string
diff --git a/src/Security/UserChecker.php b/src/Security/UserChecker.php
@@ -33,7 +33,7 @@ public function checkPreAuth(UserInterface $user): void
                     'Account has not been confirmed. <a href="%requestConfirmationUrl%">Resend confirmation mail</a>',
                     [
                         '%requestConfirmationUrl%' => $this->router->generate(
-                            RequestConfirmationController::class,
+                            'request_confirmation',
                             [
                                 'token' => $user->getConfirmationToken(),
                             ]

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,25 @@`
`12`	`12`	`*/`
`13`	`13`	`final class Version20210413143447 extends AbstractMigration`
`14`	`14`	`{`
`15`		`- public function getDescription() : string`
	`15`	`+ public function getDescription(): string`
`16`	`16`	`{`
`17`		`- return 'Set up the user table for MySQL';`
	`17`	`+ return '';`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function up(Schema $schema) : void`
	`20`	`+ public function up(Schema $schema): void`
`21`	`21`	`{`
`22`	`22`	`// this up() migration is auto-generated, please modify it to your needs`
`23`		- $this->addSql('CREATE TABLE `user` (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) DEFAULT NULL, enabled TINYINT(1) NOT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, confirmation_requested_at DATETIME DEFAULT NULL, confirmed_at DATETIME DEFAULT NULL, password_reset_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
	`23`	+ $this->addSql('CREATE TABLE user (id INT AUTO_INCREMENT NOT NULL, password VARCHAR(255) DEFAULT NULL, enabled TINYINT(1) NOT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, confirmation_requested_at DATETIME DEFAULT NULL, confirmed_at DATETIME DEFAULT NULL, password_reset_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
`24`	`24`	`}`
`25`	`25`
`26`		`- public function down(Schema $schema) : void`
	`26`	`+ public function down(Schema $schema): void`
`27`	`27`	`{`
`28`	`28`	`// this down() migration is auto-generated, please modify it to your needs`
`29`		- $this->addSql('DROP TABLE `user`');
	`29`	`+ $this->addSql('DROP TABLE user');`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ public function isTransactional(): bool`
	`33`	`+ {`
	`34`	`+ return false;`
`30`	`35`	`}`
`31`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ class HomeController extends AbstractController`
`12`	`12`	`#[Route('/', name: 'home')]`
`13`	`13`	`public function __invoke(): Response`
`14`	`14`	`{`
`15`		`- return $this->redirectToRoute(ProfileController::class);`
	`15`	`+ return $this->redirectToRoute('profile');`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __invoke(`
`33`	`33`	`$translator->trans('User successfully added.')`
`34`	`34`	`);`
`35`	`35`
`36`		`- return $this->redirectToRoute(OverviewController::class);`
	`36`	`+ return $this->redirectToRoute('user_overview');`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`return $this->render('user/admin/add.html.twig', [`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ public function __invoke(`
`25`	`25`	`$translator->trans('User successfully disabled.')`
`26`	`26`	`);`
`27`	`27`
`28`		`- return $this->redirectToRoute(OverviewController::class);`
	`28`	`+ return $this->redirectToRoute('user_overview');`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __invoke(`
`35`	`35`	`$translator->trans('User successfully edited.')`
`36`	`36`	`);`
`37`	`37`
`38`		`- return $this->redirectToRoute(OverviewController::class);`
	`38`	`+ return $this->redirectToRoute('user_overview');`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`return $this->render('user/admin/edit.html.twig', [`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function __invoke(`
`24`	`24`	`$translator->trans('User is already confirmed.')`
`25`	`25`	`);`
`26`	`26`
`27`		`- $this->redirectToRoute(EditUserController::class, ['user' => $user->getId()]);`
	`27`	`+ $this->redirectToRoute('user_edit', ['user' => $user->getId()]);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`$bus->dispatch(new SendConfirmation($user));`
`@@ -34,6 +34,6 @@ public function __invoke(`
`34`	`34`	`$translator->trans('Confirmation mail successfully sent')`
`35`	`35`	`);`
`36`	`36`
`37`		`- return $this->redirectToRoute(EditUserController::class, ['user' => $user->getId()]);`
	`37`	`+ return $this->redirectToRoute('user_edit', ['user' => $user->getId()]);`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@`
`6`	`6`	`use Symfony\Component\HttpFoundation\Request;`
`7`	`7`	`use Symfony\Component\HttpFoundation\Response;`
`8`	`8`	`use SumoCoders\FrameworkCoreBundle\Security\PasswordStrengthService;`
	`9`	`+use Symfony\Component\Routing\Attribute\Route;`
`9`	`10`
	`11`	`+#[Route('/admin/users/ajax/password-strength', name: 'admin_user_ajax_password_strength')]`
`10`	`12`	`class PasswordStrengthController extends AbstractController`
`11`	`13`	`{`
`12`	`14`	`public function __invoke(`
`@@ -16,7 +18,7 @@ public function __invoke(`
`16`	`18`	`$password = json_decode($request->getContent(), true)['password'] ?? '';`
`17`	`19`
`18`	`20`	`return $this->json([`
`19`		`- 'strength' => $passwordStrengthService->estimateStrength($password),`
	`21`	`+ 'strength' => $passwordStrengthService->estimateStrength($password),`
`20`	`22`	`]);`
`21`	`23`	`}`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __invoke(`
`31`	`31`	`$translator->trans('It looks like you clicked on an invalid account activation link. Please try again.')`
`32`	`32`	`);`
`33`	`33`
`34`		`- return $this->redirectToRoute(LoginController::class);`
	`34`	`+ return $this->redirectToRoute('login');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$confirmForm = $this->createForm(ConfirmType::class, new ConfirmUser($user));`
`@@ -51,12 +51,12 @@ public function __invoke(`
`51`	`51`	`*/`
`52`	`52`	`if ($user->getPasswordResetToken() !== null) {`
`53`	`53`	`return $this->redirectToRoute(`
`54`		`- ResetPasswordController::class,`
	`54`	`+ 'reset_password',`
`55`	`55`	`['token' => $user->getPasswordResetToken()]`
`56`	`56`	`);`
`57`	`57`	`}`
`58`	`58`
`59`		`- return $this->redirectToRoute(LoginController::class);`
	`59`	`+ return $this->redirectToRoute('login');`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`return $this->render('user/confirm.html.twig', [`