diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:27:53 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:27:53 +0100 |
| commit | c5966b2a97090bf5b1e2ced83e3f424a3f4d4cad (patch) | |
| tree | 3cc3a75259e130906b963570e2c747f5ab0cba2d /synapse/handlers | |
| parent | Add a few strategic new lines to break up the on_query_client_keys and on_cla... (diff) | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| download | synapse-c5966b2a97090bf5b1e2ced83e3f424a3f4d4cad.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/identity.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/register.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 6200e10775..c1095708a0 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -44,7 +44,7 @@ class IdentityHandler(BaseHandler): http_client = SimpleHttpClient(self.hs) # XXX: make this configurable! # trustedIdServers = ['matrix.org', 'localhost:8090'] - trustedIdServers = ['matrix.org'] + trustedIdServers = ['matrix.org', 'vector.im'] if 'id_server' in creds: id_server = creds['id_server'] diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index a1288b4252..f81d75017d 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -73,7 +73,8 @@ class RegistrationHandler(BaseHandler): localpart : The local part of the user ID to register. If None, one will be randomly generated. password (str) : The password to assign to this user so they can - login again. + login again. This can be None which means they cannot login again + via a password (e.g. the user is an application service user). Returns: A tuple of (user_id, access_token). Raises: |