diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-02-02 09:47:30 +0000 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-02-02 09:47:30 +0000 |
| commit | 793369791a3f9c720d1a8353171e1157fe5da261 (patch) | |
| tree | 2a853a7b5677c9e40bd36a37f45b5255ee76fe61 | |
| parent | Merge pull request #546 from matrix-org/erikj/events (diff) | |
| parent | Pull guest access token out of the auth session params, otherwise it will bre... (diff) | |
| download | synapse-793369791a3f9c720d1a8353171e1157fe5da261.tar.xz | |
Merge pull request #547 from matrix-org/dbkr/fix_guest_upgrade
Pull guest access token out of the auth session params
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index c4d025b465..5d50dd9e3d 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -152,6 +152,7 @@ class RegisterRestServlet(RestServlet): desired_username = params.get("username", None) new_password = params.get("password", None) + guest_access_token = params.get("guest_access_token", None) (user_id, token) = yield self.registration_handler.register( localpart=desired_username, |