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

Merge branch 'main' into travis/ref-rel

Browse source
This commit is contained in:
Travis Ralston 2022-08-24 17:28:35 -06:00
parent 9dee6d9233 5572d33453
commit 2974d8a716
4 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/1210.clarification Normal file
View file

@ -0,0 +1 @@
Clarify that the "device_id", "user_id" and "access_token" fields are required in the response body of `POST /_matrix/client/v3/login`.

1
changelogs/internal/newsfragments/1205.clarification Normal file
View file

@ -0,0 +1 @@
Fix rendering of shortcodes within the client-server API.

70
content/client-server-api/_index.md
View file

@ -2609,39 +2609,39 @@ operations and run in a resource constrained environment. Like embedded
applications, they are not intended to be fully-fledged communication applications, they are not intended to be fully-fledged communication
systems. systems.
{{% cs-module name="instant_messaging" %}} {{< cs-module name="instant_messaging" >}}
{{% cs-module name="rich_replies" %}} {{< cs-module name="rich_replies" >}}
{{% cs-module name="voip_events" %}} {{< cs-module name="voip_events" >}}
{{% cs-module name="typing_notifications" %}} {{< cs-module name="typing_notifications" >}}
{{% cs-module name="receipts" %}} {{< cs-module name="receipts" >}}
{{% cs-module name="read_markers" %}} {{< cs-module name="read_markers" >}}
{{% cs-module name="presence" %}} {{< cs-module name="presence" >}}
{{% cs-module name="content_repo" %}} {{< cs-module name="content_repo" >}}
{{% cs-module name="send_to_device" %}} {{< cs-module name="send_to_device" >}}
{{% cs-module name="device_management" %}} {{< cs-module name="device_management" >}}
{{% cs-module name="end_to_end_encryption" %}} {{< cs-module name="end_to_end_encryption" >}}
{{% cs-module name="secrets" %}} {{< cs-module name="secrets" >}}
{{% cs-module name="history_visibility" %}} {{< cs-module name="history_visibility" >}}
{{% cs-module name="push" %}} {{< cs-module name="push" >}}
{{% cs-module name="third_party_invites" %}} {{< cs-module name="third_party_invites" >}}
{{% cs-module name="search" %}} {{< cs-module name="search" >}}
{{% cs-module name="guest_access" %}} {{< cs-module name="guest_access" >}}
{{% cs-module name="room_previews" %}} {{< cs-module name="room_previews" >}}
{{% cs-module name="tags" %}} {{< cs-module name="tags" >}}
{{% cs-module name="account_data" %}} {{< cs-module name="account_data" >}}
{{% cs-module name="admin" %}} {{< cs-module name="admin" >}}
{{% cs-module name="event_context" %}} {{< cs-module name="event_context" >}}
{{% cs-module name="sso_login" %}} {{< cs-module name="sso_login" >}}
{{% cs-module name="dm" %}} {{< cs-module name="dm" >}}
{{% cs-module name="ignore_users" %}} {{< cs-module name="ignore_users" >}}
{{% cs-module name="stickers" %}} {{< cs-module name="stickers" >}}
{{% cs-module name="report_content" %}} {{< cs-module name="report_content" >}}
{{% cs-module name="third_party_networks" %}} {{< cs-module name="third_party_networks" >}}
{{% cs-module name="openid" %}} {{< cs-module name="openid" >}}
{{% cs-module name="server_acls" %}} {{< cs-module name="server_acls" >}}
{{% cs-module name="mentions" %}} {{< cs-module name="mentions" >}}
{{% cs-module name="room_upgrades" %}} {{< cs-module name="room_upgrades" >}}
{{% cs-module name="server_notices" %}} {{< cs-module name="server_notices" >}}
{{% cs-module name="moderation_policies" %}} {{< cs-module name="moderation_policies" >}}
{{% cs-module name="spaces" %}} {{< cs-module name="spaces" >}}
{{< cs-module name="reference_relations" >}} {{< cs-module name="reference_relations" >}}

1
data/api/client-server/login.yaml
View file

@ -210,6 +210,7 @@ paths:
form as the one returned from .well-known autodiscovery. form as the one returned from .well-known autodiscovery.
allOf: allOf:
- "$ref": "definitions/wellknown/full.yaml" - "$ref": "definitions/wellknown/full.yaml"
required: ["access_token", "device_id", "user_id"]
400: 400:
description: |- description: |-
Part of the request was invalid. For example, the login type may not be recognised. Part of the request was invalid. For example, the login type may not be recognised.