diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
| commit | 9c61556504924a063e7739ba80122c8753aed50c (patch) | |
| tree | a483e292dfe602f30be1f9f17266a1bd0f88552d /synapse/storage/registration.py | |
| parent | Fix Formatting (diff) | |
| parent | Merge pull request #36 from matrix-org/device_id_from_access_token (diff) | |
| download | synapse-9c61556504924a063e7739ba80122c8753aed50c.tar.xz | |
Merge branch 'develop' into client_v2_sync
Diffstat (limited to 'synapse/storage/registration.py')
| -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 = ?" |