From a0de71c50033ef28ac6d9530cd546fa3d6c05ddb Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 21 Jul 2026 16:38:05 -0400 Subject: [PATCH] Spec for MSC4127: Removal of query string auth (#2408) Signed-off-by: Patrick Cloke --- .../client_server/newsfragments/2408.breaking | 1 + .../newsfragments/2408.breaking | 1 + content/client-server-api/_index.md | 10 ++-------- content/identity-service-api.md | 11 ++-------- data/api/client-server/account-data.yaml | 6 ------ .../client-server/account_deactivation.yaml | 3 --- data/api/client-server/admin.yaml | 7 ------- .../client-server/administrative_contact.yaml | 8 -------- data/api/client-server/appservice_ping.yaml | 3 --- .../appservice_room_directory.yaml | 3 --- .../client-server/authed-content-repo.yaml | 7 ------- data/api/client-server/banning.yaml | 4 ---- data/api/client-server/capabilities.yaml | 3 --- data/api/client-server/content-repo.yaml | 7 ------- data/api/client-server/create_room.yaml | 3 --- data/api/client-server/cross_signing.yaml | 4 ---- .../client-server/definitions/security.yaml | 20 ------------------- data/api/client-server/device_management.yaml | 7 ------- data/api/client-server/directory.yaml | 5 ----- data/api/client-server/event_context.yaml | 3 --- data/api/client-server/filter.yaml | 4 ---- data/api/client-server/inviting.yaml | 3 --- data/api/client-server/joining.yaml | 4 ---- data/api/client-server/key_backup.yaml | 16 --------------- data/api/client-server/keys.yaml | 6 ------ data/api/client-server/kicking.yaml | 3 --- data/api/client-server/knocking.yaml | 3 --- data/api/client-server/leaving.yaml | 4 ---- data/api/client-server/list_joined_rooms.yaml | 3 --- data/api/client-server/list_public_rooms.yaml | 4 ---- data/api/client-server/login_token.yaml | 3 --- data/api/client-server/logout.yaml | 4 ---- .../api/client-server/message_pagination.yaml | 3 --- data/api/client-server/mutual_rooms.yaml | 3 --- data/api/client-server/notifications.yaml | 3 --- data/api/client-server/old_sync.yaml | 5 ----- data/api/client-server/openid.yaml | 3 --- .../client-server/password_management.yaml | 3 --- data/api/client-server/peeking_events.yaml | 3 --- data/api/client-server/presence.yaml | 4 ---- data/api/client-server/profile.yaml | 4 ---- data/api/client-server/pusher.yaml | 4 ---- data/api/client-server/pushrules.yaml | 11 ---------- data/api/client-server/read_markers.yaml | 3 --- data/api/client-server/receipts.yaml | 3 --- data/api/client-server/redaction.yaml | 3 --- data/api/client-server/relations.yaml | 5 ----- data/api/client-server/report_content.yaml | 5 ----- .../room_event_by_timestamp.yaml | 3 --- data/api/client-server/room_initial_sync.yaml | 3 --- data/api/client-server/room_send.yaml | 3 --- data/api/client-server/room_state.yaml | 3 --- data/api/client-server/room_upgrades.yaml | 3 --- data/api/client-server/rooms.yaml | 7 ------- data/api/client-server/search.yaml | 3 --- data/api/client-server/space_hierarchy.yaml | 3 --- data/api/client-server/sync.yaml | 3 --- data/api/client-server/tags.yaml | 5 ----- .../api/client-server/third_party_lookup.yaml | 8 -------- .../client-server/third_party_membership.yaml | 3 --- data/api/client-server/threads_list.yaml | 3 --- data/api/client-server/to_device.yaml | 3 --- data/api/client-server/typing.yaml | 3 --- data/api/client-server/users.yaml | 3 --- data/api/client-server/versions.yaml | 3 --- data/api/client-server/voip.yaml | 3 --- data/api/client-server/whoami.yaml | 3 --- data/api/identity/definitions/security.yaml | 9 --------- data/api/identity/v2_associations.yaml | 5 ----- data/api/identity/v2_auth.yaml | 4 ---- data/api/identity/v2_email_associations.yaml | 5 ----- data/api/identity/v2_invitation_signing.yaml | 3 --- data/api/identity/v2_lookup.yaml | 4 ---- data/api/identity/v2_phone_associations.yaml | 5 ----- data/api/identity/v2_store_invite.yaml | 3 --- data/api/identity/v2_terms.yaml | 3 --- 76 files changed, 6 insertions(+), 341 deletions(-) create mode 100644 changelogs/client_server/newsfragments/2408.breaking create mode 100644 changelogs/identity_service/newsfragments/2408.breaking diff --git a/changelogs/client_server/newsfragments/2408.breaking b/changelogs/client_server/newsfragments/2408.breaking new file mode 100644 index 00000000..9c49d52a --- /dev/null +++ b/changelogs/client_server/newsfragments/2408.breaking @@ -0,0 +1 @@ +Providing access tokens via query string parameters is no longer supported. diff --git a/changelogs/identity_service/newsfragments/2408.breaking b/changelogs/identity_service/newsfragments/2408.breaking new file mode 100644 index 00000000..9c49d52a --- /dev/null +++ b/changelogs/identity_service/newsfragments/2408.breaking @@ -0,0 +1 @@ +Providing access tokens via query string parameters is no longer supported. diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index 5bdc5026..ca846dec 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -570,15 +570,9 @@ invalidate the access token the client must use [token revocation](#token-revoca Access tokens may be provided via a request header, using the Authentication Bearer scheme: `Authorization: Bearer TheTokenHere`. -Clients may alternatively provide the access token via a query string parameter: -`access_token=TheTokenHere`. This method is deprecated to prevent the access -token being leaked in access/HTTP logs and SHOULD NOT be used by clients. - -Homeservers MUST support both methods. - {{% boxes/note %}} -{{% changed-in v="1.11" %}} -Sending the access token as a query string parameter is now deprecated. +{{% changed-in v="1.20" %}} +Sending the access token as a query string parameter is no longer supported. {{% /boxes/note %}} When credentials are required but missing or invalid, the HTTP call will diff --git a/content/identity-service-api.md b/content/identity-service-api.md index 07ecb56d..50e4847f 100644 --- a/content/identity-service-api.md +++ b/content/identity-service-api.md @@ -167,16 +167,9 @@ requests. Access tokens may be provided via a request header, using the Authentication Bearer scheme: `Authorization: Bearer TheTokenHere`. -Clients may alternatively provide the access token via a query string -parameter: `access_token=TheTokenHere`. This method is deprecated to -prevent the access token being leaked in access/HTTP logs and SHOULD NOT -be used by clients. - -Identity Servers MUST support both methods. - {{% boxes/note %}} -{{% changed-in v="1.11" %}} -Sending the access token as a query string parameter is now deprecated. +{{% changed-in v="1.20" %}} +Sending the access token as a query string parameter is no longer supported. {{% /boxes/note %}} When credentials are required but missing or invalid, the HTTP call will diff --git a/data/api/client-server/account-data.yaml b/data/api/client-server/account-data.yaml index 9502929c..c8802c24 100644 --- a/data/api/client-server/account-data.yaml +++ b/data/api/client-server/account-data.yaml @@ -26,7 +26,6 @@ paths: [/sync](/client-server-api/#get_matrixclientv3sync). operationId: setAccountData security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -118,7 +117,6 @@ paths: that set the account data. operationId: getAccountData security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -188,7 +186,6 @@ paths: clients in the per-room entries via [/sync](/client-server-api/#get_matrixclientv3sync). operationId: setAccountDataPerRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -288,7 +285,6 @@ paths: visible to the user that set the account data. operationId: getAccountDataPerRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -383,7 +379,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/account_deactivation.yaml b/data/api/client-server/account_deactivation.yaml index 2275fdff..c9a1d515 100644 --- a/data/api/client-server/account_deactivation.yaml +++ b/data/api/client-server/account_deactivation.yaml @@ -45,7 +45,6 @@ paths: {{% /boxes/warning %}} security: - {} - - accessTokenQuery: [] - accessTokenBearer: [] operationId: deactivateAccount requestBody: @@ -143,7 +142,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/admin.yaml b/data/api/client-server/admin.yaml index 981f7277..52bd09f4 100644 --- a/data/api/client-server/admin.yaml +++ b/data/api/client-server/admin.yaml @@ -27,7 +27,6 @@ paths: specified in this document. operationId: getWhoIs security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -120,7 +119,6 @@ paths: prior to trying to do account lookups. operationId: getAdminSuspendUser security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -208,7 +206,6 @@ paths: prior to trying to do account lookups. operationId: setAdminSuspendUser security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -313,7 +310,6 @@ paths: prior to trying to do account lookups. operationId: getAdminLockUser security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -400,7 +396,6 @@ paths: prior to trying to do account lookups. operationId: setAdminLockUser security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -506,7 +501,5 @@ servers: default: /_matrix/client components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/administrative_contact.yaml b/data/api/client-server/administrative_contact.yaml index 35712595..c5beb7d0 100644 --- a/data/api/client-server/administrative_contact.yaml +++ b/data/api/client-server/administrative_contact.yaml @@ -31,7 +31,6 @@ paths: identifiers that it will accept to reset the user's account password. operationId: getAccount3PIDs security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -106,7 +105,6 @@ paths: operationId: post3PIDs deprecated: true security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -216,7 +214,6 @@ paths: {{% /boxes/warning %}} operationId: add3PID security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -279,7 +276,6 @@ paths: Homeservers should track successful binds so they can be unbound later. operationId: bind3PID security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -345,7 +341,6 @@ paths: to determine if this endpoint is available. operationId: delete3pidFromAccount security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -415,7 +410,6 @@ paths: identity server instead. operationId: unbind3pidFromAccount security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -614,7 +608,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/appservice_ping.yaml b/data/api/client-server/appservice_ping.yaml index ed84a089..5080456b 100644 --- a/data/api/client-server/appservice_ping.yaml +++ b/data/api/client-server/appservice_ping.yaml @@ -57,7 +57,6 @@ paths: example: mautrix-go_1683636478256400935_123 required: true security: - - appserviceAccessTokenQuery: [] - appserviceAccessTokenBearer: [] responses: "200": @@ -177,7 +176,5 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - appserviceAccessTokenQuery: - $ref: definitions/security.yaml#/appserviceAccessTokenQuery appserviceAccessTokenBearer: $ref: definitions/security.yaml#/appserviceAccessTokenBearer diff --git a/data/api/client-server/appservice_room_directory.yaml b/data/api/client-server/appservice_room_directory.yaml index 0443dad2..8b14f059 100644 --- a/data/api/client-server/appservice_room_directory.yaml +++ b/data/api/client-server/appservice_room_directory.yaml @@ -70,7 +70,6 @@ paths: - visibility required: true security: - - appserviceAccessTokenQuery: [] - appserviceAccessTokenBearer: [] responses: "200": @@ -98,7 +97,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - appserviceAccessTokenQuery: - $ref: definitions/security.yaml#/appserviceAccessTokenQuery appserviceAccessTokenBearer: $ref: definitions/security.yaml#/appserviceAccessTokenBearer diff --git a/data/api/client-server/authed-content-repo.yaml b/data/api/client-server/authed-content-repo.yaml index 4d5b6582..b435f4d7 100644 --- a/data/api/client-server/authed-content-repo.yaml +++ b/data/api/client-server/authed-content-repo.yaml @@ -33,7 +33,6 @@ paths: Delivery Network (CDN). operationId: getContentAuthed security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/serverName' @@ -106,7 +105,6 @@ paths: Delivery Network (CDN). operationId: getContentOverrideNameAuthed security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/serverName' @@ -177,7 +175,6 @@ paths: Delivery Network (CDN). operationId: getContentThumbnailAuthed security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/serverName' @@ -353,7 +350,6 @@ paths: {{% /boxes/note %}} operationId: getUrlPreviewAuthed security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -432,7 +428,6 @@ paths: {{% /boxes/note %}} operationId: getConfigAuthed security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -472,8 +467,6 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer parameters: diff --git a/data/api/client-server/banning.yaml b/data/api/client-server/banning.yaml index d57f7c34..8ba8bbb4 100644 --- a/data/api/client-server/banning.yaml +++ b/data/api/client-server/banning.yaml @@ -27,7 +27,6 @@ paths: The caller must have the required power level in order to perform this operation. operationId: ban security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -101,7 +100,6 @@ paths: The caller must have the required power level in order to perform this operation. operationId: unban security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -179,7 +177,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/capabilities.yaml b/data/api/client-server/capabilities.yaml index 2a412fa9..72a3f018 100644 --- a/data/api/client-server/capabilities.yaml +++ b/data/api/client-server/capabilities.yaml @@ -24,7 +24,6 @@ paths: and other relevant capabilities. operationId: getCapabilities security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -218,8 +217,6 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer schemas: diff --git a/data/api/client-server/content-repo.yaml b/data/api/client-server/content-repo.yaml index 38b6e6fd..82bd3c2c 100644 --- a/data/api/client-server/content-repo.yaml +++ b/data/api/client-server/content-repo.yaml @@ -22,7 +22,6 @@ paths: summary: Upload some content to the content repository. operationId: uploadContent security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/contentType' @@ -82,7 +81,6 @@ paths: operationId: uploadContentToMXC x-addedInMatrixVersion: "1.7" security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/serverName' @@ -192,7 +190,6 @@ paths: operationId: createContent x-addedInMatrixVersion: "1.7" security: - - accessTokenQuery: [] - accessTokenBearer: [] # empty json object responses: @@ -579,7 +576,6 @@ paths: being shared should also not be shared with the homeserver. operationId: getUrlPreview security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -660,7 +656,6 @@ paths: than is advertised by the server on this endpoint. operationId: getConfig security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -700,8 +695,6 @@ servers: default: /_matrix components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer parameters: diff --git a/data/api/client-server/create_room.yaml b/data/api/client-server/create_room.yaml index 99bf7375..394cd115 100644 --- a/data/api/client-server/create_room.yaml +++ b/data/api/client-server/create_room.yaml @@ -80,7 +80,6 @@ paths: x-changedInMatrixVersion: "1.16": Added server behaviour for how the initial power levels change depending on room version. security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -304,7 +303,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/cross_signing.yaml b/data/api/client-server/cross_signing.yaml index 13507718..ca5d1af0 100644 --- a/data/api/client-server/cross_signing.yaml +++ b/data/api/client-server/cross_signing.yaml @@ -52,7 +52,6 @@ paths: {{% /boxes/note %}} operationId: uploadCrossSigningKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -182,7 +181,6 @@ paths: property, which contains the new signature(s) to add. operationId: uploadCrossSigningSignatures security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -294,7 +292,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/definitions/security.yaml b/data/api/client-server/definitions/security.yaml index bb84a08c..e554b4bd 100644 --- a/data/api/client-server/definitions/security.yaml +++ b/data/api/client-server/definitions/security.yaml @@ -11,15 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -accessTokenQuery: - type: apiKey - description: |- - **Deprecated.** The `access_token` obtained during [account registration](/client-server-api/#account-registration) - or [login](/client-server-api/#login), as a query parameter. - - It can also be the `as_token` of an application service. - name: access_token - in: query accessTokenBearer: type: http description: |- @@ -27,21 +18,10 @@ accessTokenBearer: or [login](/client-server-api/#login), using the `Authorization: Bearer` header. It can also be the `as_token` of an application service. - - This is the preferred method. scheme: bearer -appserviceAccessTokenQuery: - type: apiKey - description: |- - **Deprecated.** The `as_token` of an application service, as a query - parameter. - name: access_token - in: query appserviceAccessTokenBearer: type: http description: |- The `as_token` of an application service, using the `Authorization: Bearer` header. - - This is the preferred method. scheme: bearer diff --git a/data/api/client-server/device_management.yaml b/data/api/client-server/device_management.yaml index e5ae56ce..6f512022 100644 --- a/data/api/client-server/device_management.yaml +++ b/data/api/client-server/device_management.yaml @@ -22,7 +22,6 @@ paths: description: Gets information about all devices for the current user. operationId: getDevices security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -57,7 +56,6 @@ paths: description: Gets information on a single device, by device id. operationId: getDevice security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -104,7 +102,6 @@ paths: rate limits. operationId: updateDevice security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -179,7 +176,6 @@ paths: {{% /boxes/warning %}} operationId: deleteDevice security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -248,7 +244,6 @@ paths: {{% /boxes/warning %}} operationId: deleteDevices security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -308,7 +303,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/directory.yaml b/data/api/client-server/directory.yaml index e0e92b56..24a6f237 100644 --- a/data/api/client-server/directory.yaml +++ b/data/api/client-server/directory.yaml @@ -21,7 +21,6 @@ paths: summary: Create a new mapping from room alias to room ID. operationId: setRoomAlias security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -182,7 +181,6 @@ paths: have permission to update the `m.room.canonical_alias` event. operationId: deleteRoomAlias security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -242,7 +240,6 @@ paths: state event. operationId: getLocalAliases security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -327,7 +324,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/event_context.yaml b/data/api/client-server/event_context.yaml index a23c1aa7..bead3202 100644 --- a/data/api/client-server/event_context.yaml +++ b/data/api/client-server/event_context.yaml @@ -28,7 +28,6 @@ paths: [Lazy-loading room members](/client-server-api/#lazy-loading-room-members) for more information. operationId: getEventContext security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -155,7 +154,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/filter.yaml b/data/api/client-server/filter.yaml index 65c4e77d..4c320142 100644 --- a/data/api/client-server/filter.yaml +++ b/data/api/client-server/filter.yaml @@ -25,7 +25,6 @@ paths: restrict which events are returned to the client. operationId: defineFilter security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -122,7 +121,6 @@ paths: summary: Download a filter operationId: getFilter security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -218,7 +216,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/inviting.yaml b/data/api/client-server/inviting.yaml index 6a2f69f4..247219aa 100644 --- a/data/api/client-server/inviting.yaml +++ b/data/api/client-server/inviting.yaml @@ -38,7 +38,6 @@ paths: `m.room.member` event to the room. operationId: inviteUser security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -147,7 +146,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/joining.yaml b/data/api/client-server/joining.yaml index aabbbb07..1992a01d 100644 --- a/data/api/client-server/joining.yaml +++ b/data/api/client-server/joining.yaml @@ -33,7 +33,6 @@ paths: and [`/sync`](/client-server-api/#get_matrixclientv3sync) APIs. operationId: joinRoomById security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -131,7 +130,6 @@ paths: and [`/sync`](/client-server-api/#get_matrixclientv3sync) APIs. operationId: joinRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -245,7 +243,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/key_backup.yaml b/data/api/client-server/key_backup.yaml index cd597f88..93f6cb3f 100644 --- a/data/api/client-server/key_backup.yaml +++ b/data/api/client-server/key_backup.yaml @@ -23,7 +23,6 @@ paths: description: Creates a new backup. operationId: postRoomKeysVersion security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -81,7 +80,6 @@ paths: description: Get information about the latest backup version. operationId: getRoomKeysVersionCurrent security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -157,7 +155,6 @@ paths: description: Get information about an existing backup. operationId: getRoomKeysVersion security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -245,7 +242,6 @@ paths: be modified. operationId: putRoomKeysVersion security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -348,7 +344,6 @@ paths: as well as all key data related to the backup will be deleted. operationId: deleteRoomKeysVersion security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -401,7 +396,6 @@ paths: description: Store a key in the backup. operationId: putRoomKeyBySessionId security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -469,7 +463,6 @@ paths: description: Retrieve a key from the backup. operationId: getRoomKeyBySessionId security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -526,7 +519,6 @@ paths: description: Delete a key from the backup. operationId: deleteRoomKeyBySessionId security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -584,7 +576,6 @@ paths: description: Store several keys in the backup for a given room. operationId: putRoomKeysByRoomId security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -657,7 +648,6 @@ paths: description: Retrieve the keys from the backup for a given room. operationId: getRoomKeysByRoomId security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -710,7 +700,6 @@ paths: description: Delete the keys from the backup for a given room. operationId: deleteRoomKeysByRoomId security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -761,7 +750,6 @@ paths: description: Store several keys in the backup. operationId: putRoomKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -849,7 +837,6 @@ paths: description: Retrieve the keys from the backup. operationId: getRoomKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -916,7 +903,6 @@ paths: description: Delete the keys from the backup. operationId: deleteRoomKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -987,7 +973,5 @@ components: - etag - count securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml index ed2bd4a9..44f1ee2e 100644 --- a/data/api/client-server/keys.yaml +++ b/data/api/client-server/keys.yaml @@ -24,7 +24,6 @@ paths: description: Publishes end-to-end encryption keys for the device. operationId: uploadKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -117,7 +116,6 @@ paths: description: Returns the current devices and identity keys for the given users. operationId: queryKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -306,7 +304,6 @@ paths: the same key. operationId: claimKeys security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -405,7 +402,6 @@ paths: identity keys, between `from` and `to`. operationId: getKeysChanges security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -476,7 +472,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/kicking.yaml b/data/api/client-server/kicking.yaml index 6b2c1af1..cb0ece2b 100644 --- a/data/api/client-server/kicking.yaml +++ b/data/api/client-server/kicking.yaml @@ -29,7 +29,6 @@ paths: the target member's state by making a request to `/rooms//state/m.room.member/`. operationId: kick security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -108,7 +107,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/knocking.yaml b/data/api/client-server/knocking.yaml index b0dbe934..8f9e03c3 100644 --- a/data/api/client-server/knocking.yaml +++ b/data/api/client-server/knocking.yaml @@ -38,7 +38,6 @@ paths: [`/sync`](/client-server-api/#get_matrixclientv3sync) API. operationId: knockRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -155,7 +154,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/leaving.yaml b/data/api/client-server/leaving.yaml index a3351e2d..c58a7710 100644 --- a/data/api/client-server/leaving.yaml +++ b/data/api/client-server/leaving.yaml @@ -44,7 +44,6 @@ paths: to see. operationId: leaveRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -105,7 +104,6 @@ paths: before calling this API. operationId: forgetRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -161,7 +159,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/list_joined_rooms.yaml b/data/api/client-server/list_joined_rooms.yaml index 1c24e122..b2281b4d 100644 --- a/data/api/client-server/list_joined_rooms.yaml +++ b/data/api/client-server/list_joined_rooms.yaml @@ -22,7 +22,6 @@ paths: description: This API returns a list of the user's current rooms. operationId: getJoinedRooms security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -64,7 +63,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/list_public_rooms.yaml b/data/api/client-server/list_public_rooms.yaml index b57ecc8d..dbd0e088 100644 --- a/data/api/client-server/list_public_rooms.yaml +++ b/data/api/client-server/list_public_rooms.yaml @@ -76,7 +76,6 @@ paths: or a server administrator. operationId: setRoomVisibilityOnDirectory security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -189,7 +188,6 @@ paths: stable order is recommended. operationId: queryPublicRooms security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -288,7 +286,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/login_token.yaml b/data/api/client-server/login_token.yaml index f14e1a0a..695b633e 100644 --- a/data/api/client-server/login_token.yaml +++ b/data/api/client-server/login_token.yaml @@ -53,7 +53,6 @@ paths: operationId: generateLoginToken x-addedInMatrixVersion: "1.7" security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -132,7 +131,5 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/logout.yaml b/data/api/client-server/logout.yaml index 3377171b..bca9e0fe 100644 --- a/data/api/client-server/logout.yaml +++ b/data/api/client-server/logout.yaml @@ -25,7 +25,6 @@ paths: [Device keys](/client-server-api/#device-keys) for the device are deleted alongside the device. operationId: logout security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -54,7 +53,6 @@ paths: this way. operationId: logout_all security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -80,7 +78,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/message_pagination.yaml b/data/api/client-server/message_pagination.yaml index c26f461d..b2b7292f 100644 --- a/data/api/client-server/message_pagination.yaml +++ b/data/api/client-server/message_pagination.yaml @@ -27,7 +27,6 @@ paths: [Lazy-loading room members](/client-server-api/#lazy-loading-room-members) for more information. operationId: getRoomEvents security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -188,7 +187,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/mutual_rooms.yaml b/data/api/client-server/mutual_rooms.yaml index 2d764e6c..9ae0a50f 100644 --- a/data/api/client-server/mutual_rooms.yaml +++ b/data/api/client-server/mutual_rooms.yaml @@ -25,7 +25,6 @@ paths: specified `user_id`. operationId: getMutualRooms security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -121,7 +120,5 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/notifications.yaml b/data/api/client-server/notifications.yaml index 03db22af..f41bf522 100644 --- a/data/api/client-server/notifications.yaml +++ b/data/api/client-server/notifications.yaml @@ -24,7 +24,6 @@ paths: user has been, or would have been notified about. operationId: getNotifications security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -146,7 +145,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/old_sync.yaml b/data/api/client-server/old_sync.yaml index b07c73f1..e63f6999 100644 --- a/data/api/client-server/old_sync.yaml +++ b/data/api/client-server/old_sync.yaml @@ -29,7 +29,6 @@ paths: the [migration guide](https://matrix.org/docs/guides/migrating-from-client-server-api-v-1#deprecated-endpoints). operationId: getEvents security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -100,7 +99,6 @@ paths: the [migration guide](https://matrix.org/docs/guides/migrating-from-client-server-api-v-1#deprecated-endpoints). operationId: initialSync security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -329,7 +327,6 @@ paths: or the [/rooms/{roomId}/context/{eventId}](/client-server-api/#get_matrixclientv3roomsroomidcontexteventid) API. operationId: getOneEvent security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -373,7 +370,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/openid.yaml b/data/api/client-server/openid.yaml index a65f9fef..9307c52b 100644 --- a/data/api/client-server/openid.yaml +++ b/data/api/client-server/openid.yaml @@ -30,7 +30,6 @@ paths: example. operationId: requestOpenIdToken security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -92,7 +91,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/password_management.yaml b/data/api/client-server/password_management.yaml index 3a1a570e..0c00c679 100644 --- a/data/api/client-server/password_management.yaml +++ b/data/api/client-server/password_management.yaml @@ -40,7 +40,6 @@ paths: to determine if this endpoint is available. security: - {} - - accessTokenQuery: [] - accessTokenBearer: [] operationId: changePassword requestBody: @@ -240,7 +239,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/peeking_events.yaml b/data/api/client-server/peeking_events.yaml index 5867baa7..55e7ddb2 100644 --- a/data/api/client-server/peeking_events.yaml +++ b/data/api/client-server/peeking_events.yaml @@ -34,7 +34,6 @@ paths: yet known. operationId: peekEvents security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -116,7 +115,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/presence.yaml b/data/api/client-server/presence.yaml index d3141911..d2c3d668 100644 --- a/data/api/client-server/presence.yaml +++ b/data/api/client-server/presence.yaml @@ -26,7 +26,6 @@ paths: presence state of another user. operationId: setPresence security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -83,7 +82,6 @@ paths: description: Get the given user's presence state. operationId: getPresence security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -163,7 +161,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/profile.yaml b/data/api/client-server/profile.yaml index 5e66f1a9..61b27200 100644 --- a/data/api/client-server/profile.yaml +++ b/data/api/client-server/profile.yaml @@ -36,7 +36,6 @@ paths: which `keyName`s they are allowed to modify. operationId: setProfileField security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -210,7 +209,6 @@ paths: description: Remove a specific field from a user's profile. operationId: deleteProfileField security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -368,7 +366,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/pusher.yaml b/data/api/client-server/pusher.yaml index 0e3b7648..d2834a13 100644 --- a/data/api/client-server/pusher.yaml +++ b/data/api/client-server/pusher.yaml @@ -23,7 +23,6 @@ paths: description: Gets all currently active pushers for the authenticated user. operationId: getPushers security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -137,7 +136,6 @@ paths: user is deleted. operationId: postPusher security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -297,7 +295,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/pushrules.yaml b/data/api/client-server/pushrules.yaml index fd56f46e..d79caba4 100644 --- a/data/api/client-server/pushrules.yaml +++ b/data/api/client-server/pushrules.yaml @@ -24,7 +24,6 @@ paths: defined is `global`. operationId: getPushRules security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -51,7 +50,6 @@ paths: Retrieve all push rules for this user. operationId: getPushRulesGlobal security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -68,7 +66,6 @@ paths: description: Retrieve a single specified push rule. operationId: getPushRule security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -133,7 +130,6 @@ paths: description: This endpoint removes the push rule defined in the path. operationId: deletePushRule security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -203,7 +199,6 @@ paths: When creating push rules, they MUST be enabled by default. operationId: setPushRule security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -333,7 +328,6 @@ paths: description: This endpoint gets whether the specified push rule is enabled. operationId: isPushRuleEnabled security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -396,7 +390,6 @@ paths: push rule. operationId: setPushRuleEnabled security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -468,7 +461,6 @@ paths: description: This endpoint get the actions for the specified push rule. operationId: getPushRuleActions security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -540,7 +532,6 @@ paths: This can be used to change the actions of builtin rules. operationId: setPushRuleActions security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -627,7 +618,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/read_markers.yaml b/data/api/client-server/read_markers.yaml index ba2f4f0b..9cfa730a 100644 --- a/data/api/client-server/read_markers.yaml +++ b/data/api/client-server/read_markers.yaml @@ -25,7 +25,6 @@ paths: the read receipt's location. operationId: setReadMarker security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -97,7 +96,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/receipts.yaml b/data/api/client-server/receipts.yaml index 40f581d3..34082452 100644 --- a/data/api/client-server/receipts.yaml +++ b/data/api/client-server/receipts.yaml @@ -25,7 +25,6 @@ paths: specified. operationId: postReceipt security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -138,7 +137,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/redaction.yaml b/data/api/client-server/redaction.yaml index 0e9ff7f9..242a68e5 100644 --- a/data/api/client-server/redaction.yaml +++ b/data/api/client-server/redaction.yaml @@ -33,7 +33,6 @@ paths: Server administrators may redact events sent by users on their server. operationId: redactEvent security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -110,7 +109,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/relations.yaml b/data/api/client-server/relations.yaml index c59c5cb0..ce8c6872 100644 --- a/data/api/client-server/relations.yaml +++ b/data/api/client-server/relations.yaml @@ -31,7 +31,6 @@ paths: page 1 and a `to` token from page 2 to paginate over the same range, however. operationId: getRelatingEvents security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/roomId' @@ -89,7 +88,6 @@ paths: page 1 and a `to` token from page 2 to paginate over the same range, however. operationId: getRelatingEventsWithRelType security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/roomId' @@ -151,7 +149,6 @@ paths: page 1 and a `to` token from page 2 to paginate over the same range, however. operationId: getRelatingEventsWithRelTypeAndEventType security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - $ref: '#/components/parameters/roomId' @@ -220,8 +217,6 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer parameters: diff --git a/data/api/client-server/report_content.yaml b/data/api/client-server/report_content.yaml index fd59c7d1..a7500ba6 100644 --- a/data/api/client-server/report_content.yaml +++ b/data/api/client-server/report_content.yaml @@ -59,7 +59,6 @@ paths: - reason required: true security: - - accessTokenQuery: [] - accessTokenBearer: [] x-changedInMatrixVersion: 1.18: | @@ -143,7 +142,6 @@ paths: description: The reason the content is being reported. required: true security: - - accessTokenQuery: [] - accessTokenBearer: [] x-changedInMatrixVersion: 1.8: | @@ -228,7 +226,6 @@ paths: - reason required: true security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -277,7 +274,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/room_event_by_timestamp.yaml b/data/api/client-server/room_event_by_timestamp.yaml index c47c301e..b4b5a58e 100644 --- a/data/api/client-server/room_event_by_timestamp.yaml +++ b/data/api/client-server/room_event_by_timestamp.yaml @@ -46,7 +46,6 @@ paths: found in that direction is outside of the expected range. operationId: getEventByTimestamp security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -141,7 +140,5 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/room_initial_sync.yaml b/data/api/client-server/room_initial_sync.yaml index b9ab45ec..491ddd51 100644 --- a/data/api/client-server/room_initial_sync.yaml +++ b/data/api/client-server/room_initial_sync.yaml @@ -17,7 +17,6 @@ paths: [migration guide](https://matrix.org/docs/guides/migrating-from-client-server-api-v-1#deprecated-endpoints). operationId: roomInitialSync security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -182,7 +181,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/room_send.yaml b/data/api/client-server/room_send.yaml index a9e35ba5..bad2b7ee 100644 --- a/data/api/client-server/room_send.yaml +++ b/data/api/client-server/room_send.yaml @@ -39,7 +39,6 @@ paths: the event. operationId: sendMessage security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -124,7 +123,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/room_state.yaml b/data/api/client-server/room_state.yaml index d2b14bfe..f2d42e92 100644 --- a/data/api/client-server/room_state.yaml +++ b/data/api/client-server/room_state.yaml @@ -39,7 +39,6 @@ paths: being removed or are already present in the state event. operationId: setRoomStateWithKey security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -153,7 +152,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/room_upgrades.yaml b/data/api/client-server/room_upgrades.yaml index 7e3ceff9..b0004610 100644 --- a/data/api/client-server/room_upgrades.yaml +++ b/data/api/client-server/room_upgrades.yaml @@ -22,7 +22,6 @@ paths: description: Upgrades the given room to a particular room version. operationId: upgradeRoom security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -124,7 +123,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/rooms.yaml b/data/api/client-server/rooms.yaml index 87991da5..bc6da67e 100644 --- a/data/api/client-server/rooms.yaml +++ b/data/api/client-server/rooms.yaml @@ -24,7 +24,6 @@ paths: retrieve this event e.g. by being a member in the room for this event. operationId: getOneRoomEvent security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -83,7 +82,6 @@ paths: taken from the state of the room when they left. operationId: getRoomStateWithKey security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -154,7 +152,6 @@ paths: description: Get the state events for the current state of a room. operationId: getRoomState security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -265,7 +262,6 @@ paths: - leave - ban security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -318,7 +314,6 @@ paths: format: mx-room-id pattern: "^!" security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -375,7 +370,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/search.yaml b/data/api/client-server/search.yaml index 4b8f48e6..bd92cd94 100644 --- a/data/api/client-server/search.yaml +++ b/data/api/client-server/search.yaml @@ -22,7 +22,6 @@ paths: description: Performs a full text search across different categories. operationId: search security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -380,7 +379,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/space_hierarchy.yaml b/data/api/client-server/space_hierarchy.yaml index 5f6657a2..2e602dbb 100644 --- a/data/api/client-server/space_hierarchy.yaml +++ b/data/api/client-server/space_hierarchy.yaml @@ -30,7 +30,6 @@ paths: Invalid child rooms and parent events are not covered by this endpoint. operationId: getSpaceHierarchy security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -231,7 +230,5 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/sync.yaml b/data/api/client-server/sync.yaml index c7791940..bdbb0a30 100644 --- a/data/api/client-server/sync.yaml +++ b/data/api/client-server/sync.yaml @@ -44,7 +44,6 @@ paths: events, alongside other state, when lazy-loading is not enabled. operationId: sync security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -686,7 +685,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/tags.yaml b/data/api/client-server/tags.yaml index ad572aba..ff2b183d 100644 --- a/data/api/client-server/tags.yaml +++ b/data/api/client-server/tags.yaml @@ -23,7 +23,6 @@ paths: description: List the tags set by a user on a room. operationId: getRoomTags security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -75,7 +74,6 @@ paths: description: Add a tag to the room. operationId: setRoomTag security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -125,7 +123,6 @@ paths: description: Remove a tag from the room. operationId: deleteRoomTag security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -177,7 +174,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/third_party_lookup.yaml b/data/api/client-server/third_party_lookup.yaml index 32adb094..139333c5 100644 --- a/data/api/client-server/third_party_lookup.yaml +++ b/data/api/client-server/third_party_lookup.yaml @@ -25,7 +25,6 @@ paths: required for queries against each protocol. operationId: getProtocols security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -101,7 +100,6 @@ paths: third-party protocol. operationId: getProtocolMetadata security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -145,7 +143,6 @@ paths: as reasonably possible given the network type. operationId: queryLocationByProtocol security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -192,7 +189,6 @@ paths: a set of user parameters. operationId: queryUserByProtocol security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -238,7 +234,6 @@ paths: alias. operationId: queryLocationByAlias security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -274,7 +269,6 @@ paths: description: Retrieve an array of third-party users from a Matrix User ID. operationId: queryUserByID security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -318,7 +312,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/third_party_membership.yaml b/data/api/client-server/third_party_membership.yaml index 87b47e1d..e23cb5a4 100644 --- a/data/api/client-server/third_party_membership.yaml +++ b/data/api/client-server/third_party_membership.yaml @@ -59,7 +59,6 @@ paths: - The matrix user ID who invited them to the room operationId: inviteBy3PID security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -133,7 +132,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/threads_list.yaml b/data/api/client-server/threads_list.yaml index 1f16dde2..3faf3648 100644 --- a/data/api/client-server/threads_list.yaml +++ b/data/api/client-server/threads_list.yaml @@ -27,7 +27,6 @@ paths: user has participated in the thread. operationId: getThreadRoots security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -161,7 +160,5 @@ servers: default: /_matrix/client/v1 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/to_device.yaml b/data/api/client-server/to_device.yaml index cea23ab7..265edff5 100644 --- a/data/api/client-server/to_device.yaml +++ b/data/api/client-server/to_device.yaml @@ -24,7 +24,6 @@ paths: client devices. operationId: sendToDevice security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -98,7 +97,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/typing.yaml b/data/api/client-server/typing.yaml index 9b0d1653..1e38be97 100644 --- a/data/api/client-server/typing.yaml +++ b/data/api/client-server/typing.yaml @@ -26,7 +26,6 @@ paths: user has stopped typing. operationId: setTyping security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: path @@ -101,7 +100,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/users.yaml b/data/api/client-server/users.yaml index 2531678f..cf1477bb 100644 --- a/data/api/client-server/users.yaml +++ b/data/api/client-server/users.yaml @@ -39,7 +39,6 @@ paths: `Accept-Language` header provided in the request, if present. operationId: searchUserDirectory security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -133,7 +132,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/versions.yaml b/data/api/client-server/versions.yaml index bf4353f2..c7194e0c 100644 --- a/data/api/client-server/versions.yaml +++ b/data/api/client-server/versions.yaml @@ -45,7 +45,6 @@ paths: operationId: getVersions security: - {} - - accessTokenQuery: [] - accessTokenBearer: [] x-changedInMatrixVersion: "1.10": | @@ -102,7 +101,5 @@ servers: default: /_matrix/client components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/voip.yaml b/data/api/client-server/voip.yaml index 58510706..b0677f89 100644 --- a/data/api/client-server/voip.yaml +++ b/data/api/client-server/voip.yaml @@ -24,7 +24,6 @@ paths: calls. operationId: getTurnServer security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -89,7 +88,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/client-server/whoami.yaml b/data/api/client-server/whoami.yaml index 55e5cb79..63d3682e 100644 --- a/data/api/client-server/whoami.yaml +++ b/data/api/client-server/whoami.yaml @@ -30,7 +30,6 @@ paths: body. operationId: getTokenOwner security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -115,7 +114,5 @@ servers: default: /_matrix/client/v3 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/definitions/security.yaml b/data/api/identity/definitions/security.yaml index 598005b7..4428aea2 100644 --- a/data/api/identity/definitions/security.yaml +++ b/data/api/identity/definitions/security.yaml @@ -11,18 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -accessTokenQuery: - type: apiKey - description: |- - **Deprecated.** The `access_token` returned by a call to `/register`, as a - query parameter. - name: access_token - in: query accessTokenBearer: type: http description: |- The `access_token` returned by a call to `/register`, using the `Authorization: Bearer` header. - - This is the preferred method. scheme: bearer diff --git a/data/api/identity/v2_associations.yaml b/data/api/identity/v2_associations.yaml index 73de676e..7f29a735 100644 --- a/data/api/identity/v2_associations.yaml +++ b/data/api/identity/v2_associations.yaml @@ -23,7 +23,6 @@ paths: description: Determines if a given 3pid has been validated by a user. operationId: getValidated3pidV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -129,7 +128,6 @@ paths: deprecated. operationId: bindV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -281,7 +279,6 @@ paths: homeserver is acting on behalf of a client. operationId: unbindV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -386,7 +383,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_auth.yaml b/data/api/identity/v2_auth.yaml index cb41cdab..3811768c 100644 --- a/data/api/identity/v2_auth.yaml +++ b/data/api/identity/v2_auth.yaml @@ -58,7 +58,6 @@ paths: request. operationId: getAccount security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -100,7 +99,6 @@ paths: future requests to the server. operationId: logout security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -152,7 +150,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_email_associations.yaml b/data/api/identity/v2_email_associations.yaml index da6c9c1b..c804a275 100644 --- a/data/api/identity/v2_email_associations.yaml +++ b/data/api/identity/v2_email_associations.yaml @@ -40,7 +40,6 @@ paths: deprecated. operationId: emailRequestTokenV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -108,7 +107,6 @@ paths: deprecated. operationId: emailSubmitTokenPostV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -200,7 +198,6 @@ paths: used by end-users, and so the response should be human-readable. operationId: emailSubmitTokenGetV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -263,7 +260,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_invitation_signing.yaml b/data/api/identity/v2_invitation_signing.yaml index 104cafd6..37171773 100644 --- a/data/api/identity/v2_invitation_signing.yaml +++ b/data/api/identity/v2_invitation_signing.yaml @@ -27,7 +27,6 @@ paths: to `store-invite`, and fetch the sender of the invite. operationId: blindlySignStuffV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -133,7 +132,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_lookup.yaml b/data/api/identity/v2_lookup.yaml index e3c7985f..5c68aa67 100644 --- a/data/api/identity/v2_lookup.yaml +++ b/data/api/identity/v2_lookup.yaml @@ -28,7 +28,6 @@ paths: any of the algorithms defined in this specification. operationId: getHashDetails security: - - accessTokenQuery: [] - accessTokenBearer: [] responses: "200": @@ -71,7 +70,6 @@ paths: later in this specification. operationId: lookupUsersV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -164,7 +162,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_phone_associations.yaml b/data/api/identity/v2_phone_associations.yaml index 5ebf58bc..06bef51a 100644 --- a/data/api/identity/v2_phone_associations.yaml +++ b/data/api/identity/v2_phone_associations.yaml @@ -40,7 +40,6 @@ paths: deprecated. operationId: msisdnRequestTokenV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -110,7 +109,6 @@ paths: deprecated. operationId: msisdnSubmitTokenPostV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -202,7 +200,6 @@ paths: used by end-users, and so the response should be human-readable. operationId: msisdnSubmitTokenGetV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] parameters: - in: query @@ -264,7 +261,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_store_invite.yaml b/data/api/identity/v2_store_invite.yaml index e3c7871d..c1a74d49 100644 --- a/data/api/identity/v2_store_invite.yaml +++ b/data/api/identity/v2_store_invite.yaml @@ -51,7 +51,6 @@ paths: the `address` of the pending invite for display purposes. operationId: storeInviteV2 security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -235,7 +234,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer diff --git a/data/api/identity/v2_terms.yaml b/data/api/identity/v2_terms.yaml index d7c231d4..020d4e2c 100644 --- a/data/api/identity/v2_terms.yaml +++ b/data/api/identity/v2_terms.yaml @@ -118,7 +118,6 @@ paths: may not be accepting all terms at once. operationId: agreeToTerms security: - - accessTokenQuery: [] - accessTokenBearer: [] requestBody: content: @@ -159,7 +158,5 @@ servers: default: /_matrix/identity/v2 components: securitySchemes: - accessTokenQuery: - $ref: definitions/security.yaml#/accessTokenQuery accessTokenBearer: $ref: definitions/security.yaml#/accessTokenBearer