fix: move member organizations to user metadata (#416)

* fix: move member organizations to user metadata

* fix: fix tests

* fix: added parse member data

* fix: fix lint error

* fix: fix members invite action

* fix: fix invite test

Author: BrRenat

src/actions/organization/delete.js

@@ -8,7 +8,7 @@ const {
   ORGANIZATIONS_METADATA,
   ORGANIZATIONS_MEMBERS,
   ORGANIZATIONS_NAME_TO_ID,
-  USERS_ORGANIZATIONS,
+  USERS_METADATA,
   ORGANIZATIONS_INDEX,
   ORGANIZATIONS_NAME_FIELD,
 } = require('../../constants');
@@ -41,7 +41,7 @@ async function deleteOrganization({ params }) {
   if (organizationMembersIds) {
     organizationMembersIds.forEach((memberId) => {
       pipeline.del(memberId);
-      pipeline.hdel(redisKey(memberId.split('!').pop(), USERS_ORGANIZATIONS), organizationId);
+      pipeline.hdel(redisKey(memberId.split('!').pop(), USERS_METADATA, audience), organizationId);
     });
     pipeline.del(organizationMembersListKey);
   }

src/actions/organization/invites/accept.js

@@ -7,6 +7,7 @@ const {
   ErrorInvitationExpiredOrUsed,
 } = require('../../../constants');
 const redisKey = require('../../../utils/key.js');
+const getUserId = require('../../../utils/userData/getUserId');
 
 /**
  * Token verification function, on top of it returns extra metadata
@@ -43,7 +44,8 @@ async function acceptOrganizationMember({ params }) {
   const { redis } = this;
   const { username, organizationId } = params;
 
-  const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, username);
+  const userId = await getUserId.call(this, username);
+  const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, userId);
   const userInOrganization = await redis.hget(memberKey, 'username');
   if (!userInOrganization) {
     throw ErrorUserNotMember;

src/actions/organization/invites/send.js

@@ -10,6 +10,7 @@ const {
   ORGANIZATIONS_ID_FIELD,
   USERS_ACTION_ORGANIZATION_INVITE,
 } = require('../../../constants');
+const getUserId = require('../../../utils/userData/getUserId');
 
 /**
  * @api {amqp} <prefix>.invites.send Send invitation
@@ -31,7 +32,8 @@ async function sendOrganizationInvite({ params }) {
   const service = this;
   const { member, organizationId } = params;
 
-  const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, member.email);
+  const userId = await getUserId.call(this, member.email);
+  const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, userId);
   const userInOrganization = await service.redis.hget(memberKey, 'username');
   if (!userInOrganization) {
     throw ErrorUserNotMember;

src/actions/organization/members/permission.js

@@ -1,7 +1,11 @@
 const { ActionTransport } = require('@microfleet/core');
+const union = require('lodash/union');
+const difference = require('lodash/difference');
 const { checkOrganizationExists } = require('../../../utils/organization');
 const redisKey = require('../../../utils/key');
-const { ErrorUserNotMember, ORGANIZATIONS_MEMBERS } = require('../../../constants');
+const handlePipeline = require('../../../utils/pipelineError');
+const getUserId = require('../../../utils/userData/getUserId');
+const { ErrorUserNotMember, USERS_METADATA, ORGANIZATIONS_MEMBERS } = require('../../../constants');
 
 /**
  * @api {amqp} <prefix>.members.permission Sets permission levels for a given user
@@ -16,35 +20,33 @@ const { ErrorUserNotMember, ORGANIZATIONS_MEMBERS } = require('../../../constant
  * @apiParam (Payload) {Object} permission - metadata operations,
  *   supports `$set string[]`, `$remove string[]`
  */
-async function addOrganizationMember({ params }) {
-  const service = this;
-  const { redis } = service;
+async function setOrganizationMemberPermission({ params }) {
+  const { redis, config } = this;
   const { organizationId, username, permission } = params;
+  const { audience } = config.organizations;
 
-  const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, username);
-  const userInOrganization = await redis.hget(memberKey, 'username');
-  if (!userInOrganization) {
+  const userId = await getUserId.call(this, username);
+  const memberMetadataKey = redisKey(userId, USERS_METADATA, audience);
+  const userPermissions = await redis.hget(memberMetadataKey, organizationId);
+  if (!userPermissions) {
     throw ErrorUserNotMember;
   }
 
-  const currentPermissions = await redis.hget(memberKey, 'permissions');
-  let permissions = currentPermissions === '' ? [] : currentPermissions.split(',');
+  let permissions = userPermissions.length ? [] : JSON.parse(userPermissions);
 
   const { $set = [], $remove = [] } = permission;
 
-  for (const permissionItem of $set) {
-    if (!permissions.includes(permissionItem)) {
-      permissions.push(permissionItem);
-    }
-  }
+  permissions = union(permissions, $set);
+  permissions = difference(permissions, $remove);
+  permissions = JSON.stringify(permissions);
 
-  for (const permissionItem of $remove) {
-    permissions = permissions.filter(item => item !== permissionItem);
-  }
+  const pipeline = redis.pipeline();
+  pipeline.hset(memberMetadataKey, organizationId, permissions);
+  pipeline.hset(redisKey(organizationId, ORGANIZATIONS_MEMBERS, userId), 'permissions', permissions);
 
-  return redis.hset(memberKey, 'permissions', permissions.join(','));
+  return pipeline.exec().then(handlePipeline);
 }
 
-addOrganizationMember.allowed = checkOrganizationExists;
-addOrganizationMember.transports = [ActionTransport.amqp, ActionTransport.internal];
-module.exports = addOrganizationMember;
+setOrganizationMemberPermission.allowed = checkOrganizationExists;
+setOrganizationMemberPermission.transports = [ActionTransport.amqp, ActionTransport.internal];
+module.exports = setOrganizationMemberPermission;

src/actions/organization/members/remove.js

@@ -1,10 +1,11 @@
 const { ActionTransport } = require('@microfleet/core');
 const redisKey = require('../../../utils/key');
+const getUserId = require('../../../utils/userData/getUserId');
 const handlePipeline = require('../../../utils/pipelineError');
 const { checkOrganizationExists } = require('../../../utils/organization');
 const {
   ORGANIZATIONS_MEMBERS,
-  USERS_ORGANIZATIONS,
+  USERS_METADATA,
   ErrorUserNotMember,
 } = require('../../../constants');
 
@@ -20,19 +21,21 @@ const {
  * @apiParam (Payload) {String} username - member email.
  */
 async function removeMember({ params }) {
-  const { redis } = this;
+  const { redis, config } = this;
   const { organizationId, username } = params;
+  const { audience } = config.organizations;
 
-  const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, username);
-  const userInOrganization = await redis.hget(memberKey, 'username');
+  const userId = await getUserId.call(this, username);
+  const memberKey = redisKey(userId, USERS_METADATA, audience);
+  const userInOrganization = await redis.hget(memberKey, organizationId);
   if (!userInOrganization) {
     throw ErrorUserNotMember;
   }
 
   const pipeline = redis.pipeline();
   pipeline.del(memberKey);
-  pipeline.hdel(redisKey(username, USERS_ORGANIZATIONS), organizationId);
   pipeline.zrem(redisKey(organizationId, ORGANIZATIONS_MEMBERS), memberKey);
+  pipeline.hdel(memberKey, organizationId);
 
   return pipeline.exec().then(handlePipeline);
 }

src/utils/organization/addOrganizationMembers.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-mixed-operators */
 const Promise = require('bluebird');
+const mapValues = require('lodash/mapValues');
 const redisKey = require('../key.js');
 const getUserId = require('../userData/getUserId');
 const sendInviteMail = require('./sendInviteMail');
@@ -8,21 +9,23 @@ const registerOrganizationMembers = require('./registerOrganizationMembers');
 const handlePipeline = require('../pipelineError.js');
 const {
   ORGANIZATIONS_MEMBERS,
-  USERS_ORGANIZATIONS,
+  USERS_METADATA,
   ORGANIZATIONS_NAME_FIELD,
   USERS_ACTION_ORGANIZATION_INVITE,
   USERS_ACTION_ORGANIZATION_REGISTER,
   ORGANIZATIONS_ID_FIELD,
 } = require('../../constants.js');
 
+const JSONStringify = data => JSON.stringify(data);
+
 /**
  * Updates metadata on a organization object
  * @param  {Object} opts
  * @return {Promise}
  */
 async function addOrganizationMembers(opts) {
   const { redis } = this;
-  const { organizationId, members } = opts;
+  const { organizationId, members, audience } = opts;
 
   const registeredMembers = [];
   const notRegisteredMembers = [];
@@ -42,15 +45,16 @@ async function addOrganizationMembers(opts) {
   const membersKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS);
   const organizationMembers = registeredMembers.concat(createdMembers);
   organizationMembers.forEach(({ password, ...member }) => {
-    const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, member.email);
-    const memberOrganizations = redisKey(member.email, USERS_ORGANIZATIONS);
+    const memberKey = redisKey(organizationId, ORGANIZATIONS_MEMBERS, member.id);
+    const memberOrganizations = redisKey(member.id, USERS_METADATA, audience);
     member.username = member.email;
     member.invited = Date.now();
     member.accepted = password ? Date.now() : null;
     member.permissions = member.permissions || [];
-    pipe.hmset(memberKey, member);
-    pipe.hset(memberOrganizations, organizationId, JSON.stringify(member.permissions));
-    pipe.zadd(membersKey, member.invited, memberKey);
+    const stringifyMember = mapValues(member, JSONStringify);
+    pipe.hmset(memberKey, stringifyMember);
+    pipe.hset(memberOrganizations, organizationId, stringifyMember.permissions);
+    pipe.zadd(membersKey, stringifyMember.invited, memberKey);
   });
 
   await pipe.exec().then(handlePipeline);

src/utils/organization/getOrganizationMembers.js

@@ -1,7 +1,10 @@
 const Promise = require('bluebird');
+const mapValues = require('lodash/mapValues');
 const { ORGANIZATIONS_MEMBERS } = require('../../constants');
 const redisKey = require('../key');
 
+const JSONParse = d => JSON.parse(d);
+
 async function getOrganizationMembers(organizationId) {
   const { redis } = this;
   const organizationMembersIds = await redis.zrange(redisKey(organizationId, ORGANIZATIONS_MEMBERS), 0, -1);
@@ -11,11 +14,7 @@ async function getOrganizationMembers(organizationId) {
   }
 
   const members = await Promise.all(organizationMembersJobs);
-
-  return members.map(member => ({
-    ...member,
-    permissions: member.permissions === '' ? [] : member.permissions.split(','),
-  }));
+  return members.map(member => mapValues(member, JSONParse));
 }
 
 module.exports = getOrganizationMembers;

src/utils/setOrganizationMetadata.js

@@ -32,7 +32,7 @@ async function setOrganizationMetadata(opts) {
     }
 
     metaOps.forEach((meta, idx) => handleAudience(pipe, keys[idx], meta));
-    await pipe.exec().then(handlePipeline);
+    return pipe.exec().then(handlePipeline);
   }
 
   return true;

test/suites/organization/invites/accept.js

@@ -51,7 +51,7 @@ describe('#accept invite organization', function registerSuite() {
       });
   });
 
-  it('must return user not organization member error', async function test() {
+  it('must return user not found error', async function test() {
     const acceptOpts = {
       organizationId: this.organization.id,
       username: faker.internet.email(),
@@ -63,7 +63,7 @@ describe('#accept invite organization', function registerSuite() {
       .then(inspectPromise(false))
       .then((response) => {
         assert.equal(response.name, 'HttpStatusError');
-        assert.equal(response.message, 'username not member of organization');
+        assert.ok(response.message.includes('does not exist'));
       });
   });
 });