mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-04-26 20:44:10 +02:00
Compare commits
2 commits
2192bfa996
...
156d1b878a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
156d1b878a | ||
|
|
9c014a9045 |
|
|
@ -0,0 +1 @@
|
||||||
|
Clarify SAS commitment calculation for `m.key.verification.accept` messages.
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Fix ordering of common error codes.
|
||||||
|
|
@ -126,6 +126,25 @@ state (e.g.: sending messages, account data, etc) and not routes which
|
||||||
only read state (e.g.: [`/sync`](#get_matrixclientv3sync),
|
only read state (e.g.: [`/sync`](#get_matrixclientv3sync),
|
||||||
[`/user/{userId}/account_data/{type}`](#get_matrixclientv3useruseridaccount_datatype), etc).
|
[`/user/{userId}/account_data/{type}`](#get_matrixclientv3useruseridaccount_datatype), etc).
|
||||||
|
|
||||||
|
`M_UNKNOWN`
|
||||||
|
: An unknown error has occurred.
|
||||||
|
|
||||||
|
`M_UNKNOWN_DEVICE`
|
||||||
|
: {{% added-in v="1.17" %}} The device ID supplied by the application service does
|
||||||
|
not belong to the user ID during [identity assertion](/application-service-api/#identity-assertion).
|
||||||
|
|
||||||
|
`M_UNKNOWN_TOKEN`
|
||||||
|
: The access or refresh token specified was not recognised.
|
||||||
|
|
||||||
|
: An additional response parameter, `soft_logout`, might be present on the
|
||||||
|
response for 401 HTTP status codes. See [the soft logout
|
||||||
|
section](#soft-logout) for more information.
|
||||||
|
|
||||||
|
`M_UNRECOGNIZED`
|
||||||
|
: The server did not understand the request. This is expected to be returned with
|
||||||
|
a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status
|
||||||
|
code if the endpoint is implemented, but the incorrect HTTP method is used.
|
||||||
|
|
||||||
`M_USER_LIMIT_EXCEEDED`
|
`M_USER_LIMIT_EXCEEDED`
|
||||||
: {{% added-in v="1.18" %}} The request cannot be completed because the user has
|
: {{% added-in v="1.18" %}} The request cannot be completed because the user has
|
||||||
exceeded (or the request would cause them to exceed) a limit associated with
|
exceeded (or the request would cause them to exceed) a limit associated with
|
||||||
|
|
@ -157,25 +176,6 @@ limit is a hard limit that cannot be increased.
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
`M_UNKNOWN`
|
|
||||||
: An unknown error has occurred.
|
|
||||||
|
|
||||||
`M_UNKNOWN_DEVICE`
|
|
||||||
: {{% added-in v="1.17" %}} The device ID supplied by the application service does
|
|
||||||
not belong to the user ID during [identity assertion](/application-service-api/#identity-assertion).
|
|
||||||
|
|
||||||
`M_UNKNOWN_TOKEN`
|
|
||||||
: The access or refresh token specified was not recognised.
|
|
||||||
|
|
||||||
: An additional response parameter, `soft_logout`, might be present on the
|
|
||||||
response for 401 HTTP status codes. See [the soft logout
|
|
||||||
section](#soft-logout) for more information.
|
|
||||||
|
|
||||||
`M_UNRECOGNIZED`
|
|
||||||
: The server did not understand the request. This is expected to be returned with
|
|
||||||
a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status
|
|
||||||
code if the endpoint is implemented, but the incorrect HTTP method is used.
|
|
||||||
|
|
||||||
`M_USER_LOCKED`
|
`M_USER_LOCKED`
|
||||||
: The account has been [locked](#account-locking) and cannot be used at this time.
|
: The account has been [locked](#account-locking) and cannot be used at this time.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,8 @@ properties:
|
||||||
description: |-
|
description: |-
|
||||||
The hash (encoded as unpadded base64) of the concatenation of the device's
|
The hash (encoded as unpadded base64) of the concatenation of the device's
|
||||||
ephemeral public key (encoded as unpadded base64) and the canonical JSON
|
ephemeral public key (encoded as unpadded base64) and the canonical JSON
|
||||||
representation of the `m.key.verification.start` message.
|
representation of the `content` object of the `m.key.verification.start`
|
||||||
|
message.
|
||||||
m.relates_to:
|
m.relates_to:
|
||||||
$ref: m.key.verification.m.relates_to.yaml
|
$ref: m.key.verification.m.relates_to.yaml
|
||||||
required:
|
required:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue