diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:23:06 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-25 16:23:06 +0100 |
| commit | a0b181bd17cb7ec2a43ed2dbdeb1bb40f3f4373c (patch) | |
| tree | 7f136968479fe90438c30e252d364fd4fd72fc01 /synapse/storage/registration.py | |
| parent | Merge pull request #244 from matrix-org/markjh/refresh_tokens (diff) | |
| download | synapse-a0b181bd17cb7ec2a43ed2dbdeb1bb40f3f4373c.tar.xz | |
Remove completely unused concepts from codebase
Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly.
Diffstat (limited to 'synapse/storage/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index f632306688..240d14c4d0 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -163,7 +163,7 @@ class RegistrationStore(SQLBaseStore): Args: token (str): The access token of a user. Returns: - dict: Including the name (user_id), device_id and whether they are + dict: Including the name (user_id) and whether they are an admin. Raises: StoreError if no user was found. @@ -228,8 +228,7 @@ class RegistrationStore(SQLBaseStore): def _query_for_auth(self, txn, token): sql = ( - "SELECT users.name, users.admin," - " access_tokens.device_id, access_tokens.id as token_id" + "SELECT users.name, users.admin, access_tokens.id as token_id" " FROM users" " INNER JOIN access_tokens on users.name = access_tokens.user_id" " WHERE token = ?" |