summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-02-01 16:33:19 +0000
committerDavid Baker <dave@matrix.org>2016-02-01 16:33:19 +0000
commitd7ac861d3b34bbc6d0d0b66370903831ef6ee9bf (patch)
tree2c840c218d2092819572177fa72735c31f8d9982
parentMerge pull request #543 from matrix-org/erikj/sync (diff)
downloadsynapse-d7ac861d3b34bbc6d0d0b66370903831ef6ee9bf.tar.xz
Pull guest access token out of the auth session params, otherwise it will break if you open the email on a different device.
-rw-r--r--synapse/rest/client/v2_alpha/register.py1
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,