fix merge conflict in develop

auth/passport.js

@@ -34,14 +34,11 @@ export const googleSocial = async (accessToken, refreshToken, profile, done) =>
   });
   return done(null, user[0].dataValues);
 };
-passport.use(new GoogleStrategy(
-  {
-    clientID: process.env.GOOGLE_CLIENT_ID,
-    clientSecret: process.env.GOOGLE_CLIENT_SECRET,
-    callbackURL: `${process.env.HOST_URL}/api/v1/auth/google/callback`,
-  }, googleSocial
-
-));
+passport.use(new GoogleStrategy({
+  clientID: process.env.GOOGLE_CLIENT_ID,
+  clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+  callbackURL: `${process.env.HOST_URL}/api/v1/auth/google/callback`,
+}, googleSocial));
 
 /**
    * callback function for facebook strategy

controllers/articles.js

@@ -69,13 +69,13 @@ export default class ArticleController {
     } catch (error) {
       return res.status(500).json({
         success: false,
-        error: [error.message]
+        errors: [error.message]
       });
     }
   }
 
   /**
- * @description - Update an article
+ * @description - Deltes an article
  * @static
  * @param {Object} req - the request object
  * @param {Object} res - the response object
@@ -84,21 +84,19 @@ export default class ArticleController {
  */
   static async deleteArticle(req, res) {
     try {
-      await Article.destroy(
-        {
-          where: {
-            id: req.params.id
-          }
+      await Article.destroy({
+        where: {
+          id: req.params.id
         }
-      );
+      });
       return res.status(200).json({
         success: true,
         message: 'Article deleted successfully'
       });
     } catch (error) {
       return res.status(500).json({
         success: false,
-        error: [error.message]
+        errors: [error.message]
       });
     }
   }

controllers/user.js

@@ -1,8 +1,13 @@
+import bcrypt from 'bcrypt';
 import dotenv from 'dotenv';
 import jwt from 'jsonwebtoken';
-import { compareSync } from 'bcrypt';
+import shortId from 'shortid';
+import sendMail from '../helpers/emails';
+import getName from '../helpers/user';
 import { User } from '../models';
 
+const { HOST_URL } = process.env;
+
 dotenv.config();
 const { JWT_SECRET } = process.env;
 const generateToken = (id, expiresIn = '24h') => jwt.sign({ id }, JWT_SECRET, { expiresIn });
@@ -75,7 +80,7 @@ export default class UserController {
       body: { rememberMe, password },
       user
     } = req;
-    const passwordMatch = compareSync(password, user.password);
+    const passwordMatch = bcrypt.compareSync(password, user.password);
     if (!passwordMatch) {
       return res.status(401).json({
         success: false,
@@ -131,4 +136,90 @@ export default class UserController {
       });
     });
   }
+
+  /**
+   * @description reset user password
+   * @param {object} req http request object
+   * @param {object} res http response object
+   * @returns {object} response
+   */
+  static async requestPasswordReset(req, res) {
+    const { email } = req.body;
+    const passwordResetToken = shortId.generate();
+    try {
+      // save password reset token to db
+      await User.update(
+        {
+          passwordResetToken,
+          passwordResetTokenExpires: Date.now() + (60 * 60 * 1000)
+        },
+        { where: { email } }
+      );
+    } catch (error) {
+      return res.status(500).json({
+        success: false,
+        errors: [error.message]
+      });
+    }
+
+    // get user's name and send reset email
+    const name = await getName(email);
+    const emailPayload = {
+      name,
+      email,
+      link: `${HOST_URL}/api/v1/resetpassword/${passwordResetToken}`,
+      subject: 'Reset your password',
+      message: 'reset your password'
+    };
+    sendMail(emailPayload);
+
+    return res.status(201).json({
+      success: true,
+      message: 'A link to reset your password has been sent to your mail. Please note that the link is only valid for one hour.'
+    });
+  }
+
+  /**
+   * @description Check if password token in valid
+   * @param {object} req http request object
+   * @param {object} res http response object
+   * @returns {object} response
+   */
+  static async resetPassword(req, res) {
+    const { params: { passwordResetToken } } = req;
+    const { password } = req.body;
+    const getPasswordResetToken = await User.findOne({ where: { passwordResetToken } });
+    if (!getPasswordResetToken) {
+      return res.status(404).json({
+        success: false,
+        errors: ['Password reset token not found']
+      });
+    }
+    if (getPasswordResetToken.dataValues.passwordResetTokenExpires < Date.now()) {
+      return res.status(410).json({
+        success: false,
+        errors: ['Your link has expired. Please try to reset password again.']
+      });
+    }
+    try {
+      // save new password to db and remove password reset token
+      await User.update(
+        {
+          password,
+          passwordResetToken: ''
+        },
+        { where: { passwordResetToken } }
+      );
+    } catch (error) {
+      return res.status(500).json({
+        success: false,
+        errors: [error.message]
+      });
+    }
+
+    return res.status(201).json({
+      success: true,
+      message: 'Password changed successfully.'
+    });
+  }
 }

doc.json

@@ -231,6 +231,84 @@
         }
       }
     },
+    "/requestpasswordreset": {
+      "post": {
+        "tags": [
+          "Reset password"
+        ],
+        "summary": "Send reset link to user email",
+        "description": "Send reset link to user email",
+        "consumes": [
+          "application/x-www-form-urlencoded",
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "Request body",
+            "description": "Reset user password",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/requestPasswordReset"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Save password reset key in database and send link to email"
+          },
+          "404": {
+            "description": "User not registered or verified."
+          },
+          "422": {
+            "description": "Email is invalid"
+          }
+        }
+      }
+    },
+    "/resetpassword/{key}": {
+      "post": {
+        "tags": [
+          "Reset password"
+        ],
+        "summary": "Verify user reset password key and change password",
+        "description": "Verify user reset password key and change password",
+        "consumes": [
+          "application/x-www-form-urlencoded",
+          "application/json"
+        ],
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "key",
+            "description": "key sent with the link to the user email",
+            "required": true,
+            "type": "integer",
+            "format": "int64",
+            "schema": {
+              "$ref": "#/definitions/resetPassword"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "You can now reset your password."
+          },
+          "410": {
+            "description": "Your link has expired. Please try to reset password again."
+          },
+          "404": {
+            "description": "Password reset token not found."
+          }
+        }
+      }
+    },
     "/articles": {
       "post": {
         "tags": [
@@ -410,6 +488,22 @@
         }
       }
     },
+    "requestPasswordReset": {
+      "type": "object",
+      "properties": {
+        "email": {
+          "type": "string"
+        }
+      }
+    },
+    "resetPassword": {
+      "type": "object",
+      "properties": {
+        "password": {
+          "type": "string"
+        }
+      }
+    },
     "articles": {
       "type": "object",
       "properties": {
@@ -423,10 +517,10 @@
           "type": "string"
         }
       }
+    },
+    "externalDocs": {
+      "description": "Find out more about Swagger",
+      "url": "http://swagger.io"
     }
-  },
-  "externalDocs": {
-    "description": "Find out more about Swagger",
-    "url": "http://swagger.io"
   }
 }

helpers/emails.js

@@ -17,13 +17,20 @@ const transporter = nodemailer.createTransport({
 });
 
 const sendMail = (payload) => {
-  const { email, name, link } = payload;
+  const {
+    email,
+    name,
+    link,
+    subject,
+    message
+  } = payload;
+
   const mailOptions = {
     from: EMAIL_ADDRESS,
     to: email,
-    subject: 'Welcome to Authors Haven',
+    subject,
     html: `<h1>Hi ${name}</h1>
-      <p>Please click <a href="${link}">here</a> to verify your account.</p>
+      <p>Please click <a href="${link}">here</a> to ${message}.</p>
     `,
   };
   return transporter.sendMail(mailOptions);

helpers/user.js

@@ -0,0 +1,12 @@
+import { User } from '../models';
+
+/**
+ * @description Return user name
+ * @param {string} email user email
+ * @returns {promise} promise object
+ */
+const getName = async (email) => {
+  const name = await User.findOne({ where: { email } });
+  return name.dataValues.name;
+};
+export default getName;

middleware/validation.js

@@ -99,21 +99,36 @@ export const validateUser = async (req, res, next) => {
     if (!article) {
       return res.status(404).json({
         success: false,
-        error: 'Article not found'
+        errors: ['Article not found']
       });
     }
     const checkUser = article.userId === user.id;
     if (!checkUser) {
       return res.status(401).json({
         success: false,
-        error: 'You are unauthorized to perform this action'
+        errors: ['You are unauthorized to perform this action']
       });
     }
     return next();
   } catch (error) {
     return res.status(500).json({
       success: false,
-      error: 'Article does not exist'
+      errors: ['Article does not exist']
     });
   }
 };
+export const validateEmail = [
+  check('email')
+    .isEmail()
+    .withMessage('Email is invalid.')
+    .custom(value => !/\s/.test(value))
+    .withMessage('No spaces are allowed in the email.')
+];
+
+export const validatePassword = [
+  check('password')
+    .isLength({ min: 6 })
+    .withMessage('Password must be at least 6 characters long.')
+    .custom(value => !/\s/.test(value))
+    .withMessage('No spaces are allowed in the password.')
+];