Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Neaten things up

Browse source
This commit is contained in:
Erik Johnston 2015-09-28 09:32:03 +01:00
parent 317c2f20d3
commit 4c9f524cab
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
specification/1-client_server_api.rst
View file

@ -234,7 +234,7 @@ Token-based
:Type:
``m.login.token``
:Description:
The client submits a username and token that was generated by the server.
The client submits a username and token.
To respond to this type, reply with an auth dict as follows::
@ -248,9 +248,8 @@ To respond to this type, reply with an auth dict as follows::
The ``nonce`` should be a random string generated by the client for the
request. The same ``nonce`` should be used if retrying the request.
The ``token`` may be discovered from e.g. an email or dynamically generated QR
code.
There are many ways a client may receive a ``token``, including via an email or
from an existing logged in device.
OAuth2-based
~~~~~~~~~~~~