@b2y/email-service 1.0.9 → 1.1.0

package/providers/AmazonSESProvider.js

@@ -1,77 +1,84 @@
-// providers/AmazonSES.js
-const { SESClient, SendEmailCommand } = require('@aws-sdk/client-ses');
-const BaseProvider = require('./BaseProvider');
-const Config = require('../Config');
-const logger = require('../Logger');
-const StatusMessage = require('../constants/StatusMessageConstants');
-const { EmailProvider } = require('../enum/EmailProvider');
-
-class AmazonSESProvider extends BaseProvider {
-  constructor() {
-    super();
-    this.client = new SESClient({
-      region: Config.awsRegion,
-      credentials: {
-        accessKeyId: Config.awsAccessKeyId,
-        secretAccessKey: Config.awsSecretAccessKey
-      }
-    });
-  }
-
-  async sendEmail(options) {
-    try {
-      this.validateEmailOptions(options);
-      
-      const toAddresses = this.formatRecipients(options.to);
-      const ccAddresses = options.cc ? this.formatRecipients(options.cc) : [];
-      const bccAddresses = options.bcc ? this.formatRecipients(options.bcc) : [];
-      
-      const params = {
-        Source: options.from || Config.awsFromEmail,
-        Destination: {
-          ToAddresses: toAddresses,
-          ...(ccAddresses.length > 0 && { CcAddresses: ccAddresses }),
-          ...(bccAddresses.length > 0 && { BccAddresses: bccAddresses })
-        },
-        Message: {
-          Subject: {
-            Data: options.subject,
-            Charset: 'UTF-8'
-          },
-          Body: {
-            Html: {
-              Data: options.html,
-              Charset: 'UTF-8'
-            }
-          }
-        }
-      };
-
-      // Add attachments if present (SES requires using SendRawEmail for attachments)
-      if (options.attachments && options.attachments.length > 0) {
-        logger.warn('SES provider: Attachments require SendRawEmail. Consider implementing raw email support.');
-      }
-
-      const command = new SendEmailCommand(params);
-      const result = await this.client.send(command);
-      
-      logger.info('Email sent successfully via Amazon SES', {
-        messageId: result.MessageId,
-        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
-        tenantId: options.tenantId
-      });
-      
-      return {
-        success: true,
-        messageId: result.MessageId,
-        provider: EmailProvider.SES,
-        tenantId: options.tenantId
-      };
-    } catch (error) {
-      logger.error(`Amazon SES failed to send email: ${error.message}`);
-      throw new Error(`${StatusMessage.AMAZON_SES_SEND_ERROR}: ${error.message}`);
-    }
-  }
-}
-
+// providers/AmazonSES.js
+const { SESClient, SendEmailCommand } = require('@aws-sdk/client-ses');
+const BaseProvider = require('./BaseProvider');
+const Config = require('../Config');
+const logger = require('../Logger');
+const StatusMessage = require('../constants/StatusMessageConstants');
+const { EmailProvider } = require('../enum/EmailProvider');
+
+class AmazonSESProvider extends BaseProvider {
+  constructor() {
+    super();
+    this.client = new SESClient({
+      region: Config.awsRegion,
+      credentials: {
+        accessKeyId: Config.awsAccessKeyId,
+        secretAccessKey: Config.awsSecretAccessKey
+      }
+    });
+  }
+
+  async sendEmail(options) {
+    try {
+      this.validateEmailOptions(options);
+      
+      const toAddresses = this.formatRecipients(options.to);
+      const ccAddresses = options.cc ? this.formatRecipients(options.cc) : [];
+      const bccAddresses = options.bcc ? this.formatRecipients(options.bcc) : [];
+      
+
+      const fromAddress = this.formatFromAddress(
+        options.from || Config.awsFromEmail,
+        options.fromName || Config.fromName
+      );
+      
+      const params = {
+        Source: fromAddress,
+        Destination: {
+          ToAddresses: toAddresses,
+          ...(ccAddresses.length > 0 && { CcAddresses: ccAddresses }),
+          ...(bccAddresses.length > 0 && { BccAddresses: bccAddresses })
+        },
+        Message: {
+          Subject: {
+            Data: options.subject,
+            Charset: 'UTF-8'
+          },
+          Body: {
+            Html: {
+              Data: options.html,
+              Charset: 'UTF-8'
+            }
+          }
+        }
+      };
+
+      // Add attachments if present (SES requires using SendRawEmail for attachments)
+      if (options.attachments && options.attachments.length > 0) {
+        logger.warn('SES provider: Attachments require SendRawEmail. Consider implementing raw email support.');
+      }
+
+      const command = new SendEmailCommand(params);
+      const result = await this.client.send(command);
+      
+      logger.info('Email sent successfully via Amazon SES', {
+        messageId: result.MessageId,
+        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
+        tenantId: options.tenantId,
+        from: fromAddress
+      });
+      
+      return {
+        success: true,
+        messageId: result.MessageId,
+        provider: EmailProvider.SES,
+        tenantId: options.tenantId
+      };
+    } catch (error) {
+      logger.error(`Amazon SES failed to send email: ${error.message}`);
+      throw new Error(`${StatusMessage.AMAZON_SES_SEND_ERROR}: ${error.message}`);
+    }
+  }
+}
+
 module.exports = AmazonSESProvider;

package/providers/BaseProvider.js

@@ -1,74 +1,86 @@
-// providers/BaseProvider.js
-const logger = require('../Logger');
-const StatusMessage = require('../constants/StatusMessageConstants');
-class BaseProvider {
-  constructor() {
-    if (new.target === BaseProvider) {
-      throw new Error(StatusMessage.CANNOT_INSTANTIATE_BASE);
-    }
-  }
-
-  async sendEmail(options) {
-    logger.error('sendEmail method not implemented in BaseProvider');
-    throw new Error(StatusMessage.PROVIDER_NOT_IMPLEMENTED);
-  }
-  
-  validateEmailOptions(options) {
-    const { to, subject, html, from } = options;
-    
-    if (!to || (Array.isArray(to) && to.length === 0)) {
-      throw new Error(StatusMessage.RECIPIENTS_REQUIRED);
-    }
-    
-    if (!subject) {
-      throw new Error(StatusMessage.SUBJECT_REQUIRED);
-    }
-    
-    if (!html) {
-      throw new Error(StatusMessage.HTML_CONTENT_REQUIRED);
-    }
-    
-    return true;
-  }
-  
-  formatRecipients(recipients) {
-    if (!recipients) return [];
-    
-    if (typeof recipients === 'string') {
-      return recipients.split(',').map(r => r.trim());
-    }
-    
-    if (Array.isArray(recipients)) {
-      return recipients;
-    }
-    
-    return [];
-  }
-
-  buildMailOptions(options) {
-    const { to, cc, bcc, subject, html, from, attachments } = options;
-    
-    const mailOptions = {
-      from,
-      to: this.formatRecipients(to),
-      subject,
-      html,
-    };
-    
-    if (cc && cc.length > 0) {
-      mailOptions.cc = this.formatRecipients(cc);
-    }
-    
-    if (bcc && bcc.length > 0) {
-      mailOptions.bcc = this.formatRecipients(bcc);
-    }
-    
-    if (attachments && attachments.length > 0) {
-      mailOptions.attachments = attachments;
-    }
-    
-    return mailOptions;
-  }
-}
-
+// providers/BaseProvider.js
+const logger = require('../Logger');
+const StatusMessage = require('../constants/StatusMessageConstants');
+const Config = require('../Config');
+
+class BaseProvider {
+  constructor() {
+    if (new.target === BaseProvider) {
+      throw new Error(StatusMessage.CANNOT_INSTANTIATE_BASE);
+    }
+  }
+
+  async sendEmail(options) {
+    logger.error('sendEmail method not implemented in BaseProvider');
+    throw new Error(StatusMessage.PROVIDER_NOT_IMPLEMENTED);
+  }
+  
+  validateEmailOptions(options) {
+    const { to, subject, html, from } = options;
+    
+    if (!to || (Array.isArray(to) && to.length === 0)) {
+      throw new Error(StatusMessage.RECIPIENTS_REQUIRED);
+    }
+    
+    if (!subject) {
+      throw new Error(StatusMessage.SUBJECT_REQUIRED);
+    }
+    
+    if (!html) {
+      throw new Error(StatusMessage.HTML_CONTENT_REQUIRED);
+    }
+    
+    return true;
+  }
+  
+  formatRecipients(recipients) {
+    if (!recipients) return [];
+    
+    if (typeof recipients === 'string') {
+      return recipients.split(',').map(r => r.trim());
+    }
+    
+    if (Array.isArray(recipients)) {
+      return recipients;
+    }
+    
+    return [];
+  }
+
+  formatFromAddress(email, name = null) {
+    const fromName = name || Config.fromName;
+    const fromEmail = email || Config.fromEmail;
+    
+    if (!fromEmail) {
+      throw new Error('FROM_EMAIL is required');
+    }
+    return fromName ? `"${fromName}" <${fromEmail}>` : fromEmail;
+  }
+
+  buildMailOptions(options) {
+    const { to, cc, bcc, subject, html, from, fromName, attachments } = options;
+    
+    const mailOptions = {
+      from: this.formatFromAddress(from, fromName),
+      to: this.formatRecipients(to),
+      subject,
+      html,
+    };
+    
+    if (cc && cc.length > 0) {
+      mailOptions.cc = this.formatRecipients(cc);
+    }
+    
+    if (bcc && bcc.length > 0) {
+      mailOptions.bcc = this.formatRecipients(bcc);
+    }
+    
+    if (attachments && attachments.length > 0) {
+      mailOptions.attachments = attachments;
+    }
+    
+    return mailOptions;
+  }
+}
+
 module.exports = BaseProvider;

package/providers/NodeMailerProvider.js

@@ -1,52 +1,53 @@
-// providers/NodeMailerProvider.js
-const nodemailer = require('nodemailer');
-const BaseProvider = require('./BaseProvider');
-const Config = require('../Config');
-const logger = require('../Logger');
-const StatusMessage = require('../constants/StatusMessageConstants');
-const { EmailProvider } = require('../enum/EmailProvider');
-
-class NodeMailerProvider extends BaseProvider {
-  constructor() {
-    super();
-    this.transporter = nodemailer.createTransport({ 
-      service: Config.emailService,
-      host: Config.emailHost,
-      port: Config.smtpPort,
-      secure: Config.smtpPort,
-      auth: {
-        user: Config.emailUser,
-        pass: Config.emailPass,
-      },
-    });
-  }
-
-  async sendEmail(options) {
-    try {
-      this.validateEmailOptions(options);
-      const mailOptions = this.buildMailOptions({
-        ...options,
-        from: options.from || Config.emailUser
-      });
-      const result = await this.transporter.sendMail(mailOptions);
-      
-      logger.info('Email sent successfully via Nodemailer', {
-        messageId: result.messageId,
-        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
-        tenantId: options.tenantId
-      });
-      
-      return {
-        success: true,
-        messageId: result.messageId,
-        provider: EmailProvider.NODE_MAILER,
-        tenantId: options.tenantId
-      };
-    } catch (error) {
-      logger.error(`Nodemailer failed to send email: ${error.message}`);
-      throw new Error(`${StatusMessage.NODEMAILER_SEND_ERROR}: ${error.message}`);
-    }
-  }
-}
-
+// providers/NodeMailerProvider.js
+const nodemailer = require('nodemailer');
+const BaseProvider = require('./BaseProvider');
+const Config = require('../Config');
+const logger = require('../Logger');
+const StatusMessage = require('../constants/StatusMessageConstants');
+const { EmailProvider } = require('../enum/EmailProvider');
+
+class NodeMailerProvider extends BaseProvider {
+  constructor() {
+    super();
+    this.transporter = nodemailer.createTransport({ 
+      host: Config.emailHost,
+      port: Config.smtpPort,
+      secure: Config.smtpPort,
+      auth: {
+        user: Config.emailUser,
+        pass: Config.emailPass,
+      },
+    });
+  }
+
+  async sendEmail(options) {
+    try {
+      this.validateEmailOptions(options);
+      const mailOptions = this.buildMailOptions({
+        ...options,
+        from: options.from || Config.fromEmail,
+        fromName: options.fromName || Config.fromName
+      });
+      const result = await this.transporter.sendMail(mailOptions);
+      
+      logger.info('Email sent successfully via Nodemailer', {
+        messageId: result.messageId,
+        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
+        tenantId: options.tenantId,
+        from: mailOptions.from
+      });
+      
+      return {
+        success: true,
+        messageId: result.messageId,
+        provider: EmailProvider.NODE_MAILER,
+        tenantId: options.tenantId
+      };
+    } catch (error) {
+      logger.error(`Nodemailer failed to send email: ${error.message}`);
+      throw new Error(`${StatusMessage.NODEMAILER_SEND_ERROR}: ${error.message}`);
+    }
+  }
+}
+
 module.exports = NodeMailerProvider;

package/providers/PostmarkProvider.js

@@ -1,62 +1,62 @@
-// providers/PostmarkProvider.js
-const postmark = require('postmark');
-const BaseProvider = require('./BaseProvider');
-const Config = require('../Config');
-const logger = require('../Logger');
-const StatusMessage = require('../constants/StatusMessageConstants');
-const { EmailProvider } = require('../enum/EmailProvider');
-
-class PostmarkProvider extends BaseProvider {
-  constructor() {
-    super();
-    this.client = new postmark.Client(Config.postmarkApiKey);
-  }
-
-  async sendEmail(options) {
-    try {
-      this.validateEmailOptions(options);
-      const mailOptions = {
-        From: options.from || Config.postmarkFromEmail,
-        To: this.formatRecipients(options.to).join(','),
-        Subject: options.subject,
-        HtmlBody: options.html,
-      };
-      
-      if (options.cc && options.cc.length > 0) {
-        mailOptions.Cc = this.formatRecipients(options.cc).join(',');
-      }
-      
-      if (options.bcc && options.bcc.length > 0) {
-        mailOptions.Bcc = this.formatRecipients(options.bcc).join(',');
-      }
-      
-      if (options.attachments && options.attachments.length > 0) {
-        mailOptions.Attachments = options.attachments.map(att => ({
-          Name: att.filename,
-          Content: att.content,
-          ContentType: att.contentType
-        }));
-      }
-      
-      const result = await this.client.sendEmail(mailOptions);
-      
-      logger.info('Email sent successfully via Postmark', {
-        messageId: result.MessageID,
-        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
-        tenantId: options.tenantId
-      });
-      
-      return {
-        success: true,
-        messageId: result.MessageID,
-        provider: EmailProvider.POSTMARK,
-        tenantId: options.tenantId
-      };
-    } catch (error) {
-      logger.error(`Postmark failed to send email: ${error.message}`);
-      throw new Error(`${StatusMessage.POSTMARK_SEND_ERROR}: ${error.message}`);
-    }
-  }
-}
-
+// providers/PostmarkProvider.js
+const postmark = require('postmark');
+const BaseProvider = require('./BaseProvider');
+const Config = require('../Config');
+const logger = require('../Logger');
+const StatusMessage = require('../constants/StatusMessageConstants');
+const { EmailProvider } = require('../enum/EmailProvider');
+
+class PostmarkProvider extends BaseProvider {
+  constructor() {
+    super();
+    this.client = new postmark.Client(Config.postmarkApiKey);
+  }
+
+  async sendEmail(options) {
+    try {
+      this.validateEmailOptions(options);
+      const mailOptions = {
+        From: options.from || Config.postmarkFromEmail,
+        To: this.formatRecipients(options.to).join(','),
+        Subject: options.subject,
+        HtmlBody: options.html,
+      };
+      
+      if (options.cc && options.cc.length > 0) {
+        mailOptions.Cc = this.formatRecipients(options.cc).join(',');
+      }
+      
+      if (options.bcc && options.bcc.length > 0) {
+        mailOptions.Bcc = this.formatRecipients(options.bcc).join(',');
+      }
+      
+      if (options.attachments && options.attachments.length > 0) {
+        mailOptions.Attachments = options.attachments.map(att => ({
+          Name: att.filename,
+          Content: att.content,
+          ContentType: att.contentType
+        }));
+      }
+      
+      const result = await this.client.sendEmail(mailOptions);
+      
+      logger.info('Email sent successfully via Postmark', {
+        messageId: result.MessageID,
+        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
+        tenantId: options.tenantId
+      });
+      
+      return {
+        success: true,
+        messageId: result.MessageID,
+        provider: EmailProvider.POSTMARK,
+        tenantId: options.tenantId
+      };
+    } catch (error) {
+      logger.error(`Postmark failed to send email: ${error.message}`);
+      throw new Error(`${StatusMessage.POSTMARK_SEND_ERROR}: ${error.message}`);
+    }
+  }
+}
+
 module.exports = PostmarkProvider;