Skip to content

[FIX] Batch server deletion on logout #1382

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
diegolmello merged 2 commits into from
Nov 13, 2019
Merged

[FIX] Batch server deletion on logout #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efaefa9
[FIX] Batch server deletion on logout
diegolmello Nov 13, 2019
33cce23
Merge branch 'develop' into fix.remove-server-logout
diegolmello Nov 13, 2019
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
9 changes: 7 additions & 2 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,13 @@ const RocketChat = {
const serversDB = database.servers;
await serversDB.action(async() => {
const usersCollection = serversDB.collections.get('users');
const user = await usersCollection.find(userId);
await user.destroyPermanently();
const userRecord = await usersCollection.find(userId);
const serverCollection = serversDB.collections.get('servers');
const serverRecord = await serverCollection.find(server);
await serversDB.batch(
userRecord.prepareDestroyPermanently(),
serverRecord.prepareDestroyPermanently()
);
});
} catch (error) {
// Do nothing
Expand Down
9 changes: 1 addition & 8 deletions app/sagas/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,9 @@ const handleLogout = function* handleLogout() {
const serversDB = database.servers;
// all servers
const serversCollection = serversDB.collections.get('servers');

// filter logging out server and delete it
yield serversDB.action(async() => {
const serverRecord = await serversCollection.find(server);
await serverRecord.destroyPermanently();
});

const servers = yield serversCollection.query().fetch();

// see if there's other logged in servers and selects first one
// see if there're other logged in servers and selects first one
if (servers.length > 0) {
const newServer = servers[0].id;
const token = yield RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ newServer }`);
Expand Down