Skip to content

Regression: Add call to eraseRoom method #21392

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
sampaiodiego merged 3 commits into from
Mar 31, 2021
Merged

Regression: Add call to eraseRoom method #21392

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b857860
Add call to eraseRoom method
matheusbsilva137 Mar 31, 2021
0671c7a
Merge branch 'develop' into teams-delete-subscriptions
matheusbsilva137 Mar 31, 2021
f9237ab
Add call to eraseRoom in roomsToRemove elements
matheusbsilva137 Mar 31, 2021
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
11 changes: 7 additions & 4 deletions app/api/server/v1/teams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Meteor } from 'meteor/meteor';
import { Promise } from 'meteor/promise';

import { API } from '../api';
import { Team } from '../../../../server/sdk';
import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/server';
import { Rooms, Subscriptions } from '../../../models/server';
import { Subscriptions } from '../../../models/server';

API.v1.addRoute('teams.list', { authRequired: true }, {
get() {
Expand Down Expand Up @@ -291,14 +292,16 @@ API.v1.addRoute('teams.delete', { authRequired: true }, {
return API.v1.failure('Team not found.');
}

const rooms = Promise.await(Team.getMatchingTeamRooms(team._id, roomsToRemove));
const rooms: string[] = Promise.await(Team.getMatchingTeamRooms(team._id, roomsToRemove));

// Remove the team's main room
Rooms.removeById(team.roomId);
Meteor.call('eraseRoom', team.roomId);

// If we got a list of rooms to delete along with the team, remove them first
if (rooms.length) {
Rooms.removeByIds(rooms);
rooms.forEach((room) => {
Meteor.call('eraseRoom', room);
});
}

// Move every other room back to the workspace
Expand Down