c2s: Make allOf and description siblings throughout the PR

The overall mess with allOf will be addressed separately; this PR just
puts $ref under allOf to fix the glaring misuse of $ref objects.
pull/977/head
Kitsune Ral 5 years ago
parent 48af2e5b47
commit 3b5340539d

@ -201,10 +201,10 @@ 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. user-interactive authentication API.
allOf:
- $ref: "definitions/auth_data.yaml" - $ref: "definitions/auth_data.yaml"
client_secret: client_secret:
type: string type: string

@ -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:
allOf:
- type: object
description: |- description: |-
Optional client configuration provided by the server. If present, Optional client configuration provided by the server. If present,
clients SHOULD use the provided object to reconfigure themselves, clients SHOULD use the provided object to reconfigure themselves,
optionally validating the URLs within. This object takes the same optionally validating the URLs within. This object takes the same
form as the one returned from .well-known autodiscovery. form as the one returned from .well-known autodiscovery.
allOf:
- "$ref": "definitions/wellknown/full.yaml" - "$ref": "definitions/wellknown/full.yaml"
400: 400:
description: |- description: |-

@ -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:

Loading…
Cancel
Save