diff options
| author | Erik Johnston <erikj@jki.re> | 2016-07-06 14:08:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 14:08:51 +0100 |
| commit | f0c06ac65cc851dd138d9fb5d4e14b0485e91bbc (patch) | |
| tree | 3f4192bb0e5707afe3711e7065f399daec04a535 /synapse/handlers | |
| parent | Merge pull request #910 from KentShikama/hash_password_followup (diff) | |
| parent | Check that there are no null bytes in user and passsword (diff) | |
| download | synapse-f0c06ac65cc851dd138d9fb5d4e14b0485e91bbc.tar.xz | |
Merge pull request #909 from matrix-org/erikj/shared_secret
Add an admin option to shared secret registration (breaks backwards compat)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/register.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 88c82ba7d0..8c3381df8a 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -90,7 +90,8 @@ class RegistrationHandler(BaseHandler): password=None, generate_token=True, guest_access_token=None, - make_guest=False + make_guest=False, + admin=False, ): """Registers a new client on the server. @@ -141,6 +142,7 @@ class RegistrationHandler(BaseHandler): # If the user was a guest then they already have a profile None if was_guest else user.localpart ), + admin=admin, ) else: # autogen a sequential user ID |