tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #927 from Half-Shot/develop

Browse source 
Fall back to 'username' if 'user' is not given for appservice registration.
This commit is contained in:
Erik Johnston 2016-07-18 10:44:56 +01:00 committed by GitHub
commit 4f81edbd4f
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
synapse/rest/client/v2_alpha/register.py
View file

@ -132,11 +132,12 @@ class RegisterRestServlet(RestServlet):
# Set the desired user according to the AS API (which uses the # Set the desired user according to the AS API (which uses the
# 'user' key not 'username'). Since this is a new addition, we'll # 'user' key not 'username'). Since this is a new addition, we'll
# fallback to 'username' if they gave one. # fallback to 'username' if they gave one.
if isinstance(body.get("user"), basestring): desired_username = body.get("user", desired_username)
desired_username = body["user"]
result = yield self._do_appservice_registration( if isinstance(desired_username, basestring):
desired_username, request.args["access_token"][0] result = yield self._do_appservice_registration(
) desired_username, request.args["access_token"][0]
)
defer.returnValue((200, result)) # we throw for non 200 responses defer.returnValue((200, result)) # we throw for non 200 responses
return return