diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:36 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:50 +0100 |
commit | 984e207b5982df26bec37223cd07b4044dcacdd2 (patch) | |
tree | 9b7cd2052ab91b4365bb43f46d2509b389bf1bab /docs/client-server/howto.rst | |
parent | Merge branch 'develop' into server2server_signing (diff) | |
parent | remove wishlist in favour of jira (diff) | |
download | synapse-984e207b5982df26bec37223cd07b4044dcacdd2.tar.xz |
Merge branch develop into server2server_signing
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'docs/client-server/howto.rst')
-rw-r--r-- | docs/client-server/howto.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/client-server/howto.rst b/docs/client-server/howto.rst index ec941edddd..37346224af 100644 --- a/docs/client-server/howto.rst +++ b/docs/client-server/howto.rst @@ -31,7 +31,7 @@ Registration The aim of registration is to get a user ID and access token which you will need when accessing other APIs:: - curl -XPOST -d '{"user_id":"example", "password":"wordpass"}' "http://localhost:8008/_matrix/client/api/v1/register" + curl -XPOST -d '{"user":"example", "password":"wordpass", "type":"m.login.password"}' "http://localhost:8008/_matrix/client/api/v1/register" { "access_token": "QGV4YW1wbGU6bG9jYWxob3N0.AqdSzFmFYrLrTmteXc", @@ -39,14 +39,15 @@ when accessing other APIs:: "user_id": "@example:localhost" } -NB: If a ``user_id`` is not specified, one will be randomly generated for you. +NB: If a ``user`` is not specified, one will be randomly generated for you. If you do not specify a ``password``, you will be unable to login to the account if you forget the ``access_token``. Implementation note: The matrix specification does not enforce how users register with a server. It just specifies the URL path and absolute minimum keys. The reference home server uses a username/password to authenticate user, -but other home servers may use different methods. +but other home servers may use different methods. This is why you need to +specify the ``type`` of method. Login ----- |