diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-08 11:54:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-08 12:06:18 +0100 |
| commit | 360ba89c50ea5cbf824e54f04d536b89b57f3304 (patch) | |
| tree | 9da5453fed0fcd6b2ab2b249030c1428fb6eaf54 /synapse/rest/client/v1 | |
| parent | Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_met... (diff) | |
| download | synapse-360ba89c50ea5cbf824e54f04d536b89b57f3304.tar.xz | |
Don't fail requests to unbind 3pids for non supporting ID servers
Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index 80d625eecc..ad536ab570 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -391,10 +391,17 @@ class DeactivateAccountRestServlet(ClientV1RestServlet): if not is_admin: raise AuthError(403, "You are not a server admin") - yield self._deactivate_account_handler.deactivate_account( + result = yield self._deactivate_account_handler.deactivate_account( target_user_id, erase, ) - defer.returnValue((200, {})) + if result: + id_server_unbind_result = "success" + else: + id_server_unbind_result = "no-support" + + defer.returnValue((200, { + "id_server_unbind_result": id_server_unbind_result, + })) class ShutdownRoomRestServlet(ClientV1RestServlet): |