verify

Author: ElenaDiachenko

Dockerfile

@@ -0,0 +1,11 @@
+FROM node
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install
+
+EXPOSE 3000
+
+CMD ["node", "server"]

controllers/users/index.js

@@ -4,6 +4,8 @@ const logout = require('./logout');
 const getCurrent = require('./getCurrent');
 const updateSubscription = require('./updateSubscription');
 const updateAvatar = require('./updateAvatar');
+const verifyEmail = require('./verifyEmail');
+const resendVerifyEmail = require('./resendVerifyEmail');
 
 module.exports = {
   signup,
@@ -12,4 +14,6 @@ module.exports = {
   getCurrent,
   updateSubscription,
   updateAvatar,
+  verifyEmail,
+  resendVerifyEmail,
 };

controllers/users/login.js

@@ -2,7 +2,7 @@ const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
 const { User } = require('../../models');
 const { getErrorMessage } = require('../../utils');
-const { joiLoginSchema } = require('../../models/user');
+// const { joiLoginSchema } = require('../../models/user');
 const { SECRET_KEY } = process.env;
 
 const login = async (req, res) => {
@@ -17,6 +17,9 @@ const login = async (req, res) => {
       .status(401)
       .json(getErrorMessage(401, 'Email or password is wrong'));
   }
+  if (!user.verify) {
+    return res.status(401).json(getErrorMessage(401, 'Email not verify'));
+  }
 
   const comparePassword = bcrypt.compareSync(password, user.password);
   if (!comparePassword) {
@@ -25,10 +28,6 @@ const login = async (req, res) => {
       .json(getErrorMessage(401, 'Email or password is wrong'));
   }
 
-  // {
-  //   throw Error(401, 'Email or password is wrong');
-  // }
-
   const payload = {
     id: user._id,
   };

controllers/users/resendVerifyEmail.js

@@ -0,0 +1,37 @@
+const { User } = require('../../models');
+const { getErrorMessage, sendEmail } = require('../../utils');
+
+const resendVerifyEmail = async (req, res) => {
+  const { email } = req.body;
+
+  if (!email) {
+    return res
+      .status(400)
+      .json(getErrorMessage(400, `Missing required field email`));
+  }
+
+  const user = await User.findOne({ email });
+  if (!user) {
+    return res.status(404).json(getErrorMessage(404, `User not found`));
+  }
+  if (user.verify) {
+    return res
+      .status(400)
+      .json(getErrorMessage(400, `Verification has already been passed`));
+  }
+  const mail = {
+    to: email,
+    subject: 'Site registration confirmation',
+    html: `<a target="_blank" href="http://localhost:3000/api/auth/verify/${user.verificationToken}">Click to confirm registration</a>`,
+  };
+
+  await sendEmail(mail);
+
+  res.json({
+    status: 'success',
+    code: 200,
+    message: 'Verification email resent',
+  });
+};
+
+module.exports = resendVerifyEmail;

controllers/users/signup.js

@@ -1,7 +1,8 @@
 const bcrypt = require('bcrypt');
 const gravatar = require('gravatar');
 const { User } = require('../../models');
-const { getErrorMessage } = require('../../utils');
+const { getErrorMessage, sendEmail } = require('../../utils');
+const { v4 } = require('uuid');
 
 const signup = async (req, res) => {
   const { email, password, subscription } = req.body;
@@ -12,6 +13,7 @@ const signup = async (req, res) => {
       .status(409)
       .json(getErrorMessage(409, `Email: '${email}' in use`));
   }
+  const verificationToken = v4();
 
   const avatarURL = gravatar.url(email);
   const hashPassword = bcrypt.hashSync(password, bcrypt.genSaltSync(10));
@@ -20,15 +22,25 @@ const signup = async (req, res) => {
     email,
     password: hashPassword,
     avatarURL,
+    verificationToken,
   });
 
+  const mail = {
+    to: email,
+    subject: 'Site registration confirmation',
+    html: `<a target="_blank" href="http://localhost:3000/api/auth/verify/${verificationToken}">Click to confirm registration</a>`,
+  };
+
+  await sendEmail(mail);
+
   res.status(201).json({
     status: 'success',
     code: 201,
     user: {
       email: result.email,
       subscription: result.subscription,
       avatarURL: result.avatarURL,
+      verificationToken: result.verificationToken,
     },
   });
 };

controllers/users/verifyEmail.js

@@ -0,0 +1,24 @@
+const { User } = require('../../models');
+const { getErrorMessage } = require('../../utils');
+
+const verifyEmail = async (req, res) => {
+  const { verificationToken } = req.params;
+
+  const user = await User.findOne({ verificationToken });
+  if (!user) {
+    return res.status(404).json(getErrorMessage(404, `User not found`));
+  }
+
+  await User.findByIdAndUpdate(user._id, {
+    verify: true,
+    verificationToken: '',
+  });
+
+  res.json({
+    status: 'success',
+    code: 200,
+    message: 'Verification successful',
+  });
+};
+
+module.exports = verifyEmail;

models/user.js

@@ -25,6 +25,14 @@ const userSchema = Schema({
     type: String,
     require: true,
   },
+  verify: {
+    type: Boolean,
+    default: false,
+  },
+  verificationToken: {
+    type: String,
+    required: [true, 'Verify token is required'],
+  },
 });
 
 const joiSignupSchema = Joi.object({
@@ -45,6 +53,11 @@ const joiLoginSchema = Joi.object({
 const joiSubscriptionSchema = Joi.object({
   subscription: Joi.string().valueOf('starter', 'pro', 'business').required(),
 });
+const joiEmailSchema = Joi.object({
+  email: Joi.string()
+    .pattern(/[a-z0-9]+@[a-z]+\.[a-z]{2,3}/)
+    .required(),
+});
 
 const User = model('user', userSchema);
 
@@ -53,4 +66,5 @@ module.exports = {
   joiSignupSchema,
   joiLoginSchema,
   joiSubscriptionSchema,
+  joiEmailSchema,
 };

routes/api/users.js

@@ -6,10 +6,17 @@ const {
   joiSignupSchema,
   joiLoginSchema,
   joiSubscriptionSchema,
+  joiEmailSchema,
 } = require('../../models/user');
 
 router.post('/signup', validation(joiSignupSchema), ctrlWrapper(ctrl.signup));
 router.post('/login', validation(joiLoginSchema), ctrlWrapper(ctrl.login));
+router.get('/verify/:verificationToken', ctrlWrapper(ctrl.verifyEmail));
+router.post(
+  '/verify',
+  validation(joiEmailSchema),
+  ctrlWrapper(ctrl.resendVerifyEmail),
+);
 router.post('/logout', auth, ctrlWrapper(ctrl.logout));
 router.get('/current', auth, ctrlWrapper(ctrl.getCurrent));
 router.patch(

utils/index.js

@@ -1,5 +1,7 @@
 const getErrorMessage = require('./getErrorMessage');
+const sendEmail = require('./sendEmail');
 
 module.exports = {
   getErrorMessage,
+  sendEmail,
 };

utils/sendEmail.js

@@ -0,0 +1,19 @@
+const sgMail = require('@sendgrid/mail');
+require('dotenv').config();
+
+const { SENDGRID_API_KEY } = process.env;
+
+sgMail.setApiKey(SENDGRID_API_KEY);
+
+const sendEmail = async (data) => {
+  // eslint-disable-next-line no-useless-catch
+  try {
+    const email = { ...data, from: 'diachenkoelena2@gmail.com' };
+    await sgMail.send(email);
+    return true;
+  } catch (error) {
+    throw error;
+  }
+};
+
+module.exports = sendEmail;