diff options
| author | Erik Johnston <erikj@jki.re> | 2019-04-03 11:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 11:07:09 +0100 |
| commit | 8f549c11773e0a410de3ef56ab7b6385ecda8ac5 (patch) | |
| tree | c4eb76d4a59ac05cea694cd74e2cca77ac4bcd4e /synapse/rest | |
| parent | Run black on the rest of the storage module (#4996) (diff) | |
| parent | Correctly handle id_server param (diff) | |
| download | synapse-8f549c11773e0a410de3ef56ab7b6385ecda8ac5.tar.xz | |
Merge pull request #4982 from matrix-org/erikj/msc1915
Implement MSC1915 - 3PID unbind APIs
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 37b32dd37b..ee069179f0 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -215,6 +215,7 @@ class DeactivateAccountRestServlet(RestServlet): ) result = yield self._deactivate_account_handler.deactivate_account( requester.user.to_string(), erase, + id_server=body.get("id_server"), ) if result: id_server_unbind_result = "success" @@ -363,7 +364,7 @@ class ThreepidRestServlet(RestServlet): class ThreepidDeleteRestServlet(RestServlet): - PATTERNS = client_v2_patterns("/account/3pid/delete$", releases=()) + PATTERNS = client_v2_patterns("/account/3pid/delete$") def __init__(self, hs): super(ThreepidDeleteRestServlet, self).__init__() @@ -380,7 +381,7 @@ class ThreepidDeleteRestServlet(RestServlet): try: ret = yield self.auth_handler.delete_threepid( - user_id, body['medium'], body['address'] + user_id, body['medium'], body['address'], body.get("id_server"), ) except Exception: # NB. This endpoint should succeed if there is nothing to |