diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2018-06-11 16:02:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 16:02:00 +0100 |
| commit | 187a546bffd08e2a8c66761746001b36b93a90e4 (patch) | |
| tree | 62c9be434967d4a555341ec47ac802a05bfdd07d /synapse/rest | |
| parent | fix idiotic typo in state res (diff) | |
| parent | pep8 (diff) | |
| download | synapse-187a546bffd08e2a8c66761746001b36b93a90e4.tar.xz | |
Merge pull request #3276 from matrix-org/dbkr/unbind
Remove email addresses / phone numbers from ID servers when they're removed from synapse
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 30523995af..0291fba9e7 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -381,9 +381,16 @@ class ThreepidDeleteRestServlet(RestServlet): requester = yield self.auth.get_user_by_req(request) user_id = requester.user.to_string() - yield self.auth_handler.delete_threepid( - user_id, body['medium'], body['address'] - ) + try: + yield self.auth_handler.delete_threepid( + user_id, body['medium'], body['address'] + ) + except Exception: + # NB. This endpoint should succeed if there is nothing to + # delete, so it should only throw if something is wrong + # that we ought to care about. + logger.exception("Failed to remove threepid") + raise SynapseError(500, "Failed to remove threepid") defer.returnValue((200, {})) |