Fall back to 'username' if 'user' is not given for appservice reg.
This commit is contained in:
parent
a2d288c6a9
commit
e885e2a623
|
@ -134,9 +134,11 @@ class RegisterRestServlet(RestServlet):
|
||||||
# fallback to 'username' if they gave one.
|
# fallback to 'username' if they gave one.
|
||||||
if isinstance(body.get("user"), basestring):
|
if isinstance(body.get("user"), basestring):
|
||||||
desired_username = body["user"]
|
desired_username = body["user"]
|
||||||
result = yield self._do_appservice_registration(
|
|
||||||
desired_username, request.args["access_token"][0]
|
if isinstance(desired_username, basestring):
|
||||||
)
|
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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue