From 19308248988104307d214743c961947a051a4094 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 10 Aug 2022 10:44:38 +0100 Subject: [PATCH 1/2] include CS-api modules with `{{<` (#1205) ... because that fixes everything. Or at least, #1204. --- .../internal/newsfragments/1205.clarification | 1 + content/client-server-api/_index.md | 70 +++++++++---------- 2 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 changelogs/internal/newsfragments/1205.clarification diff --git a/changelogs/internal/newsfragments/1205.clarification b/changelogs/internal/newsfragments/1205.clarification new file mode 100644 index 00000000..6fb72a7a --- /dev/null +++ b/changelogs/internal/newsfragments/1205.clarification @@ -0,0 +1 @@ +Fix rendering of shortcodes within the client-server API. diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index a814144c..3d80c849 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -2608,38 +2608,38 @@ operations and run in a resource constrained environment. Like embedded applications, they are not intended to be fully-fledged communication systems. -{{% cs-module name="instant_messaging" %}} -{{% cs-module name="rich_replies" %}} -{{% cs-module name="voip_events" %}} -{{% cs-module name="typing_notifications" %}} -{{% cs-module name="receipts" %}} -{{% cs-module name="read_markers" %}} -{{% cs-module name="presence" %}} -{{% cs-module name="content_repo" %}} -{{% cs-module name="send_to_device" %}} -{{% cs-module name="device_management" %}} -{{% cs-module name="end_to_end_encryption" %}} -{{% cs-module name="secrets" %}} -{{% cs-module name="history_visibility" %}} -{{% cs-module name="push" %}} -{{% cs-module name="third_party_invites" %}} -{{% cs-module name="search" %}} -{{% cs-module name="guest_access" %}} -{{% cs-module name="room_previews" %}} -{{% cs-module name="tags" %}} -{{% cs-module name="account_data" %}} -{{% cs-module name="admin" %}} -{{% cs-module name="event_context" %}} -{{% cs-module name="sso_login" %}} -{{% cs-module name="dm" %}} -{{% cs-module name="ignore_users" %}} -{{% cs-module name="stickers" %}} -{{% cs-module name="report_content" %}} -{{% cs-module name="third_party_networks" %}} -{{% cs-module name="openid" %}} -{{% cs-module name="server_acls" %}} -{{% cs-module name="mentions" %}} -{{% cs-module name="room_upgrades" %}} -{{% cs-module name="server_notices" %}} -{{% cs-module name="moderation_policies" %}} -{{% cs-module name="spaces" %}} +{{< cs-module name="instant_messaging" >}} +{{< cs-module name="rich_replies" >}} +{{< cs-module name="voip_events" >}} +{{< cs-module name="typing_notifications" >}} +{{< cs-module name="receipts" >}} +{{< cs-module name="read_markers" >}} +{{< cs-module name="presence" >}} +{{< cs-module name="content_repo" >}} +{{< cs-module name="send_to_device" >}} +{{< cs-module name="device_management" >}} +{{< cs-module name="end_to_end_encryption" >}} +{{< cs-module name="secrets" >}} +{{< cs-module name="history_visibility" >}} +{{< cs-module name="push" >}} +{{< cs-module name="third_party_invites" >}} +{{< cs-module name="search" >}} +{{< cs-module name="guest_access" >}} +{{< cs-module name="room_previews" >}} +{{< cs-module name="tags" >}} +{{< cs-module name="account_data" >}} +{{< cs-module name="admin" >}} +{{< cs-module name="event_context" >}} +{{< cs-module name="sso_login" >}} +{{< cs-module name="dm" >}} +{{< cs-module name="ignore_users" >}} +{{< cs-module name="stickers" >}} +{{< cs-module name="report_content" >}} +{{< cs-module name="third_party_networks" >}} +{{< cs-module name="openid" >}} +{{< cs-module name="server_acls" >}} +{{< cs-module name="mentions" >}} +{{< cs-module name="room_upgrades" >}} +{{< cs-module name="server_notices" >}} +{{< cs-module name="moderation_policies" >}} +{{< cs-module name="spaces" >}} From 5572d33453cf27896e4e78c435bb6e7c200d2c05 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Tue, 16 Aug 2022 18:12:10 +0100 Subject: [PATCH 2/2] Require `access_token`, `device_id` and `user_id` fields in `/login` response (#1210) --- changelogs/client_server/newsfragments/1210.clarification | 1 + data/api/client-server/login.yaml | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelogs/client_server/newsfragments/1210.clarification diff --git a/changelogs/client_server/newsfragments/1210.clarification b/changelogs/client_server/newsfragments/1210.clarification new file mode 100644 index 00000000..6a024852 --- /dev/null +++ b/changelogs/client_server/newsfragments/1210.clarification @@ -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`. \ No newline at end of file diff --git a/data/api/client-server/login.yaml b/data/api/client-server/login.yaml index d279445d..4c348fcd 100644 --- a/data/api/client-server/login.yaml +++ b/data/api/client-server/login.yaml @@ -210,6 +210,7 @@ paths: form as the one returned from .well-known autodiscovery. allOf: - "$ref": "definitions/wellknown/full.yaml" + required: ["access_token", "device_id", "user_id"] 400: description: |- Part of the request was invalid. For example, the login type may not be recognised.