OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Add better error handling to Synapse user deactivation 

Also clearly flag it as a Synapse user deactivation in the analytics, so we don't get confused.

Fixes https://github.com/vector-im/riot-web/issues/10986
pull/21833/head
Travis Ralston 2019-11-14 12:02:16 -07:00
parent 4258a824df
commit b05dabe2b7
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/right_panel/UserInfo.js
View File

@ -842,10 +842,13 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
const [accepted] = await finished; const [accepted] = await finished;
if (!accepted) return; if (!accepted) return;
try { try {
cli.deactivateSynapseUser(user.userId); await cli.deactivateSynapseUser(user.userId);
} catch (err) { } catch (err) {
console.error("Failed to deactivate user");
console.error(err);
const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog'); const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
Modal.createTrackedDialog('Failed to deactivate user', '', ErrorDialog, { Modal.createTrackedDialog('Failed to deactivate Synapse user', '', ErrorDialog, {
title: _t('Failed to deactivate user'), title: _t('Failed to deactivate user'),
description: ((err && err.message) ? err.message : _t("Operation failed")), description: ((err && err.message) ? err.message : _t("Operation failed")),
}); });

11
src/components/views/rooms/MemberInfo.js
View File

@ -550,7 +550,16 @@ module.exports = createReactClass({
danger: true, danger: true,
onFinished: (accepted) => { onFinished: (accepted) => {
if (!accepted) return; if (!accepted) return;
this.context.matrixClient.deactivateSynapseUser(this.props.member.userId); this.context.matrixClient.deactivateSynapseUser(this.props.member.userId).catch(e => {
console.error("Failed to deactivate user");
console.error(e);
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to deactivate Synapse user', '', ErrorDialog, {
title: _t('Failed to deactivate user'),
description: ((e && e.message) ? e.message : _t("Operation failed")),
});
});
}, },
}); });
}, },