Use ejs and html file for templating

njxue · njxue · commit b779ab58f035 · 2024-11-02T21:28:00.000+08:00
diff --git a/backend/user-service/.env.example b/backend/user-service/.env.example
@@ -35,3 +35,12 @@ REDIS_PORT=6379
 PEERPREP_QUESTION_INITDB_NAME=peerprepQuestionServiceDB # must match question service .env file and init-mongo.js
 PEERPREP_USER_INITDB_NAME=peerprepUserServiceDB # must match user service .env file and init-mongo.js
 PEERPREP_MATCHING_INITDB_NAME=peerprepMatchingServiceDB # must match user service .env file and init-mongo.js
+
+# SMTP configs for email
+SMTP_HOST=smtp.gmail.com
+SMTP_PORT=587
+SMTP_USER=peerprep25@gmail.com
+SMTP_PASSWORD=scdqcveqpurzzajj
+
+# App URL 
+APP_URL=http://localhost:3000
diff --git a/backend/user-service/config/emailConfig.js b/backend/user-service/config/emailConfig.js
@@ -2,7 +2,7 @@ import dotenv from "dotenv";
 
 dotenv.config();
 
-export const emailOptions = {
+export const emailConfig = {
   user: process.env.SMTP_USER,
   password: process.env.SMTP_PASSWORD,
   smtp_host: process.env.SMTP_HOST,
diff --git a/backend/user-service/controller/user-controller.js b/backend/user-service/controller/user-controller.js
@@ -169,15 +169,17 @@ export async function forgetPassword(req, res, next) {
   try {
     const { email } = req.body;
     const resetToken = await TokenService.generateResetToken(email);
-    const resetPasswordLink = `${process.env.APP_URL}/reset-password?token=${resetToken}`;
+    const passwordResetLink = `${process.env.APP_URL}/reset-password?token=${resetToken}`;
+
     await sendEmail({
       to: email,
       subject: "Reset password",
-      html: `Click <a href=${resetPasswordLink}>here</a> to reset your password`,
+      htmlTemplateData: { passwordResetLink },
     });
 
     res.sendStatus(204);
   } catch (err) {
+    console.error(err);
     next(err);
   }
 }
@@ -200,7 +202,6 @@ export async function resetPassword(req, res, next) {
       const salt = bcrypt.genSaltSync(PASSWORD_SALT);
       const hashedPassword = bcrypt.hashSync(password, salt);
       const updatedUser = await _updateUserById(user.id, user.username, user.email, hashedPassword);
-
       await TokenService.blacklistResetToken(decoded);
 
       return res.status(200).json({
diff --git a/backend/user-service/package-lock.json b/backend/user-service/package-lock.json
diff --git a/backend/user-service/package.json b/backend/user-service/package.json
@@ -20,6 +20,7 @@
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
+    "ejs": "^3.1.10",
     "express": "^4.19.2",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.5.4",
diff --git a/backend/user-service/services/emailService.js b/backend/user-service/services/emailService.js
@@ -1,12 +1,19 @@
 import nodemailer from "nodemailer";
-import { emailOptions } from "../config/emailConfig";
+import { emailConfig } from "../config/emailConfig.js";
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import ejs from "ejs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const transporter = nodemailer.createTransport({
-  host: emailOptions.smtp_host,
-  port: emailOptions.smtp_port,
+  host: emailConfig.smtp_host,
+  port: emailConfig.smtp_port,
   auth: {
-    user: emailOptions.user,
-    pass: emailOptions.password,
+    user: emailConfig.user,
+    pass: emailConfig.password,
   },
 });
 
@@ -18,8 +25,13 @@ transporter.verify(function (error, success) {
   }
 });
 
-export const sendEmail = async ({ to, subject, text, html }) => {
-  const emailOptions = { from: emailOptions.user, to, subject, text, html };
+export const sendEmail = async ({ to, subject, htmlTemplateData }) => {
+  const pathToTemplateHtml = path.resolve(__dirname, "../utils/emailTemplate.html");
+  const template = fs.readFileSync(pathToTemplateHtml, "utf-8");
+
+  const html = ejs.render(template, htmlTemplateData);
+
+  const emailOptions = { from: emailConfig.user, to, subject, html };
   try {
     await transporter.sendMail(emailOptions);
   } catch (err) {
diff --git a/backend/user-service/utils/emailTemplate.html b/backend/user-service/utils/emailTemplate.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head></head>
+<body>
+    <p>Dear user,</p>
+    <p>You have requested to change your password.</p>
+    <p>
+      You can click <a href="<%= passwordResetLink %>">here</a>, which will bring you to a password reset page to reset your
+      password. The link is only valid for <b>15 minutes</b>.
+    </p>
+</body>
+</html>
