diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2015-07-29 14:46:17 +0100 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2015-07-29 14:46:17 +0100 |
| commit | 2c963054f85f5878a5fe54a3cb79cf4117eaa326 (patch) | |
| tree | 7822a04a5df8c5c692f767e699af078e92f81983 /synapse/handlers | |
| parent | improve OS X instructions and remove all the leading $'s to make it easier to... (diff) | |
| parent | Use the same reg paths as register v1 for ASes. (diff) | |
| download | synapse-2c963054f85f5878a5fe54a3cb79cf4117eaa326.tar.xz | |
Merge pull request #210 from matrix-org/reg-v2a-password-skip
v2_alpha /register fixes for Application Services
Diffstat (limited to 'synapse/handlers')
| -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: |