Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 0904b35

Browse files
Half-Shothughns
authored andcommitted
Add warnings about MSC3861 on certain APIs. (#16168)
1 parent 3f32c41 commit 0904b35

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

changelog.d/16168.doc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Document which admin APIs are disabled when experimental [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) support is enabled.

docs/admin_api/account_validity.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Account validity API
22

3+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
4+
35
This API allows a server administrator to manage the validity of an account. To
46
use it, you must enable the account validity feature (under
57
`account_validity`) in Synapse's configuration.

docs/admin_api/register_api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Shared-Secret Registration
22

3+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
4+
35
This API allows for the creation of users in an administrative and
46
non-interactive way. This is generally used for bootstrapping a Synapse
57
instance with administrator accounts.

docs/admin_api/user_admin_api.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ The following parameters should be set in the URL:
218218
- `name` - Is optional and filters to only return users with user ID localparts
219219
**or** displaynames that contain this value.
220220
- `guests` - string representing a bool - Is optional and if `false` will **exclude** guest users.
221-
Defaults to `true` to include guest users.
221+
Defaults to `true` to include guest users. This parameter is not supported when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
222222
- `admins` - Optional flag to filter admins. If `true`, only admins are queried. If `false`, admins are excluded from
223223
the query. When the flag is absent (the default), **both** admins and non-admins are included in the search results.
224224
- `deactivated` - string representing a bool - Is optional and if `true` will **include** deactivated users.
@@ -390,6 +390,8 @@ The following actions are **NOT** performed. The list may be incomplete.
390390

391391
## Reset password
392392

393+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
394+
393395
Changes the password of another user. This will automatically log the user out of all their devices.
394396

395397
The api is:
@@ -413,6 +415,8 @@ The parameter `logout_devices` is optional and defaults to `true`.
413415

414416
## Get whether a user is a server administrator or not
415417

418+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
419+
416420
The api is:
417421

418422
```
@@ -430,6 +434,8 @@ A response body like the following is returned:
430434

431435
## Change whether a user is a server administrator or not
432436

437+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
438+
433439
Note that you cannot demote yourself.
434440

435441
The api is:
@@ -723,6 +729,8 @@ delete largest/smallest or newest/oldest files first.
723729

724730
## Login as a user
725731

732+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
733+
726734
Get an access token that can be used to authenticate as that user. Useful for
727735
when admins wish to do actions on behalf of a user.
728736

docs/usage/administration/admin_api/registration_tokens.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Registration Tokens
22

3+
**Note:** This API is disabled when MSC3861 is enabled. [See #15582](https://github.com/matrix-org/synapse/pull/15582)
4+
35
This API allows you to manage tokens which can be used to authenticate
46
registration requests, as proposed in
57
[MSC3231](https://github.com/matrix-org/matrix-doc/blob/main/proposals/3231-token-authenticated-registration.md)

0 commit comments

Comments
 (0)