Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix POST _matrix/federation/v1/user/keys/claim response schema #1351

Merged
merged 2 commits into from Nov 22, 2022

Conversation

zecakeh
Copy link
Contributor

@zecakeh zecakeh commented Nov 17, 2022

The syntax was not compliant with the Swagger spec (the type field cannot be an array).

It also lacked one level of nesting (or maybe that's what the syntax was trying to do).

This is a prerequisite for #1310.

Signed-off-by: Kévin Commaille zecakeh@tedomum.fr

Preview: https://pr1351--matrix-spec-previews.netlify.app

The syntax was not compliant with the Swagger spec.
It also lacked one level of nesting.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh zecakeh requested a review from a team as a code owner November 17, 2022 17:31
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh zecakeh mentioned this pull request Nov 17, 2022
4 tasks
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good. thanks!

@richvdh richvdh merged commit dfc8a2e into matrix-org:main Nov 22, 2022
@zecakeh zecakeh deleted the user_keys-response branch November 28, 2022 11:38
@KitsuneRal
Copy link
Member

Sorry for taking time to catch up with this - actually, passing an array for type is yet another of our extensions for Swagger 2, as it doesn't have oneOf. The fix of nesting is correct (the added comments really help to navigate a stack of additionalProperties...) - but the definition still needs the string type alternative next to KeyObject. I guess it's best to just not forget to fix that in #1310.

clokep pushed a commit to clokep/matrix-spec that referenced this pull request May 3, 2023
…rix-org#1351)

The syntax was not compliant with the Swagger spec.
It also lacked one level of nesting.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants