content/client-server-api/_index.md

@@ -2277,21 +2277,29 @@ in a browser.
 ##### Account management URL discovery
 
 The [OAuth 2.0 authorization server metadata](#server-metadata-discovery) is
-extended to include the following **optional** fields.
+extended to include the following fields:
 
-{{% definition path="schemas/oauth2-account-management-server-metadata" %}}
+| Field                                  | Description                                                                                     |
+|----------------------------------------|-------------------------------------------------------------------------------------------------|
+| `account_management_uri`               | The URL where the user is able to access the account management capabilities of the homeserver. |
+| `account_management_actions_supported` | An array of actions that the account management URL supports, as defined below.                 |
 
 ##### Account management URL parameters
 
-The account management URL MAY accept the following minimum query parameters.
+The account management URL MAY accept the following query parameters:
 
-{{% definition path="schemas/oauth2-account-management-url" %}}
+| Parameter   | Description                                                                                                                           |
+|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| `action`    | **Optional**. The action that the user wishes to take. Must match one of the actions in `account_management_actions_supported` above. |
+| `device_id` | **Optional**. Identifies a particular Matrix device ID for actions that support it.                                                   |
+
+If the `org.matrix.device_view` or `org.matrix.device_delete` actions are
+advertised as supported by the server then the server SHOULD support the
+`device_id` parameter.
 
 ##### Account management URL actions
 
-Account management actions are unique to the application. They SHOULD follow the
-[Common Namespaced Identifier Grammar](/appendices/#common-namespaced-identifier-grammar)
-where feasible. The Matrix-specific actions are:
+The following account management actions are defined:
 
 | Action                           | Description                                                                                                                                          |
 |----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------|

data/schemas/oauth2-account-management-action.yaml

@@ -1,22 +0,0 @@
-# Copyright 2026 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-type: string
-enum:
-  - "org.matrix.profile"
-  - "org.matrix.devices_list"
-  - "org.matrix.device_view"
-  - "org.matrix.device_delete"
-  - "org.matrix.account_deactivate"
-  - "org.matrix.cross_signing_reset"
-description: An action that the account management URL supports.

data/schemas/oauth2-account-management-server-metadata.yaml

@@ -1,29 +0,0 @@
-# Copyright 2026 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-type: object
-title: OAuth 2.0 Server Metadata Account Management Extension
-properties:
-  account_management_uri:
-    type: string
-    format: uri
-    description: |-
-      The URL where the user is able to access the account management capabilities of the
-      homeserver.
-  account_management_actions_supported:
-    type: array
-    description: |-
-      List of [actions](/client-server-api/#account-management-url-actions) that the account
-      management URL supports.
-    items:
-      $ref: ./oauth2-account-management-action.yaml

data/schemas/oauth2-account-management-url.yaml

@@ -1,29 +0,0 @@
-# Copyright 2026 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-type: object
-title: OAuth 2.0 Account Management URL Query Parameters
-properties:
-  action:
-    $ref: ./oauth2-account-management-action.yaml
-    description: |-
-      The action that the user wishes to take. Must match one of the actions advertised by the
-      server in [`account_management_actions_supported`](/client-server-api/#account-management-url-discovery).
-  device_id:
-    type: string
-    description: |-
-      For Matrix-specific actions, the user's device ID. Actions which don't support the device ID
-      will ignore it.
-
-      If the `org.matrix.device_view` or `org.matrix.device_delete` actions are advertised as
-      supported by the server then the server SHOULD support the `device_id` parameter.