# Commit Message

**Refactor Email Verification Process and Update Configuration**

- **Update `.gitignore`:**
  - Added `**/debug/**` to ignore debug directories.
  - Added `.DS_Store` to ignore macOS system files.

- **Configuration Schema (`src/configs/config.schema.js`):**
  - Removed `SENDGRID_VERIFICATION_TEMPLATE_ID` field.

- **User Schema (`src/domains/user/schema.js`):**
  - Added `verificationEmailSentAt` field to track when the verification email was last sent.

- **User Service (`src/domains/user/service.js`):**
  - Changed verification token expiry from 1 minute to 24 hours.
  - Updated logic to use `verificationEmailSentAt` for rate limiting resend attempts.
  - Enhanced logging for debug mode.

- **Email Service (`src/libraries/email/emailService.js`):**
  - Simplified debug mode configuration.
  - Added `loadTemplate` function to compile HTML email templates.
  - Refactored `sendVerificationEmail` to use HTML templates instead of SendGrid dynamic templates.
  - Improved debug email saving with HTML content.

Author: foyzulkarim

.gitignore

@@ -130,3 +130,7 @@ dist
 config.development.json
 config.production.json
 config.test.json
+
+# Debug emails
+**/debug/**
+.DS_Store

src/configs/config.schema.js

@@ -36,7 +36,6 @@ const schema = Joi.object({
   // SendGrid Configuration
   SENDGRID_API_KEY: Joi.string().required(),
   SENDGRID_FROM_EMAIL: Joi.string().email().required(),
-  SENDGRID_VERIFICATION_TEMPLATE_ID: Joi.string().required(),
 });
 
 module.exports = schema;

src/domains/user/schema.js

@@ -96,6 +96,9 @@ const schema = new mongoose.Schema({
   verificationTokenExpiry: {
     type: Date,
   },
+  verificationEmailSentAt: {
+    type: Date,
+  },
 
   // Auth and status flags
   isDemo: {

src/domains/user/service.js

@@ -231,10 +231,10 @@ const canResendVerification = async (userId) => {
     throw new AppError('already-verified', 'Email is already verified', 400);
   }
 
-  // Check if last token was generated less than 1 minute ago
-  if (user.verificationTokenExpiry) {
-    const timeSinceLastEmail = new Date() - user.verificationTokenExpiry;
-    const oneMinuteInMs = 1 * 60 * 1000;
+  // Check if last verification email was sent less than 1 minute ago
+  if (user.verificationEmailSentAt) {
+    const timeSinceLastEmail = new Date() - user.verificationEmailSentAt;
+    const oneMinuteInMs = 60000; // 1 minute in milliseconds
 
     if (timeSinceLastEmail < oneMinuteInMs) {
       const remainingSeconds = Math.ceil((oneMinuteInMs - timeSinceLastEmail) / 1000);
@@ -261,12 +261,14 @@ const refreshVerificationToken = async (email) => {
 
     // Generate new verification token
     const verificationToken = generateVerificationToken();
-    const verificationTokenExpiry = new Date(Date.now() + 1 * 60 * 1000); // 1 minute
+    const verificationTokenExpiry = new Date(Date.now() + 24 * 60 * 60 * 1000); // 24 hours
+    const verificationEmailSentAt = new Date();
 
-    // Update user with new token
+    // Update user with new token and email sent timestamp
     await updateById(user._id, {
       verificationToken,
       verificationTokenExpiry,
+      verificationEmailSentAt,
       updatedAt: new Date()
     });
 

src/libraries/email/emailService.js

@@ -8,7 +8,8 @@ const path = require('path');
 sgMail.setApiKey(config.SENDGRID_API_KEY);
 
 // Debug mode configuration
-const isDebugMode = process.env.NODE_ENV === 'development' && process.env.EMAIL_DEBUG === 'true';
+const isDebugMode = process.env.EMAIL_DEBUG === 'true';
+console.log('isDebugMode', isDebugMode, 'process.env.NODE_ENV', process.env.NODE_ENV, 'process.env.EMAIL_DEBUG', process.env.EMAIL_DEBUG);
 const debugDir = path.join(__dirname, 'debug');
 
 // Ensure debug directory exists
@@ -38,36 +39,54 @@ const saveDebugEmail = async (email, content) => {
   }
 };
 
+// Function to load and compile email template
+const loadTemplate = async (templateName, replacements) => {
+  const templatePath = path.join(__dirname, 'templates', templateName);
+  let template = await fs.readFile(templatePath, 'utf8');
+
+  // Replace all placeholders with actual values
+  Object.keys(replacements).forEach(key => {
+    const regex = new RegExp(`{{${key}}}`, 'g');
+    template = template.replace(regex, replacements[key]);
+  });
+
+  return template;
+};
+
 const sendVerificationEmail = async (email, verificationToken) => {
   const verificationLink = `${config.CLIENT_HOST}/verify-email?token=${verificationToken}`;
-  
+
   try {
     await ensureDebugDir();
-    
+
+    // Load and compile the HTML template
+    const htmlContent = await loadTemplate('verification2.html', {
+      appName: 'CommitStreams',
+      userEmail: email,
+      verificationLink: verificationLink,
+      expiryHours: '24'
+    });
+
     const msg = {
       to: email,
       from: config.SENDGRID_FROM_EMAIL,
-      templateId: config.SENDGRID_VERIFICATION_TEMPLATE_ID,
-      dynamicTemplateData: {
-        appName: 'CommitStreams',
-        userEmail: email,
-        verificationLink: verificationLink,
-        expiryHours: '1'
-      }
+      subject: 'Verify your email address',
+      html: htmlContent,
     };
 
     if (isDebugMode) {
-      // In debug mode, save email data locally
+      // In debug mode, save email locally
       await saveDebugEmail(email, `
         <h2>Email Debug Information</h2>
         <pre>
 To: ${msg.to}
 From: ${msg.from}
-Template ID: ${msg.templateId}
-Dynamic Template Data: ${JSON.stringify(msg.dynamicTemplateData, null, 2)}
+Subject: ${msg.subject}
         </pre>
+        <hr>
+        ${htmlContent}
       `);
-      logger.info('Debug mode: Email data saved locally', { email });
+      logger.info('Debug mode: Email saved locally', { email });
     } else {
       // In production mode, send via SendGrid
       await sgMail.send(msg);

src/libraries/email/templates/verification2.html

@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>Verify your email address</title>
+  <style>
+    body {
+      font-family: Arial, Helvetica, sans-serif;
+      background-color: #f4f4f4;
+      color: #333333;
+    }
+    .container {
+      max-width: 600px;
+      margin: 0 auto;
+      padding: 20px;
+      background-color: #ffffff;
+    }
+    h1 {
+      color: #007bff;
+    }
+    .button {
+      display: inline-block;
+      padding: 10px 20px;
+      background-color: #007bff;
+      color: #ffffff;
+      text-decoration: none;
+      border-radius: 4px;
+    }
+    .footer {
+      margin-top: 20px;
+      text-align: center;
+      color: #666666;
+      font-size: 12px;
+    }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>Welcome to {{appName}}!</h1>
+    <p>Hi there,</p>
+    <p>Thanks for signing up with {{appName}}. To complete your registration, we just need you to verify your email address:</p>
+    <p><a href="{{verificationLink}}" class="button">Verify Email Address</a></p>
+    <p>If the button above doesn't work, copy and paste this link into your browser:</p>
+    <p><a href="{{verificationLink}}">{{verificationLink}}</a></p>
+    <p>This link will expire in {{expiryHours}} hours, so please verify soon.</p>
+    <p>If you did not sign up for an account with {{appName}}, you can safely ignore this email.</p>
+    <p>Thanks,<br>The {{appName}} Team</p>
+    <div class="footer">
+      This email was sent to {{userEmail}}. If you'd rather not receive this kind of email, you can <a href="#">unsubscribe</a>.
+    </div>
+  </div>
+</body>
+</html>