From bc9af6437250367abd3340414203400ab9367f44 Mon Sep 17 00:00:00 2001
From: Ludy87 <Ludy87@users.noreply.github.com>
Date: Tue, 20 May 2025 22:10:40 +0200
Subject: [PATCH] Update EmailService.java

---
 .../SPDF/config/security/mail/EmailService.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java b/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java
index 8939fbab6..507e51599 100644
--- a/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java
@@ -37,8 +37,21 @@ public class EmailService {
      */
     @Async
     public void sendEmailWithAttachment(Email email) throws MessagingException {
-        ApplicationProperties.Mail mailProperties = applicationProperties.getMail();
         MultipartFile file = email.getFileInput();
+        // 1) Validate recipient email address
+        if (email.getTo() == null || email.getTo().trim().isEmpty()) {
+            throw new MessagingException("Invalid Addresses");
+        }
+
+        // 2) Validate attachment
+        if (file == null
+                || file.isEmpty()
+                || file.getOriginalFilename() == null
+                || file.getOriginalFilename().isEmpty()) {
+            throw new MessagingException("An attachment is required to send the email.");
+        }
+
+        ApplicationProperties.Mail mailProperties = applicationProperties.getMail();
 
         // Creates a MimeMessage to represent the email
         MimeMessage message = mailSender.createMimeMessage();