diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-10 18:15:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-10 18:15:07 +0100 |
| commit | 5e9b05d7da5784ea0af5e75e6ced77c8e22c78c0 (patch) | |
| tree | 582b760730678a74ca3d99f67622cc7d5e375b5e /synapse/rest | |
| parent | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users (diff) | |
| parent | Add changelog (diff) | |
| download | synapse-5e9b05d7da5784ea0af5e75e6ced77c8e22c78c0.tar.xz | |
Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation
Use account_threepid_delegate for 3pid validation
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 785d01ea52..2ea515d2f6 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -523,7 +523,8 @@ class ThreepidRestServlet(RestServlet): requester = yield self.auth.get_user_by_req(request) user_id = requester.user.to_string() - threepid = yield self.identity_handler.threepid_from_creds(threepid_creds) + # Specify None as the identity server to retrieve it from the request body instead + threepid = yield self.identity_handler.threepid_from_creds(None, threepid_creds) if not threepid: raise SynapseError(400, "Failed to auth 3pid", Codes.THREEPID_AUTH_FAILED) |