diff options
| author | Erik Johnston <erik@matrix.org> | 2019-02-18 15:25:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-02-18 15:26:13 +0000 |
| commit | 8b9ae6d3a665e861072ee92bba38dd44a13d9f54 (patch) | |
| tree | 661fdcbf660a24ab9c9b7be3cf02aa639241a6bb | |
| parent | Update changelog.d/4666.feature (diff) | |
| download | synapse-8b9ae6d3a665e861072ee92bba38dd44a13d9f54.tar.xz | |
Update docs
| -rw-r--r-- | docs/workers.rst | 6 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/workers.rst b/docs/workers.rst index dd3a84ba0d..6ce7d88c11 100644 --- a/docs/workers.rst +++ b/docs/workers.rst @@ -223,6 +223,12 @@ following regular expressions:: ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/members$ ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state$ +Additionally, the following REST endpoints can be handled, but all requests must +be routed to the same instance:: + + ^/_matrix/client/(api/v1|r0|unstable)/register$ + + ``synapse.app.user_dir`` ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index d78da50787..c52280c50c 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -665,7 +665,7 @@ class RegisterRestServlet(RestServlet): device. is_guest (bool): Whether this is a guest account Returns: - defer.Deferred[(str, str)]: Tuple of device ID and access token + defer.Deferred[tuple[str, str]]: Tuple of device ID and access token """ if self.hs.config.worker_app: r = yield self._register_device_client( |