wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More clarifications

Browse source
This commit is contained in:
Richard van der Hoff 2016-08-09 15:51:12 +01:00
parent ec81b4c9fe
commit 1f1dfdd91c
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
specification/client_server_api.rst
View file

@ -407,7 +407,7 @@ Token-based
:Type:
``m.login.token``
:Description:
The client submits a username and token.
The client submits a login token.
To respond to this type, reply with an auth dict as follows:
@ -415,7 +415,6 @@ To respond to this type, reply with an auth dict as follows:
{
"type": "m.login.token",
"user": "<user_id or user localpart>",
"token": "<token>",
"txn_id": "<client generated nonce>"
}
@ -433,7 +432,8 @@ server side, as well as potentially invalidating the token completely once the
device has successfully logged in (e.g. when we receive a request from the
newly provisioned access_token).
The ``token`` must be a macaroon.
The ``token`` must be a macaroon, with a caveat encoding the user id. There is
therefore no need for the client to submit a separate username.
OAuth2-based
<<<<<<<<<<<<
@ -563,6 +563,9 @@ To log in using a login token, a client should submit an auth dict as follows:
"token": "<login token>"
}
As with `token-based`_ interactive login, the ``token`` must be a macroon with
a caveat which includes the user id.
{{login_cs_http_api}}
{{logout_cs_http_api}}