Skip to content

Regression: Delete team member from related team's rooms #21401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 1 commit into from
Apr 1, 2021
Merged

Regression: Delete team member from related team's rooms #21401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions app/api/server/v1/teams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { API } from '../api';
import { Team } from '../../../../server/sdk';
import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/server';
import { Subscriptions } from '../../../models/server';
import { removeUserFromRoom } from '../../../lib/server/functions/removeUserFromRoom';

API.v1.addRoute('teams.list', { authRequired: true }, {
get() {
Expand Down Expand Up @@ -261,7 +262,7 @@ API.v1.addRoute('teams.updateMember', { authRequired: true }, {

API.v1.addRoute('teams.removeMembers', { authRequired: true }, {
post() {
const { teamId, teamName, members, rooms } = this.bodyParams;
const { teamId, teamName, members } = this.bodyParams;

const team = teamId ? Promise.await(Team.getOneById(teamId)) : Promise.await(Team.getOneByName(teamName));
if (!team) {
Expand All @@ -274,8 +275,27 @@ API.v1.addRoute('teams.removeMembers', { authRequired: true }, {

Promise.await(Team.removeMembers(team._id, members));

return API.v1.success();
},
});

API.v1.addRoute('teams.removeMember', { authRequired: true }, {
post() {
const { teamId, teamName, uid, rooms } = this.bodyParams;

const team = teamId ? Promise.await(Team.getOneById(teamId)) : Promise.await(Team.getOneByName(teamName));
if (!team) {
return API.v1.failure('team-does-not-exist');
}

if (!hasAtLeastOnePermission(this.userId, ['edit-team-member'], team.roomId)) {
return API.v1.unauthorized();
}

Promise.await(Team.removeMembers(team._id, [{ userId: uid }]));

if (rooms?.length) {
Subscriptions.removeByRoomIdsAndUserId(rooms, this.userId);
rooms.forEach((rid: string) => removeUserFromRoom(rid, { _id: uid }));
}

return API.v1.success();
Expand Down
6 changes: 3 additions & 3 deletions client/views/room/hooks/useUserInfoActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,18 +289,18 @@ export const useUserInfoActions = (user = {}, rid, reload) => {
};
}, [closeModal, dispatchToastMessage, isMuted, muteFn, rid, roomCanMute, roomName, setModal, t, user.username, userCanMute]);

const removeFromTeam = useEndpointActionExperimental('POST', 'teams.removeMembers', t('User_has_been_removed_from_team'));
const removeFromTeam = useEndpointActionExperimental('POST', 'teams.removeMember', t('User_has_been_removed_from_team'));

const removeUserAction = useEndpointActionExperimental('POST', `${ endpointPrefix }.kick`, t('User_has_been_removed_from_s', roomName));
const removeUserOptionAction = useMutableCallback(() => {
if (room.teamMain && room.teamId) {
return setModal(<RemoveUsersModal
teamId={room?.teamId}
userId={user?._id}
userId={uid}
onClose={closeModal}
onCancel={closeModal}
onConfirm={async (rooms) => {
await removeFromTeam({ teamId: room.teamId, members: [{ userId: user._id }], rooms });
await removeFromTeam({ teamId: room.teamId, uid, rooms: Object.keys(rooms) });
closeModal();
reload && reload();
}}
Expand Down