Merge pull request #353 from hms-dbmi-cellenics/revert-346-cellsets-e…

…ndpoint-v2

Revert "[BIOMAGE-1878] - Add v2 cellsets endpoints"

codecov.yaml

@@ -11,7 +11,7 @@ coverage:
       default:
         target: auto
         # don't allow new commits to decrease coverage
-        threshold: 0%
+        threshold: 1%
 
     patch:                    # measuring the coverage of new changes
       default:

src/api.v2/controllers/__mocks__/accessController.js

@@ -1,9 +1,5 @@
-const mockGetUserAccess = jest.fn();
-const mockInviteUser = jest.fn();
-const mockRevokeAccess = jest.fn();
+const mockGetExperimentUsers = jest.fn();
 
 module.exports = {
-  getUserAccess: mockGetUserAccess,
-  inviteUser: mockInviteUser,
-  revokeAccess: mockRevokeAccess,
+  getExperimentUsers: mockGetExperimentUsers,
 };

src/api.v2/controllers/accessController.js

@@ -1,51 +1,19 @@
-const getExperimentUsers = require('../helpers/access/getExperimentUsers');
-const createUserInvite = require('../helpers/access/createUserInvite');
-const removeAccess = require('../helpers/access/removeAccess');
-
-const OK = require('../../utils/responses/OK');
+const getUserRoles = require('../helpers/access/getUserRoles');
 const getLogger = require('../../utils/getLogger');
 
 const logger = getLogger('[AccessController] - ');
 
-const getUserAccess = async (req, res) => {
+const getExperimentUsers = async (req, res) => {
   const { experimentId } = req.params;
 
   logger.log(`Fetching users for experiment ${experimentId}`);
-  const users = await getExperimentUsers(experimentId);
+  const users = await getUserRoles(experimentId);
 
   logger.log(`Users fetched for experiment ${experimentId}`);
 
   res.json(users);
 };
 
-const inviteUser = async (req, res) => {
-  const { experimentId } = req.params;
-  const {
-    userEmail, role,
-  } = req.body;
-
-  logger.log(`Inviting users to experiment ${experimentId}`);
-  await createUserInvite(experimentId, userEmail, role, req.user);
-
-  logger.log(`Users invited to experiment ${experimentId}`);
-
-  res.json(OK());
-};
-
-const revokeAccess = async (req, res) => {
-  const { experimentId } = req.params;
-  const { userEmail } = req.body;
-
-  logger.log(`Deleting user access from experiment ${experimentId}`);
-  await removeAccess(experimentId, userEmail);
-
-  logger.log(`User access deleted from experiment ${experimentId}`);
-
-  res.json(OK());
-};
-
 module.exports = {
-  getUserAccess,
-  inviteUser,
-  revokeAccess,
+  getExperimentUsers,
 };

src/api.v2/helpers/access/getExperimentUsers.js → src/api.v2/helpers/access/getUserRoles.js

@@ -1,10 +1,18 @@
-const { getAwsUserAttributesByEmail } = require('../../../utils/aws/user');
+const config = require('../../../config');
 
 const UserAccess = require('../../model/UserAccess');
 
 const AccessRole = require('../../../utils/enums/AccessRole');
 
-const getExperimentUsers = async (experimentId) => {
+const { cognitoISP } = config;
+
+const getAwsUserAttributesByEmail = async (email) => {
+  const poolId = await config.awsUserPoolIdPromise;
+  const user = await cognitoISP.adminGetUser({ UserPoolId: poolId, Username: email }).promise();
+  return user.UserAttributes;
+};
+
+const getUserRoles = async (experimentId) => {
   const userData = await new UserAccess().getExperimentUsers(experimentId);
 
   // Remove admin from user list
@@ -31,4 +39,4 @@ const getExperimentUsers = async (experimentId) => {
   return experimentUsers;
 };
 
-module.exports = getExperimentUsers;
+module.exports = getUserRoles;

src/api.v2/helpers/s3/bucketNames.js

@@ -2,7 +2,6 @@ const config = require('../../../config');
 
 const bucketNames = {
   SAMPLE_FILES: `biomage-originals-${config.clusterEnv}`,
-  CELL_SETS: `cell-sets-${config.clusterEnv}`,
 };
 
 module.exports = bucketNames;

src/api.v2/model/UserAccess.js

@@ -38,34 +38,21 @@ class UserAccess extends BasicModel {
     return experimentUsers;
   }
 
-  async addToInviteAccess(userId, experimentId, role) {
-    return await this.sql
-      .insert({ user_id: userId, experiment_id: experimentId, access_role: role })
-      .into(tableNames.INVITE_ACCESS);
-  }
-
-  async grantAccess(userId, experimentId, role) {
-    return await this.create(
-      { user_id: userId, experiment_id: experimentId, access_role: role },
-    );
-  }
-
-  async removeAccess(userId, experimentId) {
-    return await this.delete({ experiment_id: experimentId, user_id: userId });
-  }
-
   async createNewExperimentPermissions(userId, experimentId) {
     logger.log('Setting up access permissions for experiment');
 
-    // Create admin permissions
-    await this.grantAccess(config.adminSub, experimentId, AccessRole.ADMIN);
+    await this.create(
+      { user_id: config.adminSub, experiment_id: experimentId, access_role: AccessRole.ADMIN },
+    );
 
     if (userId === config.adminSub) {
       logger.log('User is the admin, so only creating admin access');
       return;
     }
 
-    await this.grantAccess(userId, experimentId, AccessRole.OWNER);
+    await this.create(
+      { user_id: userId, experiment_id: experimentId, access_role: AccessRole.OWNER },
+    );
   }
 
   async canAccessExperiment(userId, experimentId, url, method) {

src/api.v2/routes/access.js

@@ -1,22 +1,12 @@
 const {
-  getUserAccess,
-  inviteUser,
-  revokeAccess,
+  getExperimentUsers,
 } = require('../controllers/accessController');
 
 const { expressAuthorizationMiddleware } = require('../middlewares/authMiddlewares');
 
 module.exports = {
   'access#getExperimentUsers': [
     expressAuthorizationMiddleware,
-    (req, res, next) => getUserAccess(req, res).catch(next),
-  ],
-  'access#inviteUser': [
-    expressAuthorizationMiddleware,
-    (req, res, next) => inviteUser(req, res).catch(next),
-  ],
-  'access#revokeAccess': [
-    expressAuthorizationMiddleware,
-    (req, res, next) => revokeAccess(req, res).catch(next),
+    (req, res, next) => getExperimentUsers(req, res).catch(next),
   ],
 };