diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-09-05 14:31:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-05 14:31:22 +0100 |
commit | a0d294c306d2e345bb53078791858c41f3101424 (patch) | |
tree | 63a954aa623f6ffa20c1e0438585845fd3526bc3 /synapse/res | |
parent | Fix opentracing contexts missing from outbound replication requests (#5982) (diff) | |
download | synapse-a0d294c306d2e345bb53078791858c41f3101424.tar.xz |
Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)
Diffstat (limited to '')
-rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index a4be518006..e9cc953bdd 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -542,15 +542,16 @@ class ThreepidRestServlet(RestServlet): def on_POST(self, request): body = parse_json_object_from_request(request) - threePidCreds = body.get("threePidCreds") - threePidCreds = body.get("three_pid_creds", threePidCreds) - if threePidCreds is None: - raise SynapseError(400, "Missing param", Codes.MISSING_PARAM) + threepid_creds = body.get("threePidCreds") or body.get("three_pid_creds") + if threepid_creds is None: + raise SynapseError( + 400, "Missing param three_pid_creds", Codes.MISSING_PARAM + ) requester = yield self.auth.get_user_by_req(request) user_id = requester.user.to_string() - threepid = yield self.identity_handler.threepid_from_creds(threePidCreds) + threepid = yield self.identity_handler.threepid_from_creds(threepid_creds) if not threepid: raise SynapseError(400, "Failed to auth 3pid", Codes.THREEPID_AUTH_FAILED) @@ -566,7 +567,7 @@ class ThreepidRestServlet(RestServlet): if "bind" in body and body["bind"]: logger.debug("Binding threepid %s to %s", threepid, user_id) - yield self.identity_handler.bind_threepid(threePidCreds, user_id) + yield self.identity_handler.bind_threepid(threepid_creds, user_id) return 200, {} |