Merge 8b0a9c7 into 2b89f81

src/api/routes/authRouter.js

@@ -2,6 +2,7 @@ import { Router } from 'express';
 import ValidateUser from '../../middlewares/ValidateUser';
 import authController from '../controllers/authController';
 import validateToken from '../../middlewares/checkValidToken';
+import checkUsername from '../../middlewares/checkUsername';
 
 import socialAuthController from '../controllers/socialAuth';
 import passport from '../../configs/passport';
@@ -10,7 +11,7 @@ import EmailVerifier from '../controllers/verifyEmail';
 
 const authRouter = new Router();
 
-authRouter.post('/signup', ValidateUser.validateSignup, authController.signup);
+authRouter.post('/signup', ValidateUser.validateSignup, checkUsername, authController.signup);
 authRouter.post('/login', authController.login);
 authRouter.get('/signout', validateToken, authController.signout);
 

src/helpers/constants/error.messages.js

@@ -69,5 +69,7 @@ export default {
   notificationNotFound: 'No notifications found for now, Thanks',
   noUserComment: 'You have no comment history on this article.',
   notModifiedComment: 'The comment is not modifying what is already stored',
-  notAValidReason: 'Sorry, but that reason does not exist, Thanks'
+  notAValidReason: 'Sorry, but that reason does not exist, Thanks',
+  emailExists: 'The user with the same email already exists',
+  usernameExists: 'The username has already been used'
 };

src/middlewares/ValidateUser.js

@@ -2,6 +2,7 @@ import models from '../api/models';
 import signupValidator from '../helpers/validators/signupValidator';
 import statusCode from '../helpers/constants/status.codes';
 import sendError from '../helpers/error.sender';
+import errorMessage from '../helpers/constants/error.messages';
 
 const { User } = models;
 /**
@@ -19,7 +20,7 @@ export default class {
     try {
       await signupValidator(req.body);
       const emailExists = await User.findByEmail(email);
-      if (emailExists) sendError(statusCode.BAD_REQUEST, res, 'email', ' The user already exists');
+      if (emailExists) sendError(statusCode.BAD_REQUEST, res, 'email', errorMessage.emailExists);
       else return next();
     } catch (error) {
       if (error.isJoi) {

src/middlewares/checkUsername.js

@@ -0,0 +1,12 @@
+import models from '../api/models';
+import statusCode from '../helpers/constants/status.codes';
+import sendError from '../helpers/error.sender';
+import errorMessage from '../helpers/constants/error.messages';
+
+const { User } = models;
+export default async (req, res, next) => {
+  const { username } = req.body;
+  const usedUsername = await User.findOne({ where: { username } });
+  if (usedUsername) sendError(statusCode.BAD_REQUEST, res, 'username', errorMessage.usernameExists);
+  else return next();
+};

tests/admin.test.js

@@ -64,7 +64,7 @@ describe('Users', () => {
       })
       .end((err, res) => {
         res.should.have.status(status.BAD_REQUEST);
-        res.body.errors.should.have.property('email').eql(error.exist);
+        res.body.errors.should.have.property('email').eql(error.emailExists);
         done();
       });
   });

tests/auth.test.js

@@ -32,10 +32,7 @@ describe('Signup', () => {
       .request(server)
       .post('/api/users/signup')
       .send({
-        username: data.username,
-        email: data.email,
-        password: data.password,
-        confirmPassword: data.password
+        ...data
       })
       .end((err, res) => {
         res.should.have.status(status.CREATED);
@@ -254,6 +251,21 @@ describe('Routes', () => {
         done();
       });
   });
+
+  it('should not register with a used username', (done) => {
+    data.email = 'data.email@em.com';
+    chai
+      .request(server)
+      .post('/api/users/signup')
+      .send({
+        ...data
+      })
+      .end((err, res) => {
+        res.should.have.status(status.BAD_REQUEST);
+        res.body.errors.should.have.property('username', errors.usernameExists);
+        done();
+      });
+  });
 });
 
 describe('Mailer', async () => {