Add username to user

server/api/controllers/access-tokens/create.js

@@ -1,20 +1,24 @@
 const bcrypt = require('bcrypt');
+const validator = require('validator');
 
 const Errors = {
-  EMAIL_NOT_EXIST: {
-    unauthorized: 'Email does not exist',
+  INVALID_EMAIL_OR_USERNAME: {
+    invalidEmailOrUsername: 'Invalid email or username',
   },
-  PASSWORD_NOT_VALID: {
-    unauthorized: 'Password is not valid',
+  INVALID_PASSWORD: {
+    invalidPassword: 'Invalid password',
   },
 };
 
 module.exports = {
   inputs: {
-    email: {
+    emailOrUsername: {
       type: 'string',
+      custom: (value) =>
+        value.includes('@')
+          ? validator.isEmail(value)
+          : value.length >= 3 && value.length <= 16 && /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/.test(value),
       required: true,
-      isEmail: true,
     },
     password: {
       type: 'string',
@@ -23,22 +27,23 @@ module.exports = {
   },
 
   exits: {
-    unauthorized: {
+    invalidEmailOrUsername: {
+      responseType: 'unauthorized',
+    },
+    invalidPassword: {
       responseType: 'unauthorized',
     },
   },
 
   async fn(inputs, exits) {
-    const user = await sails.helpers.getUser({
-      email: inputs.email.toLowerCase(),
-    });
+    const user = await sails.helpers.getUserByEmailOrUsername(inputs.emailOrUsername);
 
     if (!user) {
-      throw Errors.EMAIL_NOT_EXIST;
+      throw Errors.INVALID_EMAIL_OR_USERNAME;
     }
 
     if (!bcrypt.compareSync(inputs.password, user.password)) {
-      throw Errors.PASSWORD_NOT_VALID;
+      throw Errors.INVALID_PASSWORD;
     }
 
     return exits.success({

server/api/controllers/actions/index.js

@@ -1,6 +1,6 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
 };
 
@@ -18,7 +18,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -28,7 +28,7 @@ module.exports = {
 
     const { project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/boards/create.js

@@ -1,6 +1,6 @@
 const Errors = {
   PROJECT_NOT_FOUND: {
-    notFound: 'Project is not found',
+    projectNotFound: 'Project not found',
   },
 };
 
@@ -22,7 +22,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    projectNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/boards/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   BOARD_NOT_FOUND: {
-    notFound: 'Board is not found',
+    boardNotFound: 'Board not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    boardNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/boards/show.js

@@ -1,6 +1,6 @@
 const Errors = {
   BOARD_NOT_FOUND: {
-    notFound: 'Board is not found',
+    boardNotFound: 'Board not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    boardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -29,7 +29,7 @@ module.exports = {
 
     const { board, project } = await sails.helpers
       .getBoardToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.BOARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,
@@ -64,7 +64,7 @@ module.exports = {
       {},
     );
 
-    cards.map(card => ({
+    cards.map((card) => ({
       ...card,
       isSubscribed: isSubscribedByCardId[card.id] || false,
     }));

server/api/controllers/boards/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   BOARD_NOT_FOUND: {
-    notFound: 'Board is not found',
+    boardNotFound: 'Board not found',
   },
 };
 
@@ -21,7 +21,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    boardNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/card-labels/create.js

@@ -1,12 +1,12 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
   LABEL_NOT_FOUND: {
-    notFound: 'Label is not found',
+    labelNotFound: 'Label not found',
   },
-  CARD_LABEL_EXIST: {
-    conflict: 'Card label is already exist',
+  LABEL_ALREADY_IN_CARD: {
+    labelAlreadyInCard: 'Label already in card',
   },
 };
 
@@ -25,10 +25,13 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
-    conflict: {
+    labelNotFound: {
+      responseType: 'notFound',
+    },
+    labelAlreadyInCard: {
       responseType: 'conflict',
     },
   },
@@ -38,7 +41,7 @@ module.exports = {
 
     const { card, project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,
@@ -60,7 +63,7 @@ module.exports = {
 
     const cardLabel = await sails.helpers
       .createCardLabel(card, label, this.req)
-      .intercept('conflict', () => Errors.CARD_LABEL_EXIST);
+      .intercept('labelAlreadyInCard', () => Errors.LABEL_ALREADY_IN_CARD);
 
     return exits.success({
       item: cardLabel,

server/api/controllers/card-labels/delete.js

@@ -1,9 +1,9 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
-  CARD_LABEL_NOT_FOUND: {
-    notFound: 'Card label is not found',
+  LABEL_NOT_IN_CARD: {
+    labelNotInCard: 'Label not in card',
   },
 };
 
@@ -22,7 +22,10 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
+      responseType: 'notFound',
+    },
+    labelNotInCard: {
       responseType: 'notFound',
     },
   },
@@ -32,7 +35,7 @@ module.exports = {
 
     const { board, project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,
@@ -49,13 +52,13 @@ module.exports = {
     });
 
     if (!cardLabel) {
-      throw Errors.CARD_LABEL_NOT_FOUND;
+      throw Errors.LABEL_NOT_IN_CARD;
     }
 
     cardLabel = await sails.helpers.deleteCardLabel(cardLabel, board, this.req);
 
     if (!cardLabel) {
-      throw Errors.CARD_LABEL_NOT_FOUND;
+      throw Errors.LABEL_NOT_IN_CARD;
     }
 
     return exits.success({

server/api/controllers/card-memberships/create.js

@@ -1,12 +1,12 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
-  CARD_MEMBERSHIP_EXIST: {
-    conflict: 'Card membership is already exist',
+  USER_ALREADY_CARD_MEMBER: {
+    userAlreadyCardMember: 'User already card member',
   },
 };
 
@@ -25,10 +25,13 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
-    conflict: {
+    userNotFound: {
+      responseType: 'notFound',
+    },
+    userAlreadyCardMember: {
       responseType: 'conflict',
     },
   },
@@ -38,7 +41,7 @@ module.exports = {
 
     const { card, project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     let isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,
@@ -57,7 +60,7 @@ module.exports = {
 
     const cardMembership = await sails.helpers
       .createCardMembership(card, inputs.userId, this.req)
-      .intercept('conflict', () => Errors.CARD_MEMBERSHIP_EXIST);
+      .intercept('userAlreadyCardMember', () => Errors.USER_ALREADY_CARD_MEMBER);
 
     return exits.success({
       item: cardMembership,

server/api/controllers/card-memberships/delete.js

@@ -1,9 +1,9 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
-  CARD_MEMBERSHIP_NOT_FOUND: {
-    notFound: 'Card membership is not found',
+  USER_NOT_CARD_MEMBER: {
+    userNotCardMember: 'User not card member',
   },
 };
 
@@ -22,7 +22,10 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
+      responseType: 'notFound',
+    },
+    userNotCardMember: {
       responseType: 'notFound',
     },
   },
@@ -32,7 +35,7 @@ module.exports = {
 
     const { board, project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,
@@ -49,13 +52,13 @@ module.exports = {
     });
 
     if (!cardMembership) {
-      throw Errors.CARD_MEMBERSHIP_NOT_FOUND;
+      throw Errors.USER_NOT_CARD_MEMBER;
     }
 
     cardMembership = await sails.helpers.deleteCardMembership(cardMembership, board, this.req);
 
     if (!cardMembership) {
-      throw Errors.CARD_MEMBERSHIP_NOT_FOUND;
+      throw Errors.USER_NOT_CARD_MEMBER;
     }
 
     return exits.success({

server/api/controllers/cards/create.js

@@ -2,7 +2,7 @@ const moment = require('moment');
 
 const Errors = {
   LIST_NOT_FOUND: {
-    notFound: 'List is not found',
+    listNotFound: 'List not found',
   },
 };
 
@@ -28,11 +28,11 @@ module.exports = {
     },
     dueDate: {
       type: 'string',
-      custom: value => moment(value, moment.ISO_8601, true).isValid(),
+      custom: (value) => moment(value, moment.ISO_8601, true).isValid(),
     },
     timer: {
       type: 'json',
-      custom: value =>
+      custom: (value) =>
         _.isPlainObject(value) &&
         _.size(value) === 2 &&
         (_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
@@ -41,7 +41,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    listNotFound: {
       responseType: 'notFound',
     },
   },
@@ -51,7 +51,7 @@ module.exports = {
 
     const { list, project } = await sails.helpers
       .getListToProjectPath(inputs.listId)
-      .intercept('notFound', () => Errors.LIST_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/cards/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -24,7 +24,7 @@ module.exports = {
 
     const cardToProjectPath = await sails.helpers
       .getCardToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     let { card } = cardToProjectPath;
     const { project } = cardToProjectPath;

server/api/controllers/cards/show.js

@@ -1,6 +1,6 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -24,7 +24,7 @@ module.exports = {
 
     const { card, project } = await sails.helpers
       .getCardToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/cards/update.js

@@ -2,10 +2,10 @@ const moment = require('moment');
 
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
   LIST_NOT_FOUND: {
-    notFound: 'List is not found',
+    listNotFound: 'List not found',
   },
 };
 
@@ -34,12 +34,12 @@ module.exports = {
     },
     dueDate: {
       type: 'string',
-      custom: value => moment(value, moment.ISO_8601, true).isValid(),
+      custom: (value) => moment(value, moment.ISO_8601, true).isValid(),
       allowNull: true,
     },
     timer: {
       type: 'json',
-      custom: value =>
+      custom: (value) =>
         _.isPlainObject(value) &&
         _.size(value) === 2 &&
         (_.isNull(value.startedAt) || moment(value.startedAt, moment.ISO_8601, true).isValid()) &&
@@ -51,7 +51,10 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
+      responseType: 'notFound',
+    },
+    listNotFound: {
       responseType: 'notFound',
     },
   },
@@ -61,7 +64,7 @@ module.exports = {
 
     const cardToProjectPath = await sails.helpers
       .getCardToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     let { card } = cardToProjectPath;
     const { list, project } = cardToProjectPath;

server/api/controllers/comment-actions/create.js

@@ -1,6 +1,6 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
 };
 
@@ -18,7 +18,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -28,7 +28,7 @@ module.exports = {
 
     const { card, project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/comment-actions/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   COMMENT_ACTION_NOT_FOUND: {
-    notFound: 'Comment action is not found',
+    commentActionNotFound: 'Comment action not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    commentActionNotFound: {
       responseType: 'notFound',
     },
   },
@@ -33,7 +33,7 @@ module.exports = {
 
     const actionToProjectPath = await sails.helpers
       .getActionToProjectPath(criteria)
-      .intercept('notFound', () => Errors.COMMENT_ACTION_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.COMMENT_ACTION_NOT_FOUND);
 
     let { action } = actionToProjectPath;
     const { board, project } = actionToProjectPath;

server/api/controllers/comment-actions/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   COMMENT_ACTION_NOT_FOUND: {
-    notFound: 'Comment action is not found',
+    commentActionNotFound: 'Comment action not found',
   },
 };
 
@@ -18,7 +18,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    commentActionNotFound: {
       responseType: 'notFound',
     },
   },
@@ -32,7 +32,7 @@ module.exports = {
         type: 'commentCard',
         userId: currentUser.id,
       })
-      .intercept('notFound', () => Errors.COMMENT_ACTION_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.COMMENT_ACTION_NOT_FOUND);
 
     let { action } = actionToProjectPath;
     const { board, project } = actionToProjectPath;

server/api/controllers/labels/create.js

@@ -1,6 +1,6 @@
 const Errors = {
   BOARD_NOT_FOUND: {
-    notFound: 'Board is not found',
+    boardNotFound: 'Board not found',
   },
 };
 
@@ -24,7 +24,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    boardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -34,7 +34,7 @@ module.exports = {
 
     const { board, project } = await sails.helpers
       .getBoardToProjectPath(inputs.boardId)
-      .intercept('notFound', () => Errors.BOARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/labels/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   LABEL_NOT_FOUND: {
-    notFound: 'Label is not found',
+    labelNotFound: 'Label not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    labelNotFound: {
       responseType: 'notFound',
     },
   },
@@ -24,7 +24,7 @@ module.exports = {
 
     const labelToProjectPath = await sails.helpers
       .getLabelToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.LABEL_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.LABEL_NOT_FOUND);
 
     let { label } = labelToProjectPath;
     const { project } = labelToProjectPath;

server/api/controllers/labels/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   LABEL_NOT_FOUND: {
-    notFound: 'Label is not found',
+    labelNotFound: 'Label not found',
   },
 };
 
@@ -24,7 +24,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    labelNotFound: {
       responseType: 'notFound',
     },
   },
@@ -34,7 +34,7 @@ module.exports = {
 
     const labelToProjectPath = await sails.helpers
       .getLabelToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.LABEL_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.LABEL_NOT_FOUND);
 
     let { label } = labelToProjectPath;
     const { project } = labelToProjectPath;

server/api/controllers/lists/create.js

@@ -1,6 +1,6 @@
 const Errors = {
   BOARD_NOT_FOUND: {
-    notFound: 'Board is not found',
+    boardNotFound: 'Board not found',
   },
 };
 
@@ -22,7 +22,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    boardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -32,7 +32,7 @@ module.exports = {
 
     const { board, project } = await sails.helpers
       .getBoardToProjectPath(inputs.boardId)
-      .intercept('notFound', () => Errors.BOARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.BOARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/lists/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   LIST_NOT_FOUND: {
-    notFound: 'List is not found',
+    listNotFound: 'List not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    listNotFound: {
       responseType: 'notFound',
     },
   },
@@ -24,7 +24,7 @@ module.exports = {
 
     const listToProjectPath = await sails.helpers
       .getListToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.LIST_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
 
     let { list } = listToProjectPath;
     const { project } = listToProjectPath;

server/api/controllers/lists/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   LIST_NOT_FOUND: {
-    notFound: 'List is not found',
+    listNotFound: 'List not found',
   },
 };
 
@@ -21,7 +21,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    listNotFound: {
       responseType: 'notFound',
     },
   },
@@ -31,7 +31,7 @@ module.exports = {
 
     const listToProjectPath = await sails.helpers
       .getListToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.LIST_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.LIST_NOT_FOUND);
 
     let { list } = listToProjectPath;
     const { project } = listToProjectPath;

server/api/controllers/notifications/update.js

@@ -10,12 +10,6 @@ module.exports = {
     },
   },
 
-  exits: {
-    notFound: {
-      responseType: 'notFound',
-    },
-  },
-
   async fn(inputs, exits) {
     const { currentUser } = this.req;
 

server/api/controllers/project-memberships/create.js

@@ -1,12 +1,12 @@
 const Errors = {
   PROJECT_NOT_FOUND: {
-    notFound: 'Project is not found',
+    projectNotFound: 'Project not found',
   },
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
-  PROJECT_MEMBERSHIP_EXIST: {
-    conflict: 'Project membership is already exist',
+  USER_ALREADY_PROJECT_MEMBER: {
+    userAlreadyProjectMember: 'User already project member',
   },
 };
 
@@ -25,10 +25,13 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    projectNotFound: {
       responseType: 'notFound',
     },
-    conflict: {
+    userNotFound: {
+      responseType: 'notFound',
+    },
+    userAlreadyProjectMember: {
       responseType: 'conflict',
     },
   },
@@ -48,7 +51,7 @@ module.exports = {
 
     const projectMembership = await sails.helpers
       .createProjectMembership(project, user, this.req)
-      .intercept('conflict', () => Errors.PROJECT_MEMBERSHIP_EXIST);
+      .intercept('userAlreadyProjectMember', () => Errors.USER_ALREADY_PROJECT_MEMBER);
 
     return exits.success({
       item: projectMembership,

server/api/controllers/project-memberships/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   PROJECT_MEMBERSHIP_NOT_FOUND: {
-    notFound: 'Project membership is not found',
+    projectMembershipNotFound: 'Project membership not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    projectMembershipNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/projects/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   PROJECT_NOT_FOUND: {
-    notFound: 'Project is not found',
+    projectNotFound: 'Project not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    projectNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/projects/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   PROJECT_NOT_FOUND: {
-    notFound: 'Project is not found',
+    projectNotFound: 'Project not found',
   },
 };
 
@@ -18,7 +18,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    projectNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/tasks/create.js

@@ -1,6 +1,6 @@
 const Errors = {
   CARD_NOT_FOUND: {
-    notFound: 'Card is not found',
+    cardNotFound: 'Card not found',
   },
 };
 
@@ -21,7 +21,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    cardNotFound: {
       responseType: 'notFound',
     },
   },
@@ -31,7 +31,7 @@ module.exports = {
 
     const { card, project } = await sails.helpers
       .getCardToProjectPath(inputs.cardId)
-      .intercept('notFound', () => Errors.CARD_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.CARD_NOT_FOUND);
 
     const isUserMemberForProject = await sails.helpers.isUserMemberForProject(
       project.id,

server/api/controllers/tasks/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   TASK_NOT_FOUND: {
-    notFound: 'Task is not found',
+    taskNotFound: 'Task not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    taskNotFound: {
       responseType: 'notFound',
     },
   },
@@ -24,7 +24,7 @@ module.exports = {
 
     const taskToProjectPath = await sails.helpers
       .getTaskToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.TASK_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.TASK_NOT_FOUND);
 
     let { task } = taskToProjectPath;
     const { board, project } = taskToProjectPath;

server/api/controllers/tasks/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   TASK_NOT_FOUND: {
-    notFound: 'Task is not found',
+    taskNotFound: 'Task not found',
   },
 };
 
@@ -21,7 +21,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    taskNotFound: {
       responseType: 'notFound',
     },
   },
@@ -31,7 +31,7 @@ module.exports = {
 
     const taskToProjectPath = await sails.helpers
       .getTaskToProjectPath(inputs.id)
-      .intercept('notFound', () => Errors.TASK_NOT_FOUND);
+      .intercept('pathNotFound', () => Errors.TASK_NOT_FOUND);
 
     let { task } = taskToProjectPath;
     const { board, project } = taskToProjectPath;

server/api/controllers/users/create.js

@@ -1,6 +1,9 @@
 const Errors = {
-  USER_EXIST: {
-    conflict: 'User is already exist',
+  EMAIL_ALREADY_IN_USE: {
+    emailAlreadyInUse: 'Email already in use',
+  },
+  USERNAME_ALREADY_IN_USE: {
+    usernameAlreadyInUse: 'Username already in use',
   },
 };
 
@@ -19,20 +22,32 @@ module.exports = {
       type: 'string',
       required: true,
     },
+    username: {
+      type: 'string',
+      isNotEmptyString: true,
+      minLength: 3,
+      maxLength: 16,
+      regex: /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/,
+      allowNull: true,
+    },
   },
 
   exits: {
-    conflict: {
+    emailAlreadyInUse: {
+      responseType: 'conflict',
+    },
+    usernameAlreadyInUse: {
       responseType: 'conflict',
     },
   },
 
   async fn(inputs, exits) {
-    const values = _.pick(inputs, ['email', 'password', 'name']);
+    const values = _.pick(inputs, ['email', 'password', 'name', 'username']);
 
     const user = await sails.helpers
       .createUser(values, this.req)
-      .intercept('conflict', () => Errors.USER_EXIST);
+      .intercept('emailAlreadyInUse', () => Errors.EMAIL_ALREADY_IN_USE)
+      .intercept('usernameAlreadyInUse', () => Errors.USERNAME_ALREADY_IN_USE);
 
     return exits.success({
       item: user,

server/api/controllers/users/delete.js

@@ -1,6 +1,6 @@
 const Errors = {
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
 };
 
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    userNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/users/update-email.js

@@ -2,13 +2,13 @@ const bcrypt = require('bcrypt');
 
 const Errors = {
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
-  CURRENT_PASSWORD_NOT_VALID: {
-    forbidden: 'Current password is not valid',
+  INVALID_CURRENT_PASSWORD: {
+    invalidCurrentPassword: 'Invalid current password',
   },
-  USER_EXIST: {
-    conflict: 'User is already exist',
+  EMAIL_ALREADY_IN_USE: {
+    emailAlreadyInUse: 'Email already in use',
   },
 };
 
@@ -31,13 +31,13 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    userNotFound: {
       responseType: 'notFound',
     },
-    forbidden: {
+    invalidCurrentPassword: {
       responseType: 'forbidden',
     },
-    conflict: {
+    emailAlreadyInUse: {
       responseType: 'conflict',
     },
   },
@@ -47,7 +47,7 @@ module.exports = {
 
     if (inputs.id === currentUser.id) {
       if (!inputs.currentPassword) {
-        throw Errors.CURRENT_PASSWORD_NOT_VALID;
+        throw Errors.INVALID_CURRENT_PASSWORD;
       }
     } else if (!currentUser.isAdmin) {
       throw Errors.USER_NOT_FOUND; // Forbidden
@@ -63,14 +63,14 @@ module.exports = {
       inputs.id === currentUser.id &&
       !bcrypt.compareSync(inputs.currentPassword, user.password)
     ) {
-      throw Errors.CURRENT_PASSWORD_NOT_VALID;
+      throw Errors.INVALID_CURRENT_PASSWORD;
     }
 
     const values = _.pick(inputs, ['email']);
 
     user = await sails.helpers
       .updateUser(user, values, this.req)
-      .intercept('conflict', () => Errors.USER_EXIST);
+      .intercept('emailAlreadyInUse', () => Errors.EMAIL_ALREADY_IN_USE);
 
     if (!user) {
       throw Errors.USER_NOT_FOUND;

server/api/controllers/users/update-password.js

@@ -2,10 +2,10 @@ const bcrypt = require('bcrypt');
 
 const Errors = {
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
-  CURRENT_PASSWORD_NOT_VALID: {
-    forbidden: 'Current password is not valid',
+  INVALID_CURRENT_PASSWORD: {
+    invalidCurrentPassword: 'Invalid current password',
   },
 };
 
@@ -27,10 +27,10 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    userNotFound: {
       responseType: 'notFound',
     },
-    forbidden: {
+    invalidCurrentPassword: {
       responseType: 'forbidden',
     },
   },
@@ -40,7 +40,7 @@ module.exports = {
 
     if (inputs.id === currentUser.id) {
       if (!inputs.currentPassword) {
-        throw Errors.CURRENT_PASSWORD_NOT_VALID;
+        throw Errors.INVALID_CURRENT_PASSWORD;
       }
     } else if (!currentUser.isAdmin) {
       throw Errors.USER_NOT_FOUND; // Forbidden
@@ -56,7 +56,7 @@ module.exports = {
       inputs.id === currentUser.id &&
       !bcrypt.compareSync(inputs.currentPassword, user.password)
     ) {
-      throw Errors.CURRENT_PASSWORD_NOT_VALID;
+      throw Errors.INVALID_CURRENT_PASSWORD;
     }
 
     const values = _.pick(inputs, ['password']);

server/api/controllers/users/update-username.js

@@ -0,0 +1,85 @@
+const bcrypt = require('bcrypt');
+
+const Errors = {
+  USER_NOT_FOUND: {
+    userNotFound: 'User not found',
+  },
+  INVALID_CURRENT_PASSWORD: {
+    invalidCurrentPassword: 'Invalid current password',
+  },
+  USERNAME_ALREADY_IN_USE: {
+    usernameAlreadyInUse: 'Username already in use',
+  },
+};
+
+module.exports = {
+  inputs: {
+    id: {
+      type: 'string',
+      regex: /^[0-9]+$/,
+      required: true,
+    },
+    username: {
+      isNotEmptyString: true,
+      minLength: 3,
+      maxLength: 16,
+      regex: /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/,
+      allowNull: true,
+    },
+    currentPassword: {
+      type: 'string',
+      isNotEmptyString: true,
+    },
+  },
+
+  exits: {
+    userNotFound: {
+      responseType: 'notFound',
+    },
+    invalidCurrentPassword: {
+      responseType: 'forbidden',
+    },
+    usernameAlreadyInUse: {
+      responseType: 'conflict',
+    },
+  },
+
+  async fn(inputs, exits) {
+    const { currentUser } = this.req;
+
+    if (inputs.id === currentUser.id) {
+      if (!inputs.currentPassword) {
+        throw Errors.INVALID_CURRENT_PASSWORD;
+      }
+    } else if (!currentUser.isAdmin) {
+      throw Errors.USER_NOT_FOUND; // Forbidden
+    }
+
+    let user = await sails.helpers.getUser(inputs.id);
+
+    if (!user) {
+      throw Errors.USER_NOT_FOUND;
+    }
+
+    if (
+      inputs.id === currentUser.id &&
+      !bcrypt.compareSync(inputs.currentPassword, user.password)
+    ) {
+      throw Errors.INVALID_CURRENT_PASSWORD;
+    }
+
+    const values = _.pick(inputs, ['username']);
+
+    user = await sails.helpers
+      .updateUser(user, values, this.req)
+      .intercept('usernameAlreadyInUse', () => Errors.USERNAME_ALREADY_IN_USE);
+
+    if (!user) {
+      throw Errors.USER_NOT_FOUND;
+    }
+
+    return exits.success({
+      item: user.username,
+    });
+  },
+};

server/api/controllers/users/update.js

@@ -1,6 +1,6 @@
 const Errors = {
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
 };
 
@@ -20,12 +20,12 @@ module.exports = {
     },
     avatar: {
       type: 'json',
-      custom: value => _.isNull(value),
+      custom: (value) => _.isNull(value),
     },
   },
 
   exits: {
-    notFound: {
+    userNotFound: {
       responseType: 'notFound',
     },
   },

server/api/controllers/users/upload-avatar.js

@@ -7,7 +7,7 @@ const sharp = require('sharp');
 
 const Errors = {
   USER_NOT_FOUND: {
-    notFound: 'User is not found',
+    userNotFound: 'User not found',
   },
 };
 
@@ -32,9 +32,7 @@ const createReceiver = () => {
     }
     firstFileHandled = true;
 
-    const resize = sharp()
-      .resize(36, 36)
-      .jpeg();
+    const resize = sharp().resize(36, 36).jpeg();
 
     const transform = new stream.Transform({
       transform(chunk, streamEncoding, callback) {
@@ -71,10 +69,10 @@ module.exports = {
   },
 
   exits: {
-    notFound: {
+    userNotFound: {
       responseType: 'notFound',
     },
-    unprocessableEntity: {
+    uploadError: {
       responseType: 'unprocessableEntity',
     },
   },
@@ -97,11 +95,11 @@ module.exports = {
 
     this.req.file('file').upload(createReceiver(), async (error, files) => {
       if (error) {
-        return exits.unprocessableEntity(error.message);
+        return exits.uploadError(error.message);
       }
 
       if (files.length === 0) {
-        return exits.unprocessableEntity('No file was uploaded');
+        return exits.uploadError('No file was uploaded');
       }
 
       user = await sails.helpers.updateUser(