Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-08 04:24:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into rav/filter_spec

Browse source
This commit is contained in:
Richard van der Hoff 2016-01-07 18:44:07 +00:00
parent ff26e0dc48 3edff684a1
commit 42cade36e6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
specification/application_service_api.rst
View file

@ -233,7 +233,7 @@ including the AS token on a ``/register`` request, along with a login type of
Content: Content:
{ {
type: "m.login.application_service", type: "m.login.application_service",
user: "<desired user localpart in AS namespace>" username: "<desired user localpart in AS namespace>"
} }
Application services which attempt to create users or aliases *outside* of Application services which attempt to create users or aliases *outside* of

6
specification/modules/guest_access.rst
View file

@ -16,6 +16,12 @@ of the API as described the Client behaviour subsection below.
Homeservers may choose not to allow this access at all to their local users, but Homeservers may choose not to allow this access at all to their local users, but
have no information about whether users on other homeservers are guests or not. have no information about whether users on other homeservers are guests or not.
Guest users can also upgrade their account by going through the ordinary
``register`` flow, but specifying the additional POST parameter
``guest_access_token`` containing the guest's access token. They are also
required to specify the ``username`` parameter to the value of the local part of
their username, which is otherwise optional.
This module does not fully factor in federation; it relies on individual This module does not fully factor in federation; it relies on individual
homeservers properly adhering to the rules set out in this module, rather than homeservers properly adhering to the rules set out in this module, rather than
allowing all homeservers to enforce the rules on each other. allowing all homeservers to enforce the rules on each other.