Added intial group remove member tests

test/api/v3/integration/groups/POST-groups_id_removeMember.test.js

@@ -0,0 +1,119 @@
+import {
+  generateUser,
+  createAndPopulateGroup,
+  translate as t,
+} from '../../../../helpers/api-v3-integration.helper';
+
+describe('POST /groups/:groupId/removeMember/:memberId', () => {
+  let leader;
+  let invitedUser;
+  let guild;
+  let member;
+  let member2;
+
+  before(async () => {
+    let { group, groupLeader, invitees, members } = await createAndPopulateGroup({
+      groupDetails: {
+        name: 'Test Guild',
+        type: 'guild',
+        privacy: 'private',
+      },
+      invites: 1,
+      members: 2,
+    });
+
+    guild = group;
+    leader = groupLeader;
+    invitedUser = invitees[0];
+    member = members[0];
+    member2 = members[1];
+  });
+
+  context('All Groups', () => {
+    it('returns an error when user is not member of the group', async () => {
+      let nonMember = await generateUser();
+
+      expect(nonMember.post(`/groups/${guild._id}/removeMember/${member._id}`))
+        .to.eventually.be.rejected.and.eql({
+          code: 401,
+          type: 'NotAuthorized',
+          message: t('onlyLeaderCanRemoveMember'),
+        });
+    });
+
+    it('returns an error when user is a non-leader member of a group', async () => {
+      expect(member2.post(`/groups/${guild._id}/removeMember/${member._id}`))
+        .to.eventually.be.rejected.and.eql({
+          code: 401,
+          type: 'NotAuthorized',
+          message: t('onlyLeaderCanRemoveMember'),
+        });
+    });
+
+    it('does not allow leader to remove themselves', async () => {
+      expect(leader.post(`/groups/${guild._id}/removeMember/${leader._id}`))
+        .to.eventually.be.rejected.and.eql({
+          code: 401,
+          text: t('messageGroupCannotRemoveSelf'),
+        });
+    });
+  });
+
+  context('Guilds', () => {
+    it('can remove other members', async () => {
+      await leader.post(`/groups/${guild._id}/removeMember/${member._id}`);
+
+      let memberRemoved = await member.get('/user');
+
+      expect(_.findIndex(memberRemoved.guilds, {id: guild._id})).eql(-1);
+    });
+
+    it('can remove other invites', async () => {
+      await leader.post(`/groups/${guild._id}/removeMember/${invitedUser._id}`);
+
+      let invitedUserWithoutInvite = await invitedUser.get('/user');
+
+      expect(_.findIndex(invitedUserWithoutInvite.invitations.guilds, {id: guild._id})).eql(-1);
+    });
+  });
+
+  context('Party', () => {
+    let party;
+    let partyleader;
+    let partyInvitedUser;
+    let partyMember;
+
+    before(async () => {
+      let { group, groupLeader, invitees, members } = await createAndPopulateGroup({
+        groupDetails: {
+          name: 'Test Party',
+          type: 'party',
+          privacy: 'private',
+        },
+        invites: 1,
+        members: 1,
+      });
+
+      party = group;
+      partyleader = groupLeader;
+      partyInvitedUser = invitees[0];
+      partyMember = members[0];
+    });
+
+    it('can remove other members', async () => {
+      await partyleader.post(`/groups/${party._id}/removeMember/${partyMember._id}`);
+
+      let memberRemoved = await partyMember.get('/user');
+
+      expect(memberRemoved.party._id).eql(undefined);
+    });
+
+    it('can remove other invites', async () => {
+      await partyleader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`);
+
+      let invitedUserWithoutInvite = await partyInvitedUser.get('/user');
+
+      expect(_.findIndex(invitedUserWithoutInvite.invitations.party, {id: party._id})).eql(-1);
+    });
+  });
+});

website/src/controllers/api-v3/groups.js

@@ -347,15 +347,27 @@ api.removeGroupMember = {
     let group = await Group.getGroup(user, req.params.groupId, '-chat'); // Do not fetch chat
     if (!group) throw new NotFound(res.t('groupNotFound'));
 
-    let uuid = req.query.memberId;
+    let uuid = req.params.memberId;
 
     if (group.leader !== user._id) throw new NotAuthorized(res.t('onlyLeaderCanRemoveMember'));
     if (user._id === uuid) throw new NotAuthorized(res.t('memberCannotRemoveYourself'));
 
     let member = await User.findOne({_id: uuid}).select('party guilds invitations newMessages').exec();
+
     // We're removing the user from a guild or a party? is the user invited only?
-    let isInGroup = member.party._id === group._id ? 'party' : member.guilds.indexOf(group._id) !== 1 ? 'guild' : undefined; // eslint-disable-line no-nested-ternary
-    let isInvited = member.invitations.party.id === group._id ? 'party' : _.findIndex(member.invitations.guilds, {id: group._id}) !== 1 ? 'guild' : undefined; // eslint-disable-line no-nested-ternary
+    let isInGroup;
+    if (member.party._id === group._id) {
+      isInGroup = 'party';
+    } else if (member.guilds.indexOf(group._id) !== -1) {
+      isInGroup = 'guild';
+    }
+
+    let isInvited;
+    if (member.invitations.party && member.invitations.party.id === group._id) {
+      isInvited = 'party';
+    } else if (_.findIndex(member.invitations.guilds, {id: group._id}) !== -1) {
+      isInvited = 'guild';
+    }
 
     if (isInGroup) {
       group.memberCount -= 1;
@@ -371,7 +383,9 @@ api.removeGroupMember = {
       if (isInGroup === 'guild') _.pull(member.guilds, group._id);
       if (isInGroup === 'party') member.party._id = undefined; // TODO remove quest information too?
 
-      member.newMessages.group._id = undefined;
+      if (member.newMessages.group) {
+        member.newMessages.group._id = undefined;
+      }
 
       if (group.quest && group.quest.active && group.quest.leader === member._id) {
         member.items.quests[group.quest.key] += 1; // TODO why this?