Merge pull request #19855 from mozilla/fxa-12710

fix(emails): Add more email logging

Author: vbudhram

libs/accounts/email-sender/src/email-sender.spec.ts

@@ -345,6 +345,52 @@ describe('EmailSender', () => {
       );
       expect(mockSentryCaptureException).toHaveBeenCalledWith(appError);
     });
+
+    it('logs SMTP error details including rejected recipients', async () => {
+      config = {
+        ...config,
+        retry: {
+          maxAttempts: 0,
+          backOffMs: 100,
+          jitter: 0,
+          maxDelayMs: 10_000,
+        },
+      };
+
+      emailSender = new EmailSender(
+        config,
+        mockBounces,
+        mockStatsd,
+        mockLogger
+      );
+
+      const smtpError = Object.assign(new Error('Invalid RCPT TO'), {
+        response: '501 Invalid RCPT TO address provided',
+        responseCode: 501,
+        rejected: ['bad@example.com'],
+        accepted: ['good@example.com'],
+      });
+
+      const emailWithCc = {
+        ...defaultMockEmail,
+        cc: ['cc@example.com'],
+      };
+
+      mockTransport.sendMail.mockRejectedValueOnce(smtpError);
+
+      await expect(emailSender.send(emailWithCc)).rejects.toThrow();
+
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        'mailer.send.error',
+        expect.objectContaining({
+          smtpResponse: '501 Invalid RCPT TO address provided',
+          smtpResponseCode: 501,
+          rejectedRecipients: ['bad@example.com'],
+          acceptedRecipients: ['good@example.com'],
+          cc: ['cc@example.com'],
+        })
+      );
+    });
   });
   describe('buildHeaders', () => {
     it('builds basic headers without SES configuration', async () => {

libs/accounts/email-sender/src/email-sender.ts

@@ -345,41 +345,62 @@ export class EmailSender {
 
         const backoffDelay = this.calculateBackoffDelay(attempt);
 
-        this.log.warn('mailer.send.retry', {
+        const retryLogDetails: Record<string, unknown> = {
           err: err.message,
           to: email.to,
           template: email.template,
           retryAttempt: attempt,
           nextAttempt: attempt + 1,
           backoffMs: Math.round(backoffDelay),
-        });
+        };
+
+        if (err.response) {
+          retryLogDetails['smtpResponse'] = err.response;
+        }
+        if (err.responseCode) {
+          retryLogDetails['smtpResponseCode'] = err.responseCode;
+        }
+        if (err.rejected?.length) {
+          retryLogDetails['rejectedRecipients'] = err.rejected;
+        }
+
+        this.log.warn('mailer.send.retry', retryLogDetails);
 
         // Wait for backoff period, then retry
         await new Promise((resolve) => setTimeout(resolve, backoffDelay));
         return this.sendMail(email, ++attempt);
       }
 
-      // This is the final failure - log and capture to Sentry
+      const smtpErrorDetails: Record<string, unknown> = {
+        err: err.message,
+        to: email.to,
+        template: email.template,
+        isRetry,
+        retryAttempt: attempt,
+      };
+
+      if (email.cc?.length) {
+        smtpErrorDetails['cc'] = email.cc;
+      }
+      if (err.response) {
+        smtpErrorDetails['smtpResponse'] = err.response;
+      }
+      if (err.responseCode) {
+        smtpErrorDetails['smtpResponseCode'] = err.responseCode;
+      }
+      if (err.rejected?.length) {
+        smtpErrorDetails['rejectedRecipients'] = err.rejected;
+      }
+      if (err.accepted?.length) {
+        smtpErrorDetails['acceptedRecipients'] = err.accepted;
+      }
       if (isAppError(err)) {
-        this.log.error('mailer.send.error', {
-          err: err.message,
-          code: err.code,
-          errno: err.errno,
-          to: email.to,
-          template: email.template,
-          isRetry,
-          retryAttempt: attempt,
-        });
-      } else {
-        this.log.error('mailer.send.error', {
-          err: err.message,
-          to: email.to,
-          template: email.template,
-          isRetry,
-          retryAttempt: attempt,
-        });
+        smtpErrorDetails['code'] = err.code;
+        smtpErrorDetails['errno'] = err.errno;
       }
 
+      this.log.error('mailer.send.error', smtpErrorDetails);
+
       // Only capture to Sentry on final failure
       Sentry.captureException(err);
 

packages/fxa-auth-server/lib/senders/email.js

@@ -569,14 +569,32 @@ module.exports = function (log, config, bounces, statsd) {
     await new Promise((resolve, reject) => {
       this.mailer.sendMail(emailConfig, (err, status) => {
         if (err) {
-          log.error('mailer.send.error', {
+          const errorLogDetails = {
             err: err.message,
             code: err.code,
             errno: err.errno,
             message: status && status.message,
             to: emailConfig && emailConfig.to,
             template,
-          });
+          };
+
+          if (emailConfig && emailConfig.cc) {
+            errorLogDetails.cc = emailConfig.cc;
+          }
+          if (err.response) {
+            errorLogDetails.smtpResponse = err.response;
+          }
+          if (err.responseCode) {
+            errorLogDetails.smtpResponseCode = err.responseCode;
+          }
+          if (err.rejected && err.rejected.length) {
+            errorLogDetails.rejectedRecipients = err.rejected;
+          }
+          if (err.accepted && err.accepted.length) {
+            errorLogDetails.acceptedRecipients = err.accepted;
+          }
+
+          log.error('mailer.send.error', errorLogDetails);
 
           return reject(err);
         }