Allow resolving of users by email for admins

Author: Seldaek

src/ArgumentResolver/UserResolver.php

@@ -15,6 +15,7 @@
 use App\Attribute\VarName;
 use App\Entity\User;
 use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
@@ -26,7 +27,7 @@
  */
 class UserResolver implements ValueResolverInterface
 {
-    public function __construct(private readonly ManagerRegistry $doctrine)
+    public function __construct(private readonly ManagerRegistry $doctrine, private readonly Security $security)
     {
     }
 
@@ -54,6 +55,11 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
         }
 
         $user = $this->doctrine->getRepository(User::class)->findOneBy(['usernameCanonical' => $username]);
+
+        if (!$user && $this->security->isGranted('ROLE_ADMIN') && \filter_var($username, \FILTER_VALIDATE_EMAIL)) {
+            $user = $this->doctrine->getRepository(User::class)->findOneBy(['emailCanonical' => $username]);
+        }
+
         if (!$user) {
             throw new NotFoundHttpException('User with name '.$username.' was not found');
         }

src/Controller/ProfileController.php

@@ -58,6 +58,10 @@ public function myProfile(Request $req, FavoriteManager $favMgr, DownloadManager
     #[Route(path: '/users/{name}/', name: 'user_profile')]
     public function publicProfile(Request $req, #[VarName('name')] User $user, FavoriteManager $favMgr, DownloadManager $dlMgr, #[CurrentUser] ?User $loggedUser = null): Response
     {
+        if ($req->attributes->getString('name') !== $user->getUsername()) {
+            return $this->redirectToRoute('user_profile', ['name' => $user->getUsername()]);
+        }
+
         $packages = $this->getUserPackages($req, $user);
 
         $data = [