diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-01 15:12:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-01 15:12:57 +0100 |
| commit | 67362a9a034a9a8945c10faf78e9b13598e3dc9e (patch) | |
| tree | c523d50061b18df57d33397dfdfb586fd267bbdd /synapse/api/auth.py | |
| parent | clarify readme a bit more (diff) | |
| parent | Bump changelog and version to v0.9.3 (diff) | |
| download | synapse-67362a9a034a9a8945c10faf78e9b13598e3dc9e.tar.xz | |
Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index d5bf0be85c..4da62e5d8d 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -370,6 +370,8 @@ class Auth(object): user_agent=user_agent ) + request.authenticated_entity = user.to_string() + defer.returnValue((user, ClientInfo(device_id, token_id))) except KeyError: raise AuthError( |