Merge branch 'develop' into bug/fix-response-error

andela · May 8, 2019 · cdc1b1a · cdc1b1a
2 parents e863f0c + 522179b
commit cdc1b1a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 14 deletions.
diff --git a/server/controllers/auth.controller.js b/server/controllers/auth.controller.js
@@ -1,9 +1,11 @@
+import dotenv from 'dotenv';
 import db from '../models';
 import authHelper from '../helpers/auth';
 import searchDatabase from '../helpers/search-database';
 import notifications from '../helpers/notifications';
 import serverError from '../helpers/server-error';
 
+dotenv.config();
 const { findUser } = searchDatabase;
 const { User } = db;
 const error = ['invalid username and/or password'];
@@ -93,13 +95,19 @@ const signupController = async (req, res) => {
       is_admin: isAdmin,
       first_name: firstName,
       is_reviewer: isReviewer,
+      is_activated: isActivated,
     } = user;
-    const token = authHelper.encode({ id, isAdmin, isReviewer });
+    const token = authHelper.encode({
+      id,
+      email,
+      isAdmin,
+      isReviewer,
+      isActivated,
+    });
 
     const verificationToken = authHelper.encode({ email });
-    const verificationLink = `${req.protocol}://${req.get(
-      'host'
-    )}/api/v1/auth/verification/${verificationToken}`;
+    const { FRONTEND_VERIFY_EMAIL_URL } = process.env;
+    const verificationLink = `${FRONTEND_VERIFY_EMAIL_URL}?token=${verificationToken}`;
 
     await notifications.signupEmail(email, verificationLink, firstName);
 

diff --git a/server/controllers/profile.controllers.js b/server/controllers/profile.controllers.js
@@ -34,6 +34,11 @@ const getUserProfile = async (req, res) => {
         'email',
         'is_reviewer',
         'research_field',
+        'image_url',
+        'bio',
+        'is_activated',
+        'is_reported',
+        'is_notified',
         'createdAt',
         'updatedAt',
       ],
@@ -93,6 +98,11 @@ const getProfileByField = async (req, res) => {
         'email',
         'is_reviewer',
         'research_field',
+        'image_url',
+        'bio',
+        'is_activated',
+        'is_reported',
+        'is_notified',
         'createdAt',
         'updatedAt',
       ],

diff --git a/server/controllers/reset-password.controllers.js b/server/controllers/reset-password.controllers.js
@@ -1,8 +1,10 @@
+import dotenv from 'dotenv';
 import notification from '../helpers/notifications';
 import Authenticate from '../helpers/auth';
 import model from '../models';
 import serverError from '../helpers/server-error';
 
+dotenv.config();
 const { User } = model;
 
 const { hashPassword } = Authenticate;
@@ -32,14 +34,12 @@ const updatePassword = async (req, res) => {
   }
 };
 
-const acceptRequest = (req, res) =>
+const acceptRequest = (req, res) => {
+  const { FRONTEND_PASSWORD_RESET_URL } = process.env;
   res
     .status(200)
-    .redirect(
-      `${req.protocol}://${req.get('host')}/api/v1/auth/reset/message?token=${
-        req.params.token
-      }`
-    );
+    .redirect(`${FRONTEND_PASSWORD_RESET_URL}?token=${req.params.token}`);
+};
 
 const ResetPasswordController = { updatePassword, acceptRequest };
 

diff --git a/server/documentation/swagger.js b/server/documentation/swagger.js
@@ -8,7 +8,7 @@ const swaggerDefinition = {
     description:
       'A community of like-minded authors to foster inspiration and innovation by leveraging the modern web',
   },
-  host: 'localhost:3000',
+  host: 'https://hermes-ah-backend.herokuapp.com',
   basePath: '/api/v1',
   schemes: ['https', 'http'],
   securityDefinitions: {

diff --git a/server/helpers/profiler.js b/server/helpers/profiler.js
@@ -5,6 +5,7 @@ const profiler = user => {
     lastname: user.last_name,
     title: user.title,
     bio: user.bio,
+    imageUrl: user.image_url,
     phonenumber: user.phone_number,
     email: user.email,
     isreviewer: user.is_reviewer,

diff --git a/server/middlewares/reset-password.middlewares.js b/server/middlewares/reset-password.middlewares.js
@@ -51,6 +51,7 @@ const ResetPasswordMiddleware = {
 
   async mailer(req, res) {
     try {
+      // const urlTest = req.body;
       const linkUrl = `${req.protocol}://${req.get('host')}/api/v1/auth/reset/${
         req.token
       }/password`;

diff --git a/server/models/user.js b/server/models/user.js
@@ -164,9 +164,6 @@ module.exports = (sequelize, DataTypes) => {
   User.beforeCreate(user => {
     user.password = authHelpers.hashPassword(user.password);
   });
-  User.beforeUpdate(user => {
-    user.password = authHelpers.hashPassword(user.password);
-  });
 
   User.associate = models => {
     const { Follower, Article } = models;