Used Jinja2 templates to generate the reset email

chriscarrollsmith · chriscarrollsmith · commit 577249978270 · 2024-12-02T21:26:14.000Z
diff --git a/templates/emails/base_email.html b/templates/emails/base_email.html
@@ -0,0 +1,31 @@
+{% from 'components/logo.html' import render_logo %}
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{% block email_title %}{% endblock %}</title>
+</head>
+<body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333;">
+    <div style="max-width: 600px; margin: 0 auto; padding: 20px;">
+        <!-- Header with branding -->
+        <div style="display: inline-block; vertical-align: middle;">
+            {{ render_logo(width=40, height=40) }}
+            <span style="display: inline-block; vertical-align: middle; font-size: 24px; margin-left: 10px;">FastAPI-Jinja2-Postgres Webapp</span>
+        </div>
+
+        <hr style="margin: 30px 0; border: none; border-top: 1px solid #eee;">
+
+        {% block email_content %}{% endblock %}
+
+        <hr style="margin: 30px 0; border: none; border-top: 1px solid #eee;">
+
+        <p style="font-size: 12px; color: #666;">
+            This is an automated message, please do not reply directly to this email. 
+            {% block email_footer %}
+            {% endblock %}
+        </p>
+    </div>
+</body>
+</html>
diff --git a/templates/emails/reset_email.html b/templates/emails/reset_email.html
@@ -0,0 +1,19 @@
+{% extends "emails/base_email.html" %}
+
+{% block email_title %}Password Reset{% endblock %}
+
+{% block email_content %}
+    <h2>Password Reset Request</h2>
+    <p>Hello,</p>
+    <p>We received a request to reset your password. If you didn't make this request, you can safely ignore this email.</p>
+    <p style="margin: 25px 0;">
+        <a href="{{ reset_url }}" style="background-color: #007bff; color: white; padding: 10px 20px; text-decoration: none; border-radius: 5px;">Reset Your Password</a>
+    </p>
+    <p>Or copy and paste this link into your browser:</p>
+    <p style="word-break: break-all;">{{ reset_url }}</p>
+    <p>This link will expire in 24 hours.</p>
+{% endblock %}
+
+{% block email_footer %}
+    If you didn't request this password reset, please ignore this email or contact support if you have concerns.
+{% endblock %}
diff --git a/utils/auth.py b/utils/auth.py
@@ -12,17 +12,24 @@
 from bcrypt import gensalt, hashpw, checkpw
 from datetime import UTC, datetime, timedelta
 from typing import Optional
+from jinja2.environment import Template
+from fastapi.templating import Jinja2Templates
 from fastapi import Depends, Cookie, HTTPException, status
 from utils.db import get_session
 from utils.models import User, Role, PasswordResetToken
 
 load_dotenv()
-logger = logging.getLogger("uvicorn.error")
+resend.api_key = os.environ["RESEND_API_KEY"]
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
+logger.addHandler(logging.StreamHandler())
 
 
 # --- Constants ---
 
 
+templates = Jinja2Templates(directory="templates")
 SECRET_KEY = os.getenv("SECRET_KEY")
 ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30
@@ -294,9 +301,9 @@ def generate_password_reset_url(email: str, token: str) -> str:
     return f"{base_url}/auth/reset_password?email={email}&token={token}"
 
 
-def send_reset_email(email: str, session: Session):
+def send_reset_email(email: str, session: Session) -> None:
     # Check for an existing unexpired token
-    user = session.exec(select(User).where(
+    user: Optional[User] = session.exec(select(User).where(
         User.email == email
     )).first()
     if user:
@@ -314,17 +321,24 @@ def send_reset_email(email: str, session: Session):
             return
 
         # Generate a new token
-        token = str(uuid.uuid4())
-        reset_token = PasswordResetToken(user_id=user.id, token=token)
+        token: str = str(uuid.uuid4())
+        reset_token: PasswordResetToken = PasswordResetToken(
+            user_id=user.id, token=token)
         session.add(reset_token)
 
         try:
-            reset_url = generate_password_reset_url(email, token)
+            reset_url: str = generate_password_reset_url(email, token)
+
+            # Render the email template
+            template: Template = templates.get_template(
+                "emails/reset_email.html")
+            html_content: str = template.render({"reset_url": reset_url})
+
             params: resend.Emails.SendParams = {
                 "from": "noreply@promptlytechnologies.com",
                 "to": [email],
                 "subject": "Password Reset Request",
-                "html": f"<p>Click <a href='{reset_url}'>here</a> to reset your password.</p>",
+                "html": html_content,
             }
 
             sent_email: resend.Email = resend.Emails.send(params)
