Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 09:56:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

as_user->app_service, less redundant comments, better positioned comments

Browse source
This commit is contained in:
Luke Barnard 2016-10-20 12:04:54 +01:00
parent 8bfd01f619
commit f09db236b1
3 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/api/auth.py
View file

@ -603,11 +603,11 @@ class Auth(object):
"""
# Can optionally look elsewhere in the request (e.g. headers)
try:
user_id, as_user = yield self._get_appservice_user_id(request)
user_id, app_service = yield self._get_appservice_user_id(request)
if user_id:
request.authenticated_entity = user_id
defer.returnValue(
synapse.types.create_requester(user_id, as_user=as_user)
synapse.types.create_requester(user_id, app_service=app_service)
)
access_token = get_access_token_from_request(
@ -646,7 +646,7 @@ class Auth(object):
request.authenticated_entity = user.to_string()
defer.returnValue(synapse.types.create_requester(
user, token_id, is_guest, device_id, as_user=as_user))
user, token_id, is_guest, device_id, app_service=app_service))
except KeyError:
raise AuthError(
self.TOKEN_NOT_FOUND_HTTP_STATUS, "Missing access token.",