Fix email service startup errors - lazy initialization and graceful fallback

- Move email service creation from module level to endpoint level
- Handle missing credentials gracefully with warnings instead of errors
- Add configuration checks in email service methods
- Prevent startup failures due to missing CLIENT_SECRET env var

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: anduimagui

scripts/test_direct_email.py

@@ -102,7 +102,7 @@ async def test_direct_email(to_email: str) -> None:
                 <ul>
                     <li>From Email: {from_email}</li>
                     <li>To Email: {to_email}</li>
-                    <li>Tenant ID: {os.getenv('AZURE_TENANT_ID')}</li>
+                    <li>Tenant ID: {os.getenv('TENANT_ID')}</li>
                 </ul>
             </div>
             

scripts/test_user_auth_email.py

@@ -99,7 +99,7 @@ async def test_email(to_email: str) -> None:
                     <li>From Email: {os.getenv('MS_FROM_EMAIL')}</li>
                     <li>User Email: {os.getenv('USER_EMAIL')}</li>
                     <li>To Email: {to_email}</li>
-                    <li>Tenant ID: {os.getenv('AZURE_TENANT_ID')}</li>
+                    <li>Tenant ID: {os.getenv('TENANT_ID')}</li>
                 </ul>
             </div>
             

src/routers/email.py

@@ -33,15 +33,18 @@ class DigestRequest(BaseModel):
     limit: int | None = None
     test: bool = False
 
-# Initialize email service
-email_service = create_email_service()
+# Lazy email service initialization
+def get_email_service():
+    """Get email service instance. Created on first use to avoid startup errors."""
+    return create_email_service()
 
 @router.post("/send", dependencies=[Depends(require_admin)])
 async def send_email(request: EmailRequest):
     """
     Send an email to multiple recipients.
     Only accessible by admin users.
     """
+    email_service = get_email_service()
     success = await email_service.send_email(
         to_emails=request.to_emails,
         subject=request.subject,
@@ -60,6 +63,7 @@ async def send_notification(request: NotificationRequest):
     Send a templated notification email.
     Only accessible by admin users.
     """
+    email_service = get_email_service()
     success = await email_service.send_notification_email(
         to_email=request.to_email,
         subject=request.subject,

src/services/graph_direct_auth.py

@@ -18,18 +18,25 @@ class GraphDirectAuth:
     def __init__(self):
         self.token = None
         self.token_expires = 0
-        self.tenant_id = os.getenv('AZURE_TENANT_ID')
-        self.client_id = os.getenv('AZURE_CLIENT_ID')
-        self.client_secret = os.getenv('AZURE_CLIENT_SECRET')
+        self.tenant_id = os.getenv('TENANT_ID')
+        self.client_id = os.getenv('CLIENT_ID')
+        self.client_secret = os.getenv('CLIENT_SECRET')
 
         if not all([self.tenant_id, self.client_id, self.client_secret]):
-            raise ValueError("Missing required environment variables for Graph authentication")
+            logger.warning("Missing required environment variables for Graph authentication. Service will not be available.")
+            self.configured = False
+            return
+        
+        self.configured = True
 
         self.token_url = f"https://login.microsoftonline.com/{self.tenant_id}/oauth2/v2.0/token"
         self.graph_url = "https://graph.microsoft.com/v1.0"
 
     async def ensure_token(self) -> str:
         """Ensure we have a valid token, refreshing if necessary"""
+        if not getattr(self, 'configured', False):
+            raise ValueError("GraphDirectAuth not properly configured - missing environment variables")
+            
         current_time = asyncio.get_event_loop().time()
 
         # If token is expired or will expire in the next 5 minutes, refresh it

src/services/msgraph_service.py

@@ -36,8 +36,9 @@ def __init__(self, useUserAccessToken: bool = False):
             self.from_email = os.getenv('MS_FROM_EMAIL')
             logger.info(f"MSGraphEmailService config: TENANT_ID={tenant_id}, CLIENT_ID={client_id}, FROM_EMAIL={self.from_email}, EMAIL_SERVICE_TYPE={service_type}")
             if not all([tenant_id, client_id, client_secret]):
-                logger.error("Missing required environment variables for authentication")
-                raise ValueError("TENANT_ID, CLIENT_ID, and CLIENT_SECRET must be set")
+                logger.warning("Missing required environment variables for MSGraph authentication. Service will not be available.")
+                self.credential = None
+                return
 
             # Use ClientSecretCredential for app authentication
             self.credential = ClientSecretCredential(
@@ -72,6 +73,12 @@ async def send_email(
                 content_type=content_type,
                 useUserAccessToken=True
             )
+        
+        # Check if service is properly configured
+        if not hasattr(self, 'credential') or self.credential is None:
+            logger.error("MSGraphEmailService not properly configured - missing credentials")
+            return False
+            
         """Send an email using Microsoft Graph API with Mail.Send permission"""
         try:
             logger.info(f"send_email config: TENANT_ID={os.getenv('TENANT_ID')}, CLIENT_ID={os.getenv('CLIENT_ID')}, FROM_EMAIL={self.from_email}, EMAIL_SERVICE_TYPE={os.getenv('EMAIL_SERVICE_TYPE')}, to_emails={to_emails}, subject={subject}")
@@ -149,6 +156,12 @@ async def send_notification_email(
                 dynamic_data=dynamic_data,
                 useUserAccessToken=True
             )
+        
+        # Check if service is properly configured
+        if not hasattr(self, 'credential') or self.credential is None:
+            logger.error("MSGraphEmailService not properly configured - missing credentials")
+            return False
+            
         """Send a templated notification email using Microsoft Graph API"""
         try:
             logger.info(f"Preparing to send notification email to {to_email}")