diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-07-14 07:34:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 07:34:49 +1000 |
| commit | 33b60c01b5e60dc38b02b6f0fd018be2d2d07cf7 (patch) | |
| tree | 5e6fed5d4599ecfb0490120bacf5cbee91448d27 /synapse/rest/client/v2_alpha/register.py | |
| parent | Merge pull request #3533 from matrix-org/rav/fix_federation_ratelimite_queue (diff) | |
| download | synapse-33b60c01b5e60dc38b02b6f0fd018be2d2d07cf7.tar.xz | |
Make auth & transactions more testable (#3499)
Diffstat (limited to 'synapse/rest/client/v2_alpha/register.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 896650d5a5..d305afcaef 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -24,7 +24,6 @@ from twisted.internet import defer import synapse import synapse.types -from synapse.api.auth import get_access_token_from_request, has_access_token from synapse.api.constants import LoginType from synapse.api.errors import Codes, SynapseError, UnrecognizedRequestError from synapse.http.servlet import ( @@ -224,7 +223,7 @@ class RegisterRestServlet(RestServlet): desired_username = body['username'] appservice = None - if has_access_token(request): + if self.auth.has_access_token(request): appservice = yield self.auth.get_appservice_by_req(request) # fork off as soon as possible for ASes and shared secret auth which @@ -242,7 +241,7 @@ class RegisterRestServlet(RestServlet): # because the IRC bridges rely on being able to register stupid # IDs. - access_token = get_access_token_from_request(request) + access_token = self.auth.get_access_token_from_request(request) if isinstance(desired_username, string_types): result = yield self._do_appservice_registration( |