diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
| commit | f73ea0bda26a51794abedb65cbf4d0a717dee26c (patch) | |
| tree | 64fd41675594a7c71a7f119fb68b5b476f9173fd /synapse/rest/client/v2_alpha/auth.py | |
| parent | Only fire user_joined_room on the distributor if the user has actually joined... (diff) | |
| parent | Merge pull request #392 from matrix-org/markjh/client_config (diff) | |
| download | synapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz | |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'synapse/rest/client/v2_alpha/auth.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/auth.py b/synapse/rest/client/v2_alpha/auth.py index 4c726f05f5..fb5947a141 100644 --- a/synapse/rest/client/v2_alpha/auth.py +++ b/synapse/rest/client/v2_alpha/auth.py @@ -20,7 +20,7 @@ from synapse.api.errors import SynapseError from synapse.api.urls import CLIENT_V2_ALPHA_PREFIX from synapse.http.servlet import RestServlet -from ._base import client_v2_pattern +from ._base import client_v2_patterns import logging @@ -97,7 +97,7 @@ class AuthRestServlet(RestServlet): cannot be handled in the normal flow (with requests to the same endpoint). Current use is for web fallback auth. """ - PATTERN = client_v2_pattern("/auth/(?P<stagetype>[\w\.]*)/fallback/web") + PATTERNS = client_v2_patterns("/auth/(?P<stagetype>[\w\.]*)/fallback/web") def __init__(self, hs): super(AuthRestServlet, self).__init__() |