Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier

This commit is contained in:
Mark Haines 2015-01-28 17:16:12 +00:00
parent c18e551640
commit 3cca61e006
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/api/auth.py
View File

@ -21,7 +21,7 @@ from synapse.api.constants import EventTypes, Membership, JoinRules
from synapse.api.errors import AuthError, StoreError, Codes, SynapseError
from synapse.util.logutils import log_function
from synapse.util.async import run_on_reactor
from synapse.types import UserID, ClientID
from synapse.types import UserID, ClientInfo
import logging
@ -318,7 +318,7 @@ class Auth(object):
user_agent=user_agent
)
defer.returnValue((user, ClientID(device_id, token_id)))
defer.returnValue((user, ClientInfo(device_id, token_id)))
except KeyError:
raise AuthError(403, "Missing access token.")

2
synapse/types.py
View File

@ -121,4 +121,4 @@ class StreamToken(
return StreamToken(**d)
ClientID = namedtuple("ClientID", ("device_id", "token_id"))
ClientInfo = namedtuple("ClientInfo", ("device_id", "token_id"))