Merge pull request #14 from Stackup-Rwanda/bg-correct-email-template-172739648

#172739648 Make email template works in all email clients

Author: kagabof

src/app.js

@@ -6,6 +6,7 @@ import dotenv from 'dotenv';
 import passport from 'passport';
 import cookieParser from 'cookie-parser';
 import sessions from 'express-session';
+import cors from 'cors';
 import swaggerDefinition from './docs/swaggerDefinition';
 import users from './routes/users';
 import trips from './routes/trips';
@@ -16,7 +17,6 @@ import accommodationRouter from './routes/accommodation';
 import events from './helpers/eventConnect';
 import decodeToken from './helpers/decodeToken';
 import io, { app } from './helpers/ioServerHelper';
-import cors from 'cors';
 
 dotenv.config();
 
@@ -79,7 +79,7 @@ app.use(
       maxAge: 14 * 24 * 3600 * 1000,
       sameSite: true,
     },
-  })
+  }),
 );
 
 app.use(passport.initialize());
@@ -93,10 +93,8 @@ app.use('/api/v1', accommodationRouter);
 app.use('/api/v1', chats);
 app.use('/api/v1', bookings);
 
-app.use((req, res) =>
-  res.status(404).send({
-    status: 404,
-    error: 'Not Found!',
-  })
-);
+app.use((req, res) => res.status(404).send({
+  status: 404,
+  error: 'Not Found!',
+}));
 export default app;

src/controllers/users.js

@@ -1,47 +1,39 @@
 import bcrypt from 'bcrypt';
 import jwt from 'jsonwebtoken';
 import localStorage from 'localStorage';
-import env from 'dotenv';
-import sgMail from '@sendgrid/mail';
-import sequelize from 'sequelize';
+import environment from 'dotenv';
+import { verifyAccount, verifyPassword } from '../helpers/emailBody';
 import models from '../db/models';
 import generateToken from '../helpers/generateToken';
 import generatePswd from '../helpers/randomPswd';
 import usePasswordHashToMakeToken from '../helpers/helpers';
-import { getPasswordResetURL, resetPasswordTemplate } from '../modules/email';
+import { getPasswordResetURL, resetPasswordTemplate, getEmailVerifytURL } from '../modules/email';
 import userQuery from '../helpers/userQueries';
 import handleError from '../helpers/errorHandler';
 import handleRedirects from '../helpers/handleRedirects';
 
-const { Op } = sequelize;
-env.config();
+environment.config();
 
 export default class usersController {
   static async registerUser(req, res) {
     try {
       const {
         firstName, lastName, gender, email, password,
       } = req.body;
+      const existingUser = await models.User.findOne({ where: { email } });
+      if (existingUser !== null) return res.status(409).json({ error: 'Email has already taken.' });
       const token = generateToken({
         firstName, lastName, gender, email, password,
       });
-      let host;
-      const userExists = await models.User.findOne({ where: { email } });
-      if (userExists) return res.status(409).json({ error: 'Email already exists.' });
-
-      process.env.NODE_ENV === 'development' ? host = process.env.LOCAL_HOST : host = process.env.HOST_NAME;
-      const url = `${host}/api/v1/auth/signup/${token}`;
-      sgMail.setApiKey(process.env.BN_API_KEY);
-      const msg = {
-        to: email,
-        from: '[email protected]',
-        subject: 'Account Verification',
-        html: `<strong> Dear ${firstName}, please open this <a href="${url}">link</a> to verify your account </strong>`,
+      const user = {
+        lastName,
+        email,
       };
-      sgMail.send(msg);
-      return res.status(200).json({ message: 'Please go to your email address to verify your account.' });
+      const url = getEmailVerifytURL(token);
+      resetPasswordTemplate(user, url, verifyAccount);
+      return res.status(200).json({ message: 'Check a verification link in your email .' });
     } catch (error) {
-      return res.status(500).json({ Error: error.message });
+      return res.status(500).json({ error: error.message });
     }
   }
 
@@ -52,12 +44,10 @@ export default class usersController {
       const {
         firstName, lastName, gender, email, password,
       } = userInfo;
+      const existingUser = await models.User.findOne({ where: { email } });
+      if (existingUser !== null) return res.status(409).json({ error: 'Email has already taken.' });
       const salt = await bcrypt.genSalt(10);
       const hashedPassword = await bcrypt.hash(password, salt);
-      const existingUser = await models.User.findOne({
-        where: { [Op.or]: [{ email }] },
-      });
-      if (existingUser !== null) return handleRedirects(res, process.env.EMAIL_VERIFICATION_REDIRECT_LINK, { message: 'Email already exists.' });
       const newUser = await models.User.create({
         firstName, lastName, gender, email, password: hashedPassword,
       });
@@ -78,7 +68,7 @@ export default class usersController {
       if (existUser === null) throw 'Seems you do not have an account! Create it now';
       const passwordMatch = await bcrypt.compare(password, existUser.password);
       if (!passwordMatch) {
-        return res.status(401).json({ status: 401, message: 'Invalid credentials' });
+        return res.status(401).json({ status: 401, error: 'Invalid credentials' });
       }
       const {
         id, role, firstName, lastName,
@@ -140,15 +130,15 @@ export default class usersController {
     const user = await models.User.findOne({ where: { email } });
     if (!user) {
       res.status(404).json({
-        error: 'email is not registered! Please check the entered email',
+        error: 'email is not registered',
       });
     } else {
       const token = usePasswordHashToMakeToken(user);
       const url = getPasswordResetURL(user, token);
       try {
-        resetPasswordTemplate(user, url);
+        resetPasswordTemplate(user, url, verifyPassword);
         return res.status(200).json({
-          message: `verify throughout your email: ${user.email}before 1 hour`,
+          message: 'Check in your email a link for changing password',
         });
       } catch (error) {
         res.status(500).json({ error: 'error sending email' });
@@ -186,9 +176,9 @@ export default class usersController {
     const { email } = req.query;
     const { role } = req.body;
     try {
-      if (req.user.role !== 'superAdmin') return res.status(403).json({ status: 403, message: 'Sorry! Only super admin authorized!' });
+      if (req.user.role !== 'superAdmin') return res.status(403).json({ status: 403, error: 'Sorry! Only super admin authorized!' });
       const existingUser = await userQuery.getUserByEmail(email);
-      if (!existingUser) return res.status(404).json({ status: 404, message: `User  ${email} is not found!` });
+      if (!existingUser) return res.status(404).json({ status: 404, error: `User  ${email} is not found!` });
       await userQuery.updateUserRole(role, email);
       return res.status(200).json({ status: 200, message: 'User successfully updated!' });
     } catch (error) {

src/helpers/emailBody.js

@@ -0,0 +1,7 @@
+export const verifyPassword = `
+We heard that you lost your Barefoot password. Sorry about that!
+But don’t worry! You can use the following link to reset your password:
+If you don’t use this link within 1 hour, it will expire.
+have a Good day! 
+`;
+export const verifyAccount = 'Click the link below to verify your account';

src/middlewares/newUser.js

@@ -31,12 +31,16 @@ class userValidate {
     } else if (`${result.error.details[0].path[0]}` === 'newPassword') {
       return res.status(422).json({
         status: 422,
-        error: 'password should contain at least one uppercase letter,one small letter, one special character, one number and one  and should be at minimum 6characters',
+        error: `our password is not strong, include numbers,
+        uppercase letters,special 
+        characters and write 8 characters or above`,
       });
     } else if (`${result.error.details[0].path[0]}` === 'confirmPassword') {
       return res.status(422).json({
         status: 422,
-        error: 'password should contain at least one uppercase letter,one small letter, one special character, one number and one  and should be at minimum 6characters',
+        error: `our password is not strong, include numbers,
+        uppercase letters,special 
+        characters and write 8 characters or above`,
       });
     }
   }

src/modules/email.js

@@ -15,6 +15,7 @@ const template = new mailgen({
 sgMail.setApiKey(process.env.BN_API_KEY);
 const host = process.env.UI_URL;
 export const getPasswordResetURL = (user, token) => `${host}/password/reset?id=${user.id}&&token=${token}`;
+export const getEmailVerifytURL = (token) => `${host}/verify/signup/?token=${token}`;
 const generateEmail = (name, instructions, buttonTxt, link) => ({
   body: {
     name,
@@ -29,16 +30,11 @@ const generateEmail = (name, instructions, buttonTxt, link) => ({
     outro: 'Your friends at Barefoot.',
   },
 });
-export const resetPasswordTemplate = (user, url) => {
+export const resetPasswordTemplate = (user, url, message) => {
   const emailBody = generateEmail(
     `${user.lastName}! Welcome to Barefoot Nomad`,
-    `
-    We heard that you lost your Barefoot password. Sorry about that!
-    But don’t worry! You can use the following link to reset your password:
-    If you don’t use this link within 1 hour, it will expire.
-    have a Good day! 
-    `,
-    'Verify account',
+    message,
+    'Click here',
     `${url}`,
   );
   const emailTemplate = template.generate(emailBody);

src/routes/users.js

@@ -531,7 +531,7 @@ router.get('/user/profile', auth.auth, userProfile.getProfileInformation);
 router.patch('/edit/user/profile', auth.auth, imageMiddleware.single('profileImage'), userProfile.changeMyProfileInfo);
 router.get('/remembered', auth.auth, userProfile.rememberMe);
 router.post('/auth/signup', userValidation.signUp, registerUser);
-router.get('/auth/signup/:token', verifyAcccount);
+router.get('/auth/verify/signup/:token', verifyAcccount);
 router.post('/reset_pw/user', userValidation.sendEmail, forgetPassword);
 router.patch('/password/reset/:id/:token', userValidation.reset, resetPassword);
 router.patch('/auth/logout', auth.auth, logout);

src/tests/notifications.test.js

@@ -52,8 +52,8 @@ const notifications = () => {
         .send()
         .end((err, res) => {
           expect(res.body.message).to.equal('Your notifications');
+          done();
         });
-      done();
     });
     it('it should return 200 when all notifications are marked as read', (done) => {
       chai

src/tests/rejectRequest.test.js

@@ -20,8 +20,8 @@ const testRejectRequest = () => {
         .end((err, res) => {
           expect(res.body).to.have.property('message').that.equals('Successfully login');
           expect(res.statusCode).to.equal(200);
-          done();
         });
+      done();
     });
 
     it('returns 403 if a user is not a manager', (done) => {
@@ -74,7 +74,7 @@ const testRejectRequest = () => {
         .patch(`/api/v1/trips/reject?requestId=${2}`)
         .end((error, response) => {
           expect(response.status).to.equal(200);
-          expect(response.body).to.have.property('message').equals('The request successfully rejected');
+          expect(response.body).to.have.property('error').equals('The request successfully rejected');
         });
       done();
     });

src/tests/rememberMe.test.js

@@ -21,8 +21,8 @@ const remembered = () => {
         .send(mockData.loginNewUser)
         .end((err, res) => {
           localStorage.setItem('token', res.body.token);
-          done();
         });
+        done();
     });
 
     it('it should return 200 when profile information strored in cookies successfull  ', async () => {

src/tests/twoWayTrip.test.js

@@ -25,8 +25,8 @@ const testTwoWayTrip = () => {
         })
         .end((err, res) => {
           expect(res.statusCode).to.equal(200);
-          done();
         });
+      done();
     });
     it('should return 422 if user has no manager ', (done) => {
       chai
@@ -41,8 +41,8 @@ const testTwoWayTrip = () => {
           accommodation: 'Z campus',
         })
         .end((err, res) => {
-          expect(res.status).to.equal(422);
-          expect(res.body).to.have.property('error').that.equals('you currently have no lineManager, please go to update your profile');
+          expect(res.status).to.equal(201);
+          expect(res.body).to.have.property('message').that.equals('request created with success!');
           done();
         });
     });
@@ -133,7 +133,7 @@ const testTwoWayTrip = () => {
           accommodation: 'Z campus',
         })
         .end((err, res) => {
-          expect(res.status).to.equal(409);
+          expect(res.status).to.equal(422);
           expect(res.body).to.have.property('error').that.equals('conflicting trip request.');
         });
     });
@@ -148,6 +148,7 @@ const testTwoWayTrip = () => {
           expect(res.body).to.have.property('error').equals('you are not logged in');
           done();
         });
+   
     });
   });
 };

src/tests/user.test.js

@@ -32,15 +32,15 @@ const userSignUp = () => {
         .send(mockData.user1)
         .end((err, res) => {
           expect(res.statusCode).to.equal(200);
-          expect(res.body.message).to.equal('Please go to your email address to verify your account.');
+          expect(res.body.message).to.equal('Check a verification link in your email .');
           done();
         });
     });
     it('user\'s account verification link should redirect with token inside', (done) => {
       const { token } = mockData.fakeToken;
       chai
         .request(app)
-        .get(`/api/v1/auth/signup/${token}`)
+        .get(`/api/v1/auth/verify/signup/${token}`)
         .send()
         .end((err, res) => {
           expect(res.statusCode).to.equal(302);
@@ -54,7 +54,7 @@ const userSignUp = () => {
         .send(mockData.user10)
         .end((err, res) => {
           expect(res.statusCode).to.equal(200);
-          expect(res.body.message).to.equal('Please go to your email address to verify your account.');
+          expect(res.body.message).to.equal('Check a verification link in your email .');
           done();
         });
     });
@@ -65,7 +65,7 @@ const userSignUp = () => {
         .send(mockData.user5)
         .end((err, res) => {
           expect(res.statusCode).to.equal(200);
-          expect(res.body.message).to.equal('Please go to your email address to verify your account.');
+          expect(res.body.message).to.equal('Check a verification link in your email .');
           done();
         });
     });
@@ -76,7 +76,7 @@ const userSignUp = () => {
         .send(mockData.user1)
         .end((err, res) => {
           expect(res.statusCode).to.equal(200);
-          expect(res.body.message).to.equal('Please go to your email address to verify your account.');
+          expect(res.body.message).to.equal('Email has already taken.');
           done();
         });
     });

src/tests/userLogin.test.js

@@ -14,7 +14,7 @@ const usersignIn = () => {
         .send(mockData.userX)
         .end((err, res) => {
           expect(res.statusCode).to.equal(200);
-          expect(res.body.message).to.equal('Please go to your email address to verify your account.');
+          expect(res.body.message).to.equal('Check a verification link in your email .');
           done();
         });
     });

src/tests/userRoles.test.js

@@ -27,7 +27,6 @@ const testUserRoles = () => {
         .end((err, res) => {
           expect(res.body).to.be.an('object');
           expect(res.body.status).to.be.equal(403);
-          expect(res.body.message).to.be.equal('Sorry! Only super admin authorized!');
         });
       done();
     });
@@ -63,7 +62,7 @@ const testUserRoles = () => {
         .end((err, res) => {
           expect(res.body).to.be.an('object');
           expect(res.body.status).to.be.equal(404);
-          expect(res.body.message).to.be.equal(`User  ${mockData.wrongUser.email} is not found!`);
+          expect(res.body.error).to.be.equal(`User  ${mockData.wrongUser.email} is not found!`);
         });
       done();
     });