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

is_token -> id_access_token and add invite to proxy list

Browse source
This commit is contained in:
David Baker 2019-08-21 18:13:50 +01:00
parent 8bd9d7caeb
commit 4ea8f645d6
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
proposals/2140-terms-of-service-2.md
View file

@ -91,13 +91,14 @@ API, as specified in [MSC1961](https://github.com/matrix-org/matrix-doc/issues/1
When clients supply an identity server to the Homeserver in order for the When clients supply an identity server to the Homeserver in order for the
Homeserver to make calls to the IS on its behalf, it must also supply its Homeserver to make calls to the IS on its behalf, it must also supply its
access token for the Identity Server alongside in the `is_token` key of the access token for the Identity Server alongside in the `id_access_token` key of
same JSON object. That is, in the main request object for a `requestToken` the same JSON object. That is, in the main request object for `requestToken`
request and in the `threepidCreds` object when supplying 3PID credentials (eg. and `/_matrix/client/r0/rooms/{roomId}/invite` requests and in the
in the `m.email.identity` UI auth stage). The server must also relay `threepidCreds` object when supplying 3PID credentials (eg. in the
`M_TERMS_NOT_SIGNED` errors back to the client. Exceptions to this are any requests `m.email.identity` UI auth stage). The server must also relay
where the only IS operation the Homeserver may perform is unbinding, ie. `M_TERMS_NOT_SIGNED` errors back to the client. Exceptions to this are any
`/_matrix/client/r0/account/deactivate` and requests where the only IS operation the Homeserver may perform is unbinding,
ie. `/_matrix/client/r0/account/deactivate` and
`/_matrix/client/r0/account/3pid/delete`, in which case the unbind will be `/_matrix/client/r0/account/3pid/delete`, in which case the unbind will be
authenticated by a signed request from the Homeserver. authenticated by a signed request from the Homeserver.