replaced projectDir path with Kernel::locateResource

Author: ViniTou

src/bundle/Resources/config/services/notifier.yaml

@@ -6,10 +6,6 @@ services:
 
     Ibexa\AdminUi\Notifier\PasswordReset:
         decorates: Ibexa\Contracts\User\PasswordReset\NotifierInterface
-        arguments:
-            $projectDir: '%kernel.project_dir%'
 
     Ibexa\AdminUi\Notifier\UserInvitation:
         decorates: Ibexa\Contracts\User\Invitation\InvitationSender
-        arguments:
-            $projectDir: '%kernel.project_dir%'

src/lib/Notifier/PasswordReset.php

@@ -16,13 +16,19 @@
 use Ibexa\Contracts\Notifications\Value\Recipent\UserRecipient;
 use Ibexa\Contracts\User\Notification\UserPasswordReset;
 use Ibexa\Contracts\User\PasswordReset\NotifierInterface;
+use InvalidArgumentException;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
 use Swift_Image;
 use Swift_Mailer;
 use Swift_Message;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Twig\Environment;
 
-class PasswordReset implements NotifierInterface
+class PasswordReset implements NotifierInterface, LoggerAwareInterface
 {
+    use LoggerAwareTrait;
+
     private ConfigResolverInterface $configResolver;
 
     private Swift_Mailer $mailer;
@@ -31,20 +37,33 @@ class PasswordReset implements NotifierInterface
 
     private NotificationServiceInterface $notificationService;
 
-    private string $projectDir;
+    private KernelInterface $kernel;
 
     public function __construct(
         ConfigResolverInterface $configResolver,
         Swift_Mailer $mailer,
         Environment $twig,
         NotificationServiceInterface $notificationService,
-        string $projectDir
+        KernelInterface $kernel
     ) {
         $this->configResolver = $configResolver;
         $this->mailer = $mailer;
         $this->twig = $twig;
         $this->notificationService = $notificationService;
-        $this->projectDir = $projectDir;
+        $this->kernel = $kernel;
+    }
+
+    private function locateMailImage(string $imageName): string
+    {
+        try {
+            return $this->kernel->locateResource('@IbexaAdminUiBundle/Resources/public/img/mail/' . $imageName);
+        } catch (InvalidArgumentException $e) {
+            if ($this->logger) {
+                $this->logger->error('Failed to locate mail image: ' . $imageName, ['exception' => $e]);
+            }
+
+            return '#';
+        }
     }
 
     public function sendMessage(User $user, string $hashKey): void
@@ -55,7 +74,6 @@ public function sendMessage(User $user, string $hashKey): void
             return;
         }
 
-        // Swiftmailer delivery has to be kept to maintain backwards compatibility
         $template = $this->twig->load($this->configResolver->getParameter('user_forgot_password.templates.mail'));
 
         $senderAddress = $this->configResolver->hasParameter('sender_address', 'swiftmailer.mailer')
@@ -69,9 +87,7 @@ public function sendMessage(User $user, string $hashKey): void
             ->setSubject($subject)
             ->setTo($user->email);
 
-        $embeddedHeader = $message->embed(Swift_Image::fromPath(
-            $this->projectDir . '/public/bundles/ibexaadminui/img/mail/header.png'
-        ));
+        $embeddedHeader = $message->embed(Swift_Image::fromPath($this->locateMailImage('header.png')));
 
         $body = $template->renderBlock('body', [
             'hash_key' => $hashKey,

src/lib/Notifier/UserInvitation.php

@@ -11,31 +11,50 @@
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\User\Invitation\Invitation;
 use Ibexa\Contracts\User\Invitation\InvitationSender;
+use InvalidArgumentException;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
 use Swift_Image;
 use Swift_Mailer;
 use Swift_Message;
+use Symfony\Component\HttpKernel\KernelInterface;
 use Twig\Environment;
 
-final class UserInvitation implements InvitationSender
+final class UserInvitation implements InvitationSender, LoggerAwareInterface
 {
+    use LoggerAwareTrait;
+
     private Environment $twig;
 
     private ConfigResolverInterface $configResolver;
 
     private Swift_Mailer $mailer;
 
-    private string $projectDir;
+    private KernelInterface $kernel;
 
     public function __construct(
         Environment $twig,
         ConfigResolverInterface $configResolver,
         Swift_Mailer $mailer,
-        string $projectDir
+        KernelInterface $kernel
     ) {
         $this->twig = $twig;
         $this->configResolver = $configResolver;
         $this->mailer = $mailer;
-        $this->projectDir = $projectDir;
+        $this->kernel = $kernel;
+    }
+
+    private function locateMailImage(string $imageName): string
+    {
+        try {
+            return $this->kernel->locateResource('@IbexaAdminUiBundle/Resources/public/img/mail/' . $imageName);
+        } catch (InvalidArgumentException $e) {
+            if ($this->logger) {
+                $this->logger->error('Failed to locate mail image: ' . $imageName, ['exception' => $e]);
+            }
+
+            return '#';
+        }
     }
 
     public function sendInvitation(Invitation $invitation): void
@@ -59,10 +78,9 @@ public function sendInvitation(Invitation $invitation): void
             ->setSubject($subject)
             ->setTo($invitation->getEmail());
 
-        $mailImagesDir = $this->projectDir . '/public/bundles/ibexaadminui/img/mail/';
-        $embeddedHeader = $message->embed(Swift_Image::fromPath($mailImagesDir . 'header.jpg'));
-        $embeddedBtnPrimaryLeftSide = $message->embed(Swift_Image::fromPath($mailImagesDir . 'btn_primary_left_side.jpg'));
-        $embeddedBtnPrimaryRightSide = $message->embed(Swift_Image::fromPath($mailImagesDir . 'btn_primary_right_side.jpg'));
+        $embeddedHeader = $message->embed(Swift_Image::fromPath($this->locateMailImage('header.jpg')));
+        $embeddedBtnPrimaryLeftSide = $message->embed(Swift_Image::fromPath($this->locateMailImage('btn_primary_left_side.jpg')));
+        $embeddedBtnPrimaryRightSide = $message->embed(Swift_Image::fromPath($this->locateMailImage('btn_primary_right_side.jpg')));
 
         $body = $template->renderBlock('body', [
             'invite_hash' => $invitation->getHash(),