rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #942 from matrix-org/rav/fix_register_deviceid 

Preserve device_id from first call to /register
This commit is contained in:
David Baker 2016-07-21 13:16:31 +01:00 committed by GitHub
parent 34f56b40fd 1a64dffb00
commit 1e6e370b76
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/rest/client/v2_alpha/register.py
View File

@ -237,7 +237,7 @@ class RegisterRestServlet(RestServlet):
add_email = True add_email = True
result = yield self._create_registration_details( result = yield self._create_registration_details(
registered_user_id, body registered_user_id, params
) )
if add_email and result and LoginType.EMAIL_IDENTITY in result: if add_email and result and LoginType.EMAIL_IDENTITY in result:
@ -359,7 +359,7 @@ class RegisterRestServlet(RestServlet):
defer.returnValue() defer.returnValue()
@defer.inlineCallbacks @defer.inlineCallbacks
def _create_registration_details(self, user_id, body): def _create_registration_details(self, user_id, params):
"""Complete registration of newly-registered user """Complete registration of newly-registered user
Allocates device_id if one was not given; also creates access_token Allocates device_id if one was not given; also creates access_token
@ -367,13 +367,12 @@ class RegisterRestServlet(RestServlet):
Args: Args:
(str) user_id: full canonical @user:id (str) user_id: full canonical @user:id
(object) body: dictionary supplied to /register call, from (object) params: registration parameters, from which we pull
which we pull device_id and initial_device_name device_id and initial_device_name
Returns: Returns:
defer.Deferred: (object) dictionary for response from /register defer.Deferred: (object) dictionary for response from /register
""" """
device_id = yield self._register_device(user_id, body) device_id = yield self._register_device(user_id, params)
access_token = yield self.auth_handler.issue_access_token( access_token = yield self.auth_handler.issue_access_token(
user_id, device_id=device_id user_id, device_id=device_id
@ -390,7 +389,7 @@ class RegisterRestServlet(RestServlet):
"device_id": device_id, "device_id": device_id,
}) })
def _register_device(self, user_id, body): def _register_device(self, user_id, params):
"""Register a device for a user. """Register a device for a user.
This is called after the user's credentials have been validated, but This is called after the user's credentials have been validated, but
@ -398,14 +397,14 @@ class RegisterRestServlet(RestServlet):
Args: Args:
(str) user_id: full canonical @user:id (str) user_id: full canonical @user:id
(object) body: dictionary supplied to /register call, from (object) params: registration parameters, from which we pull
which we pull device_id and initial_device_name device_id and initial_device_name
Returns: Returns:
defer.Deferred: (str) device_id defer.Deferred: (str) device_id
""" """
# register the user's device # register the user's device
device_id = body.get("device_id") device_id = params.get("device_id")
initial_display_name = body.get("initial_device_display_name") initial_display_name = params.get("initial_device_display_name")
device_id = self.device_handler.check_device_registered( device_id = self.device_handler.check_device_registered(
user_id, device_id, initial_display_name user_id, device_id, initial_display_name
) )