diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-07-28 17:34:12 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-07-28 17:34:12 +0100 |
commit | a4d62ba36afc54d4e60f1371fe9b31e8b8e6834c (patch) | |
tree | 5b1d39b110ac974314fa38aa33eb2bd989cfb9ba /synapse/handlers/register.py | |
parent | Merge pull request #207 from matrix-org/erikj/generate_local_thumbnails_on_th... (diff) | |
download | synapse-a4d62ba36afc54d4e60f1371fe9b31e8b8e6834c.tar.xz |
Fix v2_alpha registration. Add unit tests.
V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r-- | synapse/handlers/register.py | 3 |
1 files changed, 2 insertions, 1 deletions
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: |