Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-25 20:59:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2629 from matrix-org/rav/register_inhibit_login

Browse Source 
support inhibit_login in /register
This commit is contained in:
David Baker 2017-11-02 16:51:35 +00:00 committed by GitHub
commit 9e09a1800b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,24 +557,28 @@ class RegisterRestServlet(RestServlet):
Args: Args:
(str) user_id: full canonical @user:id (str) user_id: full canonical @user:id
(object) params: registration parameters, from which we pull (object) params: registration parameters, from which we pull
device_id and initial_device_name device_id, initial_device_name and inhibit_login
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, params) result = {
access_token = (
yield self.auth_handler.get_access_token_for_user_id(
user_id, device_id=device_id,
)
)
defer.returnValue({
"user_id": user_id, "user_id": user_id,
"access_token": access_token,
"home_server": self.hs.hostname, "home_server": self.hs.hostname,
"device_id": device_id, }
}) if not params.get("inhibit_login", False):
device_id = yield self._register_device(user_id, params)
access_token = (
yield self.auth_handler.get_access_token_for_user_id(
user_id, device_id=device_id,
)
)
result.update({
"access_token": access_token,
"device_id": device_id,
})
defer.returnValue(result)
def _register_device(self, user_id, params): def _register_device(self, user_id, params):
"""Register a device for a user. """Register a device for a user.