Merge branch 'feature/165167110/oauth-payload-handle' of https://gith…

…ub.com/andela/apollo-ah-backend into feature/165167110/oauth-payload-handle
andela · Apr 9, 2019 · 65e806c · 65e806c
2 parents 4af37f5 + b76bc21
commit 65e806c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/public/avatar.png b/public/avatar.png
diff --git a/server/controllers/profileController.js b/server/controllers/profileController.js
@@ -14,6 +14,7 @@ const {
   SERVER_ERROR,
   OK,
   NOT_FOUND,
+  FORBIDDEN,
 } = STATUS;
 
 /** profile controller class */
@@ -42,7 +43,7 @@ class ProfileController {
     };
     const profileExists = await ProfileController.profileUsernameExists(username, userId);
     if (profileExists !== null) {
-      return Response.send(res, CREATED, {}, MESSAGE.USERNAME_EXITS, true);
+      return Response.send(res, FORBIDDEN, {}, MESSAGE.USERNAME_EXITS, true);
     }
     try {
       await Profile.update(

diff --git a/server/controllers/usersController.js b/server/controllers/usersController.js
@@ -31,7 +31,7 @@ class UsersController {
     const { body } = request;
 
     try {
-      const user = await User.create(body);
+      const user = await User.create(body, { raw: true });
       const role = await models.Role.findOne({ where: { name: 'user' } });
       await user.setRole(role);
       const token = await generateToken({ user });
@@ -50,8 +50,8 @@ class UsersController {
       };
       user.firstname = '';
       user.lastname = '';
-      user.gender = '';
       user.bio = '';
+      user.image = `${env('API_DOMAIN')}/avatar.png`;
       user.username = request.body.username.toLowerCase();
       user.userId = user.id;
       await models.Profile.create(user);
@@ -164,8 +164,10 @@ class UsersController {
       const user = await User.findOne({
         where: { email },
         raw: true,
+        include: [{
+          model: models.Profile,
+        }]
       });
-
       // validate user password
       if (!user || (user && !User.comparePassword(user, password))) {
         return Response.send(
@@ -176,11 +178,8 @@ class UsersController {
           false
         );
       }
-
       // generate token from user payload
-      const payload = user;
-      const token = await generateToken(payload);
-
+      const token = await generateToken(user);
       // respond with token
       return response
         .status(200)

diff --git a/server/models/Profile.js b/server/models/Profile.js
@@ -42,5 +42,4 @@ const Profile = (sequelize, DataTypes) => {
   };
   return ProfileSchema;
 };
-
 export default Profile;