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

Fix my broken line splitting

Browse source
This commit is contained in:
Steven Hammerton 2015-10-09 11:04:30 +01:00
parent e52f4dc599
commit a9c299c0be
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
synapse/rest/client/v1/login.py
View file

@ -137,8 +137,9 @@ class LoginRestServlet(ClientV1RestServlet):
auth_handler = self.handlers.auth_handler auth_handler = self.handlers.auth_handler
user_exists = yield auth_handler.does_user_exist(user_id) user_exists = yield auth_handler.does_user_exist(user_id)
if user_exists: if user_exists:
user_id, access_token, refresh_token = yield user_id, access_token, refresh_token = (
auth_handler.login_with_cas_user_id(user_id) yield auth_handler.login_with_cas_user_id(user_id)
)
result = { result = {
"user_id": user_id, # may have changed "user_id": user_id, # may have changed
"access_token": access_token, "access_token": access_token,
@ -147,8 +148,9 @@ class LoginRestServlet(ClientV1RestServlet):
} }
else: else:
user_id, access_token = yield user_id, access_token = (
self.handlers.registration_handler.register(localpart=user) yield self.handlers.registration_handler.register(localpart=user)
)
result = { result = {
"user_id": user_id, # may have changed "user_id": user_id, # may have changed
"access_token": access_token, "access_token": access_token,