Adding email template update file and made images work

Author: UmairHundekar

backend/app/routes/auth.py

@@ -130,6 +130,7 @@ async def send_email_verification(
 
         # Log for debugging
         import logging
+
         logger = logging.getLogger(__name__)
         logger.info(f"Sending email verification to {email} with language: {language}")
 
@@ -138,6 +139,7 @@ async def send_email_verification(
     except Exception as e:
         # Log error but don't reveal if email exists or not for security reasons
         import logging
+
         logger = logging.getLogger(__name__)
         logger.error(f"Error sending email verification: {str(e)}")
         # Always return success even if email doesn't exist

backend/app/services/implementations/auth_service.py

@@ -86,7 +86,9 @@ def send_email_verification_link(self, email: str, language: str = None) -> None
                         display_name = firebase_user.display_name.strip()
                         first_name = display_name.split()[0] if display_name else None
                         if first_name:
-                            self.logger.info(f"Found first name '{first_name}' from Firebase display_name for user {email}")
+                            self.logger.info(
+                                f"Found first name '{first_name}' from Firebase display_name for user {email}"
+                            )
                     else:
                         self.logger.debug(f"Firebase user exists but display_name is None for {email}")
                 except Exception as firebase_error:
@@ -112,6 +114,7 @@ def send_email_verification_link(self, email: str, language: str = None) -> None
             # If not provided, check environment variable, otherwise default to English
             if not language:
                 import os
+
                 language = os.getenv("EMAIL_LANGUAGE", "en").lower()
             else:
                 language = language.lower()

backend/app/utilities/ses/ses_init.py

@@ -31,8 +31,8 @@ def load_file_content(file_path: str) -> str:
         return ""
 
 
-# Function to create SES template
-def create_ses_template(template_metadata, ses_client):
+# Function to create or update SES template
+def create_or_update_ses_template(template_metadata, ses_client, force_update=False):
     name = template_metadata["TemplateName"]
     try:
         text_part = load_file_content(template_metadata["TextPart"])
@@ -47,17 +47,29 @@ def create_ses_template(template_metadata, ses_client):
             "TextPart": text_part,
             "HtmlPart": html_part,
         }
-        ses_client.create_template(Template=template)
-        print(f"SES template '{name}' created successfully!")
+
+        # Check if template exists
+        try:
+            ses_client.get_template(TemplateName=name)
+            # Template exists, update it
+            if force_update:
+                ses_client.update_template(Template=template)
+                print(f"SES template '{name}' updated successfully!")
+            else:
+                print(f"SES template '{name}' already exists. Use force_update=True to update.")
+        except ClientError as e:
+            if e.response["Error"]["Code"] == "TemplateDoesNotExist":
+                # Template doesn't exist, create it
+                ses_client.create_template(Template=template)
+                print(f"SES template '{name}' created successfully!")
+            else:
+                raise
     except ClientError as e:
-        if e.response["Error"]["Code"] == "TemplateAlreadyExists":
-            print(f"SES template '{name}' already exists.")
-        else:
-            print(f"An error occurred while creating the SES template: {e}")
+        print(f"An error occurred while processing SES template '{name}': {e}")
 
 
 # Ensure SES templates are available at app startup
-def ensure_ses_templates():
+def ensure_ses_templates(force_update=False):
     templates_metadata = load_templates_metadata(TEMPLATES_FILE)
     aws_region = os.getenv("AWS_REGION")
     aws_access_key = os.getenv("AWS_ACCESS_KEY")
@@ -75,14 +87,4 @@ def ensure_ses_templates():
     )
 
     for template_metadata in templates_metadata:
-        name = template_metadata["TemplateName"]
-        try:
-            # Check if the template exists
-            ses_client.get_template(TemplateName=name)
-            print(f"SES template '{name}' already exists.")
-        except ClientError as e:
-            if e.response["Error"]["Code"] == "TemplateDoesNotExist":
-                print(f"SES template '{name}' does not exist. Creating template...")
-                create_ses_template(template_metadata, ses_client)
-            else:
-                print(f"An error occurred while checking the SES template: {e}")
+        create_or_update_ses_template(template_metadata, ses_client, force_update=force_update)

backend/app/utilities/ses/template_files/email_verification_en.html

@@ -34,7 +34,7 @@
                                               <tr>
                                                 <td align="center" style="padding:0;">
                                                   <img
-                                                    src="https://www.bloodcancers.ca/themes/custom/whirlwind-llsc/src/000_assets/logos/llsc-logo-en.svg"
+                                                    src="https://secure.llscanada.org/images/content/pagebuilder/logo-lls_en.png"
                                                     alt="LLSC Logo"
                                                     width="120"
                                                     height="71"

backend/app/utilities/ses_email_service.py

@@ -16,7 +16,9 @@ def __init__(self):
         self.aws_access_key = os.getenv("AWS_ACCESS_KEY")
         self.aws_secret_key = os.getenv("AWS_SECRET_KEY")
         self.source_email_en = os.getenv("SES_SOURCE_EMAIL", "FirstConnections@bloodcancers.ca")
-        self.source_email_fr = os.getenv("SES_SOURCE_EMAIL_FR", os.getenv("SES_SOURCE_EMAIL", "FirstConnections@bloodcancers.ca"))
+        self.source_email_fr = os.getenv(
+            "SES_SOURCE_EMAIL_FR", os.getenv("SES_SOURCE_EMAIL", "FirstConnections@bloodcancers.ca")
+        )
 
         # Use English source email as default for backwards compatibility
         self.source_email = self.source_email_en
@@ -57,7 +59,9 @@ def verify_email_address(self, email: str) -> bool:
                 self.logger.error(f"Failed to verify email {email}: {error_code}")
                 return False
 
-    def send_templated_email(self, to_email: str, template_name: str, template_data: Dict[str, Any], source_email: str = None) -> bool:
+    def send_templated_email(
+        self, to_email: str, template_name: str, template_data: Dict[str, Any], source_email: str = None
+    ) -> bool:
         """
         Send a templated email using SES
 
@@ -109,7 +113,9 @@ def send_templated_email(self, to_email: str, template_name: str, template_data:
             self.logger.error(f"Unexpected error sending email to {to_email}: {str(e)}")
             return False
 
-    def send_verification_email(self, to_email: str, verification_link: str, first_name: str = None, language: str = "en") -> bool:
+    def send_verification_email(
+        self, to_email: str, verification_link: str, first_name: str = None, language: str = "en"
+    ) -> bool:
         """
         Send email verification email
 
@@ -131,10 +137,7 @@ def send_verification_email(self, to_email: str, verification_link: str, first_n
         # Use appropriate source email based on language
         source_email = self.source_email_en if language == "en" else self.source_email_fr
 
-        template_data = {
-            "verification_link": verification_link,
-            "first_name": first_name if first_name else "there"
-        }
+        template_data = {"verification_link": verification_link, "first_name": first_name if first_name else "there"}
 
         return self.send_templated_email(to_email, template_name, template_data, source_email)
 

backend/update_ses_templates.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+"""
+Script to update SES email templates in AWS.
+Run this script to update existing templates with the latest HTML/text content.
+"""
+import os
+import sys
+from dotenv import load_dotenv
+
+# Change to backend directory for proper path resolution
+backend_dir = os.path.dirname(os.path.abspath(__file__))
+os.chdir(backend_dir)
+
+# Load environment variables from .env file
+load_dotenv()
+
+from app.utilities.ses.ses_init import ensure_ses_templates
+
+if __name__ == "__main__":
+    print("Updating SES templates...")
+    ensure_ses_templates(force_update=True)
+    print("Done!")
+