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 element-hq/element-web#10986
matrix-org · Nov 14, 2019 · 2ee217f · 2ee217f
1 parent 4258a82
commit 2ee217f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
@@ -844,8 +844,11 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
  try {
  cli.deactivateSynapseUser(user.userId);
  } catch (err) {
+ console.error("Failed to deactivate user");
+ console.error(err);
+
  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'),
  description: ((err && err.message) ? err.message : _t("Operation failed")),
  });

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
@@ -550,7 +550,16 @@ module.exports = createReactClass({
  danger: true,
  onFinished: (accepted) => {
  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")),
+ });
+ });
  },
  });
  },