Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2025-12-20 16:38:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

c2s: Make allOf and description siblings throughout the PR

Browse source 
The overall mess with allOf will be addressed separately; this PR just
puts $ref under allOf to fix the glaring misuse of $ref objects.
This commit is contained in:
Kitsune Ral 2020-05-28 14:40:29 +02:00
parent 48af2e5b47
commit 3b5340539d
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/client-server/administrative_contact.yaml
View file

@ -201,10 +201,10 @@ paths:
type: object type: object
properties: properties:
auth: auth:
description: |-
Additional authentication information for the
user-interactive authentication API.
allOf: allOf:
- description: |-
Additional authentication information for the
user-interactive authentication API.
- $ref: "definitions/auth_data.yaml" - $ref: "definitions/auth_data.yaml"
client_secret: client_secret:
type: string type: string

11
api/client-server/login.yaml
View file

@ -175,13 +175,12 @@ paths:
ID of the logged-in device. Will be the same as the ID of the logged-in device. Will be the same as the
corresponding parameter in the request, if one was specified. corresponding parameter in the request, if one was specified.
well_known: well_known:
description: |-
Optional client configuration provided by the server. If present,
clients SHOULD use the provided object to reconfigure themselves,
optionally validating the URLs within. This object takes the same
form as the one returned from .well-known autodiscovery.
allOf: allOf:
- type: object
description: |-
Optional client configuration provided by the server. If present,
clients SHOULD use the provided object to reconfigure themselves,
optionally validating the URLs within. This object takes the same
form as the one returned from .well-known autodiscovery.
- "$ref": "definitions/wellknown/full.yaml" - "$ref": "definitions/wellknown/full.yaml"
400: 400:
description: |- description: |-

8
api/client-server/registration.yaml
View file

@ -89,13 +89,13 @@ paths:
type: object type: object
properties: properties:
auth: auth:
allOf: description: |-
- description: |-
Additional authentication information for the Additional authentication information for the
user-interactive authentication API. Note that this user-interactive authentication API. Note that this
information is *not* used to define how the registered user information is *not* used to define how the registered user
should be authenticated, but is instead used to should be authenticated, but is instead used to
authenticate the ``register`` call itself. authenticate the ``register`` call itself.
allOf:
- "$ref": "definitions/auth_data.yaml" - "$ref": "definitions/auth_data.yaml"
username: username:
type: string type: string
@ -347,9 +347,9 @@ paths:
description: The new password for the account. description: The new password for the account.
example: "ihatebananas" example: "ihatebananas"
auth: auth:
allOf: description: |-
- description: |-
Additional authentication information for the user-interactive authentication API. Additional authentication information for the user-interactive authentication API.
allOf:
- "$ref": "definitions/auth_data.yaml" - "$ref": "definitions/auth_data.yaml"
required: ["new_password"] required: ["new_password"]
responses: responses: