Merge branch 'master' into anoa/hs_3pid_tokens
* master: Update example Fix 404s in links from room v1 spec Provide a more complete example of a "minimally-sized event" Revert signature change for redactable event test Clarify how many PDUs are in a given transaction object Clarify that the server shouldn't process retries for UIA Clarify when authorization and rate-limiting are not applicable Skip over partial event definitions in examples Rename example to invite_room_state Shorten references to StrippedState in s2s spec Fix examples of StrippedState in s2s spec Clarify exactly what StrippedState is Clarify that UIA stages cannot be attempted twice Fix test vectors with invalid JSON and signature Spec 3PID unbind API Spec MSISDN UIA supportpull/977/head
Andrew Morgan
6 years ago
commit
62910a28cc
@ -0,0 +1,32 @@
|
|||||||
|
# Copyright 2019 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
|
||||||
|
allOf:
|
||||||
|
- $ref: "transaction.yaml"
|
||||||
|
properties:
|
||||||
|
pdus:
|
||||||
|
type: array
|
||||||
|
description: |-
|
||||||
|
A single PDU. Note that events have a different format depending on the room
|
||||||
|
version - check the `room version specification`_ for precise event formats.
|
||||||
|
items:
|
||||||
|
type: object
|
||||||
|
title: PDU
|
||||||
|
description: |-
|
||||||
|
The `PDUs <#pdus>`_ contained in the transaction. The event format varies depending
|
||||||
|
on the room version - check the `room version specification`_ for precise event formats.
|
||||||
|
properties: []
|
||||||
|
example:
|
||||||
|
$ref: "../examples/minimal_pdu.json"
|
||||||
|
required: ['origin', 'origin_server_ts', 'pdus']
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
# Copyright 2019 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
|
||||||
|
allOf:
|
||||||
|
- $ref: "transaction.yaml"
|
||||||
|
properties:
|
||||||
|
pdus:
|
||||||
|
type: array
|
||||||
|
description: |-
|
||||||
|
List of persistent updates to rooms. Note that events have a different format
|
||||||
|
depending on the room version - check the `room version specification`_ for
|
||||||
|
precise event formats.
|
||||||
|
items:
|
||||||
|
type: object
|
||||||
|
title: PDU
|
||||||
|
description: |-
|
||||||
|
The `PDUs <#pdus>`_ contained in the transaction. The event format varies depending
|
||||||
|
on the room version - check the `room version specification`_ for precise event formats.
|
||||||
|
properties: []
|
||||||
|
example:
|
||||||
|
$ref: "../examples/minimal_pdu.json"
|
||||||
|
required: ['origin', 'origin_server_ts', 'pdus']
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add MSISDN (phone number) support to User-Interactive Authentication.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add ``id_server`` to ``/deactivate`` and ``/3pid/delete`` endpoints to unbind from a specific identity server.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify that User-Interactive Authentication stages cannot be attempted more than once.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify exactly what invite_room_state consists of.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify when authorization and rate-limiting are not applicable.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add ``/3pid/unbind`` for removing 3PIDs.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify exactly what invite_room_state consists of.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify how many PDUs are contained in transaction objects for various endpoints.
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"type": "m.room.name",
|
||||||
|
"sender": "@bob:example.org",
|
||||||
|
"state_key": "",
|
||||||
|
"content": {
|
||||||
|
"name": "Example Room"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "m.room.join_rules",
|
||||||
|
"sender": "@bob:example.org",
|
||||||
|
"state_key": "",
|
||||||
|
"content": {
|
||||||
|
"join_rule": "invite"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
# Copyright 2019 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.
|
||||||
|
|
||||||
|
# Note: this, and the example, are in the `event-schemas` directory because
|
||||||
|
# the CS API uses a symlink. In order for the `m.room.member` event to
|
||||||
|
# reference this, we'd need to use relative pathing. The symlink makes this
|
||||||
|
# difficult because the schema would be at two different locations, with
|
||||||
|
# different relative pathing.
|
||||||
|
|
||||||
|
title: StrippedState
|
||||||
|
type: object
|
||||||
|
description: |-
|
||||||
|
A stripped down state event, with only the ``type``, ``state_key``,
|
||||||
|
``sender``, and ``content`` keys.
|
||||||
|
properties:
|
||||||
|
content:
|
||||||
|
description: The ``content`` for the event.
|
||||||
|
title: EventContent
|
||||||
|
type: object
|
||||||
|
state_key:
|
||||||
|
description: The ``state_key`` for the event.
|
||||||
|
type: string
|
||||||
|
type:
|
||||||
|
description: The ``type`` for the event.
|
||||||
|
type: string
|
||||||
|
sender:
|
||||||
|
description: The ``sender`` for the event.
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- type
|
||||||
|
- state_key
|
||||||
|
- content
|
||||||
|
- sender
|
||||||
Loading…
Reference in New Issue