refactored copilotAndAbove permission "middleware" to use general uti…

…l.hasPermission method to check permission instead of reimplementing logic

src/permissions/constants.js

@@ -0,0 +1,36 @@
+/**
+ * Definitions of permissions which could be used with util methods
+ * `util.hasPermission` or `util.hasPermissionForProject`.
+ *
+ * We can define permission using two logics:
+ * 1. **WHAT** can be done with such a permission. Such constants may have names like:
+ *    - `VIEW_PROJECT`
+ *    - `EDIT_MILESTONE`
+ *    - `DELETE_WORK`
+ *    and os on.
+ * 2. **WHO** can do actions with such a permission. Such constants **MUST** start from the prefix `ROLES_`, examples:
+ *    - `ROLES_COPILOT_AND_ABOVE`
+ *    - `ROLES_PROJECT_MEMBERS`
+ *    - `ROLES_ADMINS`
+ */
+import {
+  PROJECT_MEMBER_ROLE,
+  ADMIN_ROLES,
+} from '../constants';
+
+export const PERMISSION = { // eslint-disable-line import/prefer-default-export
+  /**
+   * Permissions defined by logic: **WHO** can do actions with such a permission.
+   */
+  ROLES_COPILOT_AND_ABOVE: {
+    topcoderRoles: ADMIN_ROLES,
+    projectRoles: [
+      PROJECT_MEMBER_ROLE.MANAGER,
+      PROJECT_MEMBER_ROLE.COPILOT,
+    ],
+  },
+  /**
+   * Permissions defined by logic: **WHAT** can be done with such a permission.
+   */
+};
+

src/permissions/copilotAndAbove.js

@@ -1,11 +1,7 @@
 import _ from 'lodash';
 import util from '../util';
-import {
-  PROJECT_MEMBER_ROLE,
-  ADMIN_ROLES,
-} from '../constants';
 import models from '../models';
-
+import { PERMISSION } from './constants';
 
 /**
  * Permission to allow copilot and above roles to perform certain operations
@@ -16,27 +12,17 @@ import models from '../models';
  */
 module.exports = req => new Promise((resolve, reject) => {
   const projectId = _.parseInt(req.params.projectId);
-  const isAdmin = util.hasRoles(req, ADMIN_ROLES);
-
-  if (isAdmin) {
-    return resolve(true);
-  }
 
   return models.ProjectMember.getActiveProjectMembers(projectId)
     .then((members) => {
+      const hasPermission = util.hasPermission(PERMISSION.ROLES_COPILOT_AND_ABOVE, req.authUser, members);
+
+      // TODO should we really do this?
+      // if no, we can replace `getActiveProjectMembers + util.hasPermission` with one `util.hasPermissionForProject`
       req.context = req.context || {};
       req.context.currentProjectMembers = members;
-      const validMemberProjectRoles = [
-        PROJECT_MEMBER_ROLE.MANAGER,
-        PROJECT_MEMBER_ROLE.COPILOT,
-      ];
-      // check if the copilot or manager has access to this project
-      const isMember = _.some(
-        members,
-m => m.userId === req.authUser.userId && validMemberProjectRoles.includes(m.role),
-      );
 
-      if (!isMember) {
+      if (!hasPermission) {
         // the copilot or manager is not a registered project member
         return reject(new Error('You do not have permissions to perform this action'));
       }