Merge pull request #49 from andela/develop

Merge develop to master
andela · Apr 11, 2019 · 784d376 · 784d376
2 parents 73ee94b + 1d70543
commit 784d376
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/controllers/user.js b/controllers/user.js
@@ -7,7 +7,7 @@ import sendMail from '../helpers/emails';
 import getName from '../helpers/user';
 import { User } from '../models';
 
-const { HOST_URL } = process.env;
+const { HOST_URL_FRONTEND } = process.env;
 
 dotenv.config();
 const { JWT_SECRET } = process.env;
@@ -41,12 +41,15 @@ export default class UserController {
     })
       .then((newUser) => {
         const {
-          dataValues: { id }
+          dataValues: { id, role }
         } = newUser;
         const token = generateToken(id);
         return res.status(201).json({
           success: true,
           message: 'You have signed up successfully.',
+          user: {
+            name, username, email, role
+          },
           token
         });
       })
@@ -91,9 +94,18 @@ export default class UserController {
     const expiresIn = rememberMe ? '240h' : '24h';
     try {
       const token = generateToken(user.id, expiresIn);
+      const {
+        username, email, name, role
+      } = user;
       return res.status(200).json({
         success: true,
-        message: `Welcome ${user.username}`,
+        message: `Welcome ${username}`,
+        user: {
+          username,
+          email,
+          name,
+          role
+        },
         token
       });
     } catch (err) {
@@ -168,7 +180,7 @@ export default class UserController {
     const emailPayload = {
       name,
       email,
-      link: `${HOST_URL}/api/v1/resetpassword/${passwordResetToken}`,
+      link: `${HOST_URL_FRONTEND}/resetpassword/${passwordResetToken}`,
       subject: 'Reset your password',
       message: 'reset your password'
     };

diff --git a/models/User.js b/models/User.js
@@ -5,7 +5,7 @@ import sendMail from '../helpers/emails';
 
 dotenv.config();
 
-const { HOST_URL } = process.env;
+const { HOST_URL_FRONTEND } = process.env;
 
 module.exports = (sequelize, DataTypes) => {
   const userSchema = {
@@ -113,7 +113,7 @@ module.exports = (sequelize, DataTypes) => {
     const emailPayload = {
       name,
       email,
-      link: `${HOST_URL}/api/v1/verify/${verificationId}`,
+      link: `${HOST_URL_FRONTEND}/verify/${verificationId}`,
       subject: "Welcome to Author's Haven",
       message: 'verify your account'
     };

diff --git a/test/helpers/userDummyData.js b/test/helpers/userDummyData.js
@@ -110,7 +110,7 @@ export const validLoginUser = {
 
 export const myUser = {
   username: 'Alex20',
-  email: 'jacynnadi20@gmail.com',
+  email: 'jacynnad120@gmail.com',
   name: 'Jacy20',
   password: 'password'
 };

diff --git a/test/login.spec.js b/test/login.spec.js
@@ -171,7 +171,7 @@ describe('User login authentication: ', () => {
         status,
         body: { success, message }
       } = res;
-      expect(res.body).be.an('object').which.has.keys(['success', 'message', 'token']);
+      expect(res.body).be.an('object').which.has.keys(['success', 'message', 'token', 'user']);
       expect(status).to.be.equal(200);
       expect(success).to.be.equal(true);
       expect(message).to.be.equal(`Welcome ${superAdmin.username}`);