Fix creating clients

This commit is contained in:
Tulir Asokan 2018-11-02 00:43:00 +02:00
parent 1e37a56096
commit f5886ed34b

View File

@ -48,8 +48,8 @@ async def get_client(request: web.Request) -> web.Response:
async def _create_client(user_id: Optional[UserID], data: dict) -> web.Response: async def _create_client(user_id: Optional[UserID], data: dict) -> web.Response:
homeserver = data.get("homeserver", None) homeserver = data.get("homeserver", None)
access_token = data.get("access_token", None) access_token = data.get("access_token", None)
new_client = MatrixClient(base_url=homeserver, token=access_token, loop=Client.loop, new_client = MatrixClient(mxid="@not:a.mxid", base_url=homeserver, token=access_token,
client_session=Client.http_client) loop=Client.loop, client_session=Client.http_client)
try: try:
mxid = await new_client.whoami() mxid = await new_client.whoami()
except MatrixInvalidToken: except MatrixInvalidToken:
@ -62,7 +62,7 @@ async def _create_client(user_id: Optional[UserID], data: dict) -> web.Response:
return ErrUserExists return ErrUserExists
elif mxid != user_id: elif mxid != user_id:
return ErrMXIDMismatch return ErrMXIDMismatch
db_instance = DBClient(id=user_id, homeserver=homeserver, access_token=access_token, db_instance = DBClient(id=mxid, homeserver=homeserver, access_token=access_token,
enabled=data.get("enabled", True), next_batch=SyncToken(""), enabled=data.get("enabled", True), next_batch=SyncToken(""),
filter_id=FilterID(""), sync=data.get("sync", True), filter_id=FilterID(""), sync=data.get("sync", True),
autojoin=data.get("autojoin", True), autojoin=data.get("autojoin", True),