diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 16:58:23 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 16:58:23 +0000 |
| commit | 388581e087a3658c1b70d2aa1d17a132953350ca (patch) | |
| tree | 66072a2c0728e41603680c7e49467a5754e711a7 /synapse/storage | |
| parent | Return the device_id from get_auth_by_req (diff) | |
| download | synapse-388581e087a3658c1b70d2aa1d17a132953350ca.tar.xz | |
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/registration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 75dffa4db2..029b07cc66 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -122,7 +122,8 @@ class RegistrationStore(SQLBaseStore): def _query_for_auth(self, txn, token): sql = ( - "SELECT users.name, users.admin, access_tokens.device_id" + "SELECT users.name, users.admin," + " access_tokens.device_id, access_tokens.id as token_id" " FROM users" " INNER JOIN access_tokens on users.id = access_tokens.user_id" " WHERE token = ?" |