fix invite and reset passwd email service

.env

@@ -11,9 +11,9 @@ DEV_DB_PORT=5432
 # JWT Secret Key
 JWT_SECRET="NKrbO2lpCsOpVAlqAPsjZ0tZXzIoKru7gAmYZ7XlHn0=qqwqeq"
 
-EMAIL=autobluewave@gmail.com
+EMAIL=bluewaveguidefox@gmail.com
 EMAIL_PASSWORD=passwor
 EMAIL_HOST=smtp.gmail.com
 EMAIL_PORT=465
-APP_PASSWORD=password
+APP_PASSWORD=ukzwakckupguegiw
 EMAIL_ENABLE=false

backend/.env

@@ -8,7 +8,7 @@ DEV_DB_NAME=onboarding_db
 DEV_DB_HOST=db
 DEV_DB_PORT=5432
 
-EMAIL_ENABLE=false
+EMAIL_ENABLE=true
 
 # JWT Secret Key
 JWT_SECRET="NKrbO2lpCsOpVAlqAPsjZ0tZXzIoKru7gAmYZ7XlHn0=qqwqeq"
@@ -19,6 +19,13 @@ TEST_DB_NAME=onboarding_db_test
 TEST_DB_HOST=localhost
 TEST_DB_PORT=5432
 
+[email protected]
+EMAIL_PASSWORD=passwor
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=465
+APP_PASSWORD=ukzwakckupguegiw
+EMAIL_ENABLE=true
+
 ENABLE_IP_CHECK=false
 # Allowed IP range for the API "baseIp/rangeStart-rangeEnd" (e.g. 192.168.1/1-255) separated by comma
 ALLOWED_IP_RANGE=11.22.33/10-200, 192.168.65/1-255

backend/src/controllers/auth.controller.js

@@ -7,7 +7,7 @@ const sequelize = db.sequelize;
 const { generateToken, verifyToken } = require('../utils/jwt.helper');
 const crypto = require('crypto');
 const { TOKEN_LIFESPAN } = require('../utils/constants.helper');
-const { sendSignupEmail, sendPasswordResetEmail, findUserByEmail } = require('../service/email.service');
+const { sendPasswordResetEmail, findUserByEmail } = require('../service/email.service');
 const settings = require('../../config/settings');
 const { decode } = require('../utils/auth.helper');
 
@@ -81,8 +81,6 @@ const register = async (req, res) => {
 
     await Token.create({ token, userId: newUser.id, type: 'auth' });
 
-    await sendSignupEmail(newUser.email, newUser.name);
-
     res.status(201).json({
       user: {
         id: newUser.id,
@@ -160,6 +158,8 @@ const forgetPassword = async (req, res) => {
     const user = await findUserByEmail(email);
     if (!user) return res.status(400).json({ error: 'User not found' });
 
+    await Token.destroy({ where: { userId: user.id, type: 'reset' } });
+
     const resetToken = crypto.randomBytes(32).toString('hex');
     const hash = await bcrypt.hash(resetToken, 10);
     const expiresAt = new Date(Date.now() + TOKEN_LIFESPAN);

backend/src/service/email.service.js

@@ -2,18 +2,21 @@ const nodemailer = require("nodemailer");
 const handlebars = require("handlebars");
 const fs = require("fs");
 const path = require("path");
-const { API_BASE_URL } = require("../utils/constants.helper");
+const { API_BASE_URL, FRONTEND_URL } = require('../utils/constants.helper');
 const db = require("../models");
 const User = db.User;
 
 const transporter = nodemailer.createTransport({
-  host: process.env.EMAIL_HOST || "localhost",
+  host: process.env.EMAIL_HOST || 'localhost',
   port: process.env.EMAIL_PORT || 465,
   secure: true,
   auth: {
     user: process.env.EMAIL,
     pass: process.env.APP_PASSWORD,
   },
+  tls: {
+    rejectUnauthorized: process.env.NODE_ENV === 'production',
+  },
 });
 
 const readHTMLFile = (filePath) => {
@@ -59,16 +62,25 @@ const sendSignupEmail = async (email, name) => {
 };
 
 const sendPasswordResetEmail = async (email, name, resetToken) => {
-  const resetLink = `${API_BASE_URL}reset-password?token=${resetToken}`;
-  await sendEmail(email, "Password Reset", "resetPassword", {
+  const resetLink = `${FRONTEND_URL}set-new-password?token=${resetToken}`;
+  await sendEmail(email, 'Reset your password for Guidefox', 'resetPassword', {
     name,
     resetLink,
   });
 };
 
+const sendInviteEmail = async (email) => {
+  const inviteLink = FRONTEND_URL;
+  await sendEmail(email, 'You’re invited to join Guidefox!', 'invite', {
+    inviteLink,
+  });
+};
+
+
 module.exports = {
   sendSignupEmail,
   sendPasswordResetEmail,
+  sendInviteEmail,
   findUserByEmail,
   transporter,
 };

backend/src/service/invite.service.js

@@ -1,4 +1,5 @@
 const settings = require("../../config/settings");
+const { sendInviteEmail } = require("./email.service");
 const db = require("../models");
 const Invite = db.Invite;
 const User = db.User;
@@ -22,13 +23,15 @@ class InviteService {
                     invitedBy: userId,
                     role: settings.user.role[role],
                 })
+                sendInviteEmail(invitedEmail);
             }
             else {
                 await Invite.create({
                     invitedBy: userId,
                     invitedEmail: invitedEmail,
                     role: settings.user.role[role],
                 });
+                sendInviteEmail(invitedEmail);
             }
         }
         catch (err) {

backend/src/templates/invite.hbs

@@ -0,0 +1,7 @@
+<p>Hello,</p>
+<p>You’ve been invited to join Guidefox - a platform designed to help you build better user experiences.</p>
+<p>To get started, simply click the link below to create your account:</p>
+<p><a href="{{inviteLink}}">Join Guidefox</a></p>
+<p>Once you’ve created your account, you’ll be able to log in and start exploring all the features we’ve prepared for you.</p>
+<p>We’re excited to have you with us and can’t wait for you to experience Guidefox!</p>
+<p>--<br>The Guidefox Team</p>

backend/src/templates/resetPassword.hbs

@@ -1,4 +1,7 @@
-<h1>Password Reset</h1>
-<p>Hi {{name}},</p>
-<p>Please use the following link to reset your password:</p>
-<a href="{{resetLink}}">Reset Password</a>
+<p>Hello {{name}},</p>
+<p>We received a request to reset your password for your Guidefox account. If you didn’t request a password reset, you can safely ignore this email.</p>
+<p>To reset your password, click the link below:</p>
+<a href="{{resetLink}}">Reset My Password</a>
+<p>Thank you for using Guidefox!</p>
+<p>--<br>The Guidefox Team</p>
+

backend/src/utils/constants.helper.js

@@ -4,6 +4,7 @@ module.exports = Object.freeze({
     TOKEN_LIFESPAN: 3600 * 1000,
     // API_BASE_URL: 'https://onboarding-demo.bluewavelabs.ca/api/',
     API_BASE_URL: 'localhost:3000/api/',
+    FRONTEND_URL: 'https://onboarding-demo.bluewavelabs.ca/',
     MAX_FILE_SIZE: 3 * 1024 * 1024,
     ROLE: {
       ADMIN: '1',
@@ -13,5 +14,5 @@ module.exports = Object.freeze({
     ORG_NAME_REGEX: /^[a-zA-Z0-9\s\-_&.]+$/,
     URL_PROTOCOL_REGEX: /^(https?:\/\/)/,
     URL_DOMAIN_REGEX: /^https?:\/\/([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/,
-  }); 
+  });
 

frontend/src/scenes/login/SetNewPassword.jsx

@@ -5,13 +5,17 @@ import CustomTextField from "@components/TextFieldComponents/CustomTextField/Cus
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import CircularProgress from "@mui/material/CircularProgress";
 import { resetPassword } from "../../services/loginServices";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 import * as Yup from "yup";
 import { Formik, Form } from "formik";
 
 function SetNewPasswordPage({ email = "[email protected]" }) {
   const [serverErrors, setServerErrors] = useState([]);
   const navigate = useNavigate();
+  const location = useLocation();
+
+  const queryParams = new URLSearchParams(location.search);
+  const token = queryParams.get("token");
 
   const validationSchema = Yup.object({
     password: Yup.string()
@@ -35,17 +39,18 @@ function SetNewPasswordPage({ email = "[email protected]" }) {
       validationSchema={validationSchema}
       validateOnChange={false}
       validateOnBlur={true}
-      onSubmit={async (values, { setSubmitting }) => {
+      onSubmit={async (values, { setSubmitting, resetForm }) => {
         setServerErrors([]);
         try {
           const response = await resetPassword({
-            email: email,
-            password: values.password,
+            token: token,
+            newPassword: values.password,
           });
           resetForm();
           navigate("/reset-password");
         } catch (error) {
           console.error("Password Reset failed:", error);
+          console.log("error", error);
           if (error.response?.data?.errors) {
             setServerErrors(error.response?.data?.errors);
           } else if (error.response?.data?.error) {
@@ -70,7 +75,7 @@ function SetNewPasswordPage({ email = "[email protected]" }) {
           <Form className={styles["login-container"]}>
             <h2 style={{ marginBottom: "0px" }}>Set new Password</h2>
             <h3>
-              Your new password must be different to previously used passwords.
+              Your new password must be different from previously used passwords.
             </h3>
             <div className={styles["form-group"]}>
               <CustomTextField

frontend/src/services/settingServices.js

@@ -53,7 +53,7 @@ export const removeTeamMember = async (memberId) => {
 
 export const inviteMember = async (inputs) => {
     try {
-        const response = await apiClient.post('/team/invite', { invitedEmail: inputs.email, role: inputs.role });
+        const response = await apiClient.post('team/invite', { invitedEmail: inputs.email, role: inputs.role });
         return response;
     } catch (error) {
         console.error('Error inviting member: ', error.message);