diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-12-01 17:34:32 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-12-01 17:34:32 +0000 |
| commit | 14d7acfad48ea7807b032b3fd99649b500e651f7 (patch) | |
| tree | f92b2d24bd243c3d91c0ca998f67fc5c7d2b95a3 /synapse/rest/client/v2_alpha/keys.py | |
| parent | Merge pull request #404 from matrix-org/markjh/trivial_rename (diff) | |
| download | synapse-14d7acfad48ea7807b032b3fd99649b500e651f7.tar.xz | |
Host /unstable and /r0 versions of r0 APIs
Diffstat (limited to 'synapse/rest/client/v2_alpha/keys.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/keys.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 820d33336f..c55e85920f 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -21,7 +21,7 @@ from synapse.types import UserID from canonicaljson import encode_canonical_json -from ._base import client_v2_pattern +from ._base import client_v2_patterns import simplejson as json import logging @@ -54,7 +54,7 @@ class KeyUploadServlet(RestServlet): }, } """ - PATTERN = client_v2_pattern("/keys/upload/(?P<device_id>[^/]*)") + PATTERNS = client_v2_patterns("/keys/upload/(?P<device_id>[^/]*)") def __init__(self, hs): super(KeyUploadServlet, self).__init__() @@ -154,12 +154,13 @@ class KeyQueryServlet(RestServlet): } } } } } } """ - PATTERN = client_v2_pattern( + PATTERNS = client_v2_patterns( "/keys/query(?:" "/(?P<user_id>[^/]*)(?:" "/(?P<device_id>[^/]*)" ")?" - ")?" + ")?", + releases=() ) def __init__(self, hs): @@ -245,10 +246,11 @@ class OneTimeKeyServlet(RestServlet): } } } } """ - PATTERN = client_v2_pattern( + PATTERNS = client_v2_patterns( "/keys/claim(?:/?|(?:/" "(?P<user_id>[^/]*)/(?P<device_id>[^/]*)/(?P<algorithm>[^/]*)" - ")?)" + ")?)", + releases=() ) def __init__(self, hs): |