Switch package from Flask-Mail to Flask-Mailman; Update function send_feedback to new Flask-Mailman syntax; Moved MAIL_SERVER, MAIL_PORT, RECIPIENT to .env; Renamed MAIL_USERNAME to SENDER_EMAIL

Author: leekahung

backend/.env.example

@@ -23,5 +23,8 @@ DB_USE_SSL=false
 #DB_PASSWORD=password
 
 # SMTP setup
-#MAIL_USERNAME="[email protected]"
-#APP_PASSWORD="app_specific_password"
+#MAIL_SERVER="smtp.service.com"
+#MAIL_PORT=587
+#SENDER_EMAIL="[email protected]"
+#APP_PASSWORD="app_specific_password"
+#RECIPIENT_EMAIL="[email protected]"

backend/pyproject.toml

@@ -4,7 +4,7 @@ version = "0.2.0"
 requires-python = ">=3.12"
 dependencies = [
   "flask",
-  "Flask-Mail",
+  "flask-mailman",
   "Flask_Limiter",
   "xhtml2pdf",
   "redis",

backend/tenantfirstaid/app.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from flask import Flask, jsonify, session
-from flask_mail import Mail
+from flask_mailman import Mail
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
 import os
@@ -19,7 +19,6 @@
 from .feedback import send_feedback
 
 app = Flask(__name__)
-mail = Mail(app)
 
 
 def build_valkey_uri():
@@ -47,16 +46,14 @@ def build_valkey_uri():
 app.config["SESSION_COOKIE_SAMESITE"] = "Lax"
 
 # Configure Flask Mail
-app.config.update(
-    MAIL_SERVER="smtp.gmail.com",
-    MAIL_PORT=587,
-    MAIL_USE_TLS=True,
-    MAIL_USERNAME=os.getenv("MAIL_USERNAME"),
-    MAIL_PASSWORD=os.getenv("APP_PASSWORD"),
-)
-
-mail.init_app(app)
+app.config["MAIL_SERVER"] = os.getenv("MAIL_SERVER")
+app.config["MAIL_PORT"] = os.getenv("MAIL_PORT")
+app.config["MAIL_USE_TLS"] = True
+app.config["MAIL_USERNAME"] = os.getenv("SENDER_EMAIL")
+app.config["MAIL_PASSWORD"] = os.getenv("APP_PASSWORD")
+app.config["MAIL_DEFAULT_SENDER"] = os.getenv("SENDER_EMAIL")
 
+mail = Mail(app)
 
 tenant_session = TenantSession()
 

backend/tenantfirstaid/feedback.py

@@ -1,42 +1,45 @@
 from xhtml2pdf import pisa
 from io import BytesIO
 from flask import request
-from flask_mail import Message
+from flask_mailman import EmailMessage
 import os
+from typing import Optional, Tuple
 
 
-def convert_html_to_pdf(html_content):
+def convert_html_to_pdf(html_content: str) -> Optional[bytes]:
     pdf_buffer = BytesIO()
     pisa_status = pisa.CreatePDF(html_content, dest=pdf_buffer)
     if pisa_status.err:
         return None
     return pdf_buffer.getvalue()
 
 
-def send_feedback(mail):
+def send_feedback() -> Tuple[str, int]:
     feedback = request.form.get("feedback")
     file = request.files.get("transcript")
 
     if not file:
         return "No file provided", 400
 
-    html_content = file.read().decode("utf-8")
-    pdf_data = convert_html_to_pdf(html_content)
-    if pdf_data is None:
+    html_content: str = file.read().decode("utf-8")
+    pdf_content: Optional[bytes] = convert_html_to_pdf(html_content)
+    if pdf_content is None:
         return "PDF conversion failed", 500
 
-    msg = Message(
-        subject="Feedback with Transcript",
-        sender=os.getenv("MAIL_USERNAME"),
-        recipients=["[email protected]"],
-        body=f"User feedback:\n\n{feedback}",
-    )
-    msg.attach(
-        filename="transcript.pdf",
-        content_type="application/pdf",
-        data=pdf_data,
-    )
-
-    mail.send(msg)
-
-    return "Email sent", 200
+    try:
+        msg = EmailMessage(
+            subject="Feedback with Transcript",
+            from_email=os.getenv("SENDER_EMAIL"),
+            to=[os.getenv("RECIPIENT_EMAIL")],
+            body=f"User feedback:\n\n{feedback}\n\nTranscript is attached below",
+        )
+        msg.attach(
+            "transcript.pdf",
+            pdf_content,
+            "application/pdf",
+        )
+
+        msg.send()
+        return "Message sent", 200
+    except Exception as e:
+        return f"Send failed: {str(e)}", 500