Update backend/email_utils.py

backend/email_utils.py

@@ -1,59 +1,64 @@
 # File: backend/email_utils.py
-from fastapi_mail import FastMail, MessageSchema, ConnectionConfig, MessageType
+import httpx
 from pydantic import EmailStr
 import random
 import string
+import os
 
 # --- CONFIGURATION ---
-# Set to True to bypass Hugging Face email blocks and print OTPs to logs
-SUPPRESS_SEND = True
+# Securely pull both keys from Hugging Face Settings
+MAILJET_API_KEY = os.getenv("MAILJET_API_KEY")
+MAILJET_SECRET_KEY = os.getenv("MAILJET_SECRET_KEY")
 
-conf = ConnectionConfig(
-    MAIL_USERNAME="duashehzad969@gmail.com",
-    MAIL_PASSWORD="xyvo lttj sjki cmtx",
-    MAIL_FROM="duashehzad969@gmail.com",
-    MAIL_PORT=587,
-    MAIL_SERVER="smtp.gmail.com",
-    MAIL_STARTTLS=True,
-    MAIL_SSL_TLS=False,
-    USE_CREDENTIALS=True,
-    VALIDATE_CERTS=True
-)
+# This MUST exactly match the email you registered in Mailjet
+SENDER_EMAIL = "docusortofficial@gmail.com" 
+SENDER_NAME = "DocuSort"
 
 def generate_otp(length=6):
     return ''.join(random.choices(string.digits, k=length))
 
 async def send_otp_email(email: EmailStr, otp: str, subject="DocuSort Verification"):
-    if SUPPRESS_SEND:
+    # Fallback safety: If API keys are missing, print to logs instead of crashing
+    if not MAILJET_API_KEY or not MAILJET_SECRET_KEY:
         print(f"\n{'='*40}")
-        print(f" [MOCK EMAIL] To: {email}")
-        print(f" [MOCK EMAIL] Subject: {subject}")
-        print(f" [MOCK EMAIL] CODE: {otp}")
+        print(f" ⚠️ [MOCK EMAIL - NO API KEY] To: {email}")
+        print(f" ⚠️ [MOCK EMAIL - NO API KEY] CODE: {otp}")
         print(f"{'='*40}\n")
         return
 
-    message = MessageSchema(
-        subject=subject,
-        recipients=[email],
-        body=f"<p>Your verification code is: <strong>{otp}</strong></p><p>This code expires in 5 minutes.</p>",
-        subtype=MessageType.html
-    )
+    url = "https://api.mailjet.com/v3.1/send"
+    payload = {
+        "Messages": [
+            {
+                "From": {"Email": SENDER_EMAIL, "Name": SENDER_NAME},
+                "To": [{"Email": email}],
+                "Subject": subject,
+                "HTMLPart": f"<p>Your verification code is: <strong>{otp}</strong></p><p>This code expires in 10 minutes.</p>"
+            }
+        ]
+    }
 
-    fm = FastMail(conf)
-    await fm.send_message(message)
+    async with httpx.AsyncClient() as client:
+        try:
+            response = await client.post(
+                url, 
+                json=payload, 
+                auth=(MAILJET_API_KEY, MAILJET_SECRET_KEY)
+            )
+            response.raise_for_status()
+        except Exception as e:
+            print(f"Mailjet API Error: {e}")
 
-# --- PROFESSIONAL SYSTEM ALERTS ---
 async def send_alert_email(email: EmailStr, subject: str, body_content: str):
-    if SUPPRESS_SEND:
-        print(f"\n{'='*40}")
-        print(f" [MOCK ALERT] To: {email}")
-        print(f" [MOCK ALERT] Subject: {subject}")
-        # Strip HTML tags just for cleaner terminal logging
+    if not MAILJET_API_KEY or not MAILJET_SECRET_KEY:
         clean_body = body_content.replace("<br>", "\n").replace("<b style='font-size:24px;'>", "").replace("</b>", "")
-        print(f" [MOCK ALERT] Body: \n{clean_body}")
+        print(f"\n{'='*40}")
+        print(f" ⚠️ [MOCK ALERT - NO API KEY] To: {email}")
+        print(f" ⚠️ [MOCK ALERT - NO API KEY] Body: \n{clean_body}")
         print(f"{'='*40}\n")
         return
 
+    url = "https://api.mailjet.com/v3.1/send"
     html_body = f"""
     <div style="font-family: Arial, sans-serif; padding: 20px; color: #333; max-width: 600px; margin: 0 auto; border: 1px solid #e2e8f0; border-radius: 8px;">
         <h2 style="color: #4f46e5; border-bottom: 2px solid #e0e7ff; padding-bottom: 10px;">DocuSort Notification</h2>
@@ -64,12 +69,24 @@ async def send_alert_email(email: EmailStr, subject: str, body_content: str):
     </div>
     """
 
-    message = MessageSchema(
-        subject=subject,
-        recipients=[email],
-        body=html_body,
-        subtype=MessageType.html
-    )
+    payload = {
+        "Messages": [
+            {
+                "From": {"Email": SENDER_EMAIL, "Name": SENDER_NAME},
+                "To": [{"Email": email}],
+                "Subject": subject,
+                "HTMLPart": html_body
+            }
+        ]
+    }
 
-    fm = FastMail(conf)
-    await fm.send_message(message)
+    async with httpx.AsyncClient() as client:
+        try:
+            response = await client.post(
+                url, 
+                json=payload, 
+                auth=(MAILJET_API_KEY, MAILJET_SECRET_KEY)
+            )
+            response.raise_for_status()
+        except Exception as e:
+            print(f"Mailjet API Error: {e}")