diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-06 11:28:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-06 11:33:34 +0000 |
| commit | 2ace775d88391181365c3c6b1be5c231127edf7f (patch) | |
| tree | c74f635c4241533ed5cb9f921b3edd4ce397a0b5 /synapse/rest/client/v2_alpha/auth.py | |
| parent | Remove unused var (diff) | |
| parent | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) (diff) | |
| download | synapse-2ace775d88391181365c3c6b1be5c231127edf7f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_database_class
Diffstat (limited to 'synapse/rest/client/v2_alpha/auth.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/auth.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/synapse/rest/client/v2_alpha/auth.py b/synapse/rest/client/v2_alpha/auth.py index f21aff39e5..7a256b6ecb 100644 --- a/synapse/rest/client/v2_alpha/auth.py +++ b/synapse/rest/client/v2_alpha/auth.py @@ -15,8 +15,6 @@ import logging -from twisted.internet import defer - from synapse.api.constants import LoginType from synapse.api.errors import SynapseError from synapse.api.urls import CLIENT_API_PREFIX @@ -171,8 +169,7 @@ class AuthRestServlet(RestServlet): else: raise SynapseError(404, "Unknown auth stage type") - @defer.inlineCallbacks - def on_POST(self, request, stagetype): + async def on_POST(self, request, stagetype): session = parse_string(request, "session") if not session: @@ -186,7 +183,7 @@ class AuthRestServlet(RestServlet): authdict = {"response": response, "session": session} - success = yield self.auth_handler.add_oob_auth( + success = await self.auth_handler.add_oob_auth( LoginType.RECAPTCHA, authdict, self.hs.get_ip_from_request(request) ) @@ -215,7 +212,7 @@ class AuthRestServlet(RestServlet): session = request.args["session"][0] authdict = {"session": session} - success = yield self.auth_handler.add_oob_auth( + success = await self.auth_handler.add_oob_auth( LoginType.TERMS, authdict, self.hs.get_ip_from_request(request) ) |