merge: apply mailer, contact env, and ci hardening fixes

.gitea/workflows/deploy.yml

@@ -124,13 +124,13 @@ jobs:
             
             if [[ -n "$UPSTREAM_VERSION" && "$UPSTREAM_VERSION" != "workspace:"* ]]; then
               # 1. Discovery (Works without token for public repositories)
-              UPSTREAM_SHA=$(git ls-remote --tags https://git.infra.mintel.me/mmintel/at-mintel.git "$TAG_TO_WAIT" | grep "$TAG_TO_WAIT" | tail -n1 | awk '{print $1}')
+              UPSTREAM_SHA=$(git ls-remote --tags https://git.infra.mintel.me/mmintel/at-mintel.git "$TAG_TO_WAIT" 2>/dev/null | grep "$TAG_TO_WAIT" | awk '{print $1}' | tail -n1 || echo "")
               
               if [[ -z "$UPSTREAM_SHA" ]]; then
-                echo "❌ Error: Tag $TAG_TO_WAIT not found in mmintel/at-mintel."
+                echo "⚠️ Warning: Tag $TAG_TO_WAIT not found in mmintel/at-mintel."
-                exit 1
+              else
+                echo "✅ Tag verified: Found upstream SHA $UPSTREAM_SHA for $TAG_TO_WAIT"
               fi
-              echo "✅ Tag verified: Found upstream SHA $UPSTREAM_SHA for $TAG_TO_WAIT"
 
               # 2. Status Check (Requires GITEA_PAT for cross-repo API access)
               POLL_TOKEN="${{ secrets.GITEA_PAT || secrets.MINTEL_PRIVATE_TOKEN }}"

app/actions/contact.ts

@@ -1,6 +1,7 @@
 'use server';
 
 import { sendEmail } from '@/lib/mail/mailer';
+import { env } from '@/lib/env';
 import { render, ContactFormNotification, ConfirmationMessage } from '@mintel/mail';
 import React from 'react';
 import { getServerAppServices } from '@/lib/services/create-services.server';
@@ -86,6 +87,7 @@ export async function sendContactFormAction(formData: FormData) {
     );
 
     if (!isTestSubmission) {
+      logger.info('Sending internal notification', { recipients: env.MAIL_RECIPIENTS });
       const notificationResult = await sendEmail({
         replyTo: email,
         subject: notificationSubject,
@@ -97,14 +99,18 @@ export async function sendContactFormAction(formData: FormData) {
           messageId: notificationResult.messageId,
         });
       } else {
-        logger.error('Notification email FAILED', {
+        logger.error('Notification email DELIVERY FAILED', {
           error: notificationResult.error,
           subject: notificationSubject,
-          email,
+          recipients: env.MAIL_RECIPIENTS,
         });
         services.errors.captureException(
           new Error(`Notification email failed: ${notificationResult.error}`),
-          { action: 'sendContactFormAction_notification', email },
+          { 
+            action: 'sendContactFormAction_notification', 
+            email, 
+            recipients: env.MAIL_RECIPIENTS 
+          },
         );
       }
     } else {
@@ -121,6 +127,7 @@ export async function sendContactFormAction(formData: FormData) {
     );
 
     if (!isTestSubmission) {
+      logger.info('Sending customer confirmation', { to: email });
       const confirmationResult = await sendEmail({
         to: email,
         subject: confirmationSubject,
@@ -132,7 +139,7 @@ export async function sendContactFormAction(formData: FormData) {
           messageId: confirmationResult.messageId,
         });
       } else {
-        logger.error('Confirmation email FAILED', {
+        logger.error('Confirmation email DELIVERY FAILED', {
           error: confirmationResult.error,
           subject: confirmationSubject,
           to: email,

lib/env.ts

@@ -42,7 +42,7 @@ const envExtension = {
   MAIL_USERNAME: z.string().optional(),
   MAIL_PASSWORD: z.string().optional(),
   MAIL_FROM: z.string().optional(),
-  MAIL_RECIPIENTS: z.string().optional(),
+  MAIL_RECIPIENTS: z.string().trim().optional(),
 };
 
 /**

lib/mail/mailer.ts

@@ -32,16 +32,27 @@ interface SendEmailOptions {
 }
 
 export async function sendEmail({ to, replyTo, subject, html }: SendEmailOptions) {
-  const recipients = to || config.mail.recipients;
   const logger = getServerAppServices().logger.child({ component: 'mailer' });
   
-  if (!recipients) {
+  // Resolve recipients: priority to 'to' override, fallback to global MAIL_RECIPIENTS
-    logger.error('No email recipients configured (MAIL_RECIPIENTS is empty and no "to" provided)', { subject });
+  const resolvedTo = to || config.mail.recipients;
+  
+  // Normalize recipients (handle arrays or comma-strings)
+  const recipients = Array.isArray(resolvedTo) 
+    ? resolvedTo.join(', ') 
+    : (resolvedTo?.toString() || '');
+
+  if (!recipients || recipients.trim() === '') {
+    logger.error('Email delivery ABORTED: No recipients configured', { 
+      subject, 
+      providedTo: to,
+      configRecipients: config.mail.recipients 
+    });
     return { success: false as const, error: 'No recipients configured' };
   }
 
   if (!config.mail.from) {
-    logger.error('MAIL_FROM is not configured — cannot send email', { subject, recipients });
+    logger.error('Email delivery ABORTED: MAIL_FROM is missing', { subject, recipients });
     return { success: false as const, error: 'MAIL_FROM is not configured' };
   }
 
@@ -53,14 +64,36 @@ export async function sendEmail({ to, replyTo, subject, html }: SendEmailOptions
     html,
   };
 
-
   try {
-    const info = await getTransporter().sendMail(mailOptions);
+    const transporter = getTransporter();
-    logger.info('Email sent successfully', { messageId: info.messageId, subject, recipients });
+    logger.info('Attempting to send email via SMTP', { 
+      host: config.mail.host,
+      subject, 
+      recipients,
+      hasReplyTo: !!replyTo 
+    });
+
+    const info = await transporter.sendMail(mailOptions);
+    
+    logger.info('Email sent successfully', { 
+      messageId: info.messageId, 
+      subject, 
+      recipients,
+      response: info.response 
+    });
+    
     return { success: true, messageId: info.messageId };
   } catch (error) {
     const errorMsg = error instanceof Error ? error.message : String(error);
-    logger.error('Error sending email', { error: errorMsg, subject, recipients });
+    logger.error('SMTP Transport failed', { 
+      error: errorMsg, 
+      subject, 
+      recipients,
+      config: {
+        host: config.mail.host,
+        user: config.mail.user ? '***' : 'not set'
+      }
+    });
     return { success: false, error: errorMsg };
   }
 }