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

Allow store-invite servlet to handle args via query param or json body #291

Closed
wants to merge 1 commit into from

Conversation

anoadragon453
Copy link
Member

@anoadragon453 anoadragon453 commented Apr 21, 2020

Since at least IS spec r0.1.0, POST /_matrix/identity/api/v1/store-invite has sent invite parameters via JSON body.

Thus the code currently in the dinsic branch pulls from request.args which is an empty dict.

Things have been updated in the master branch to parse requests from both query parameter and json body using the get_args function, but the dinsic branch is still using query parameters only.

This PR ports the fix over from mainline.

CI is expected to fail on the dinsic branch.

@anoadragon453 anoadragon453 requested a review from a team April 21, 2020 15:21
@anoadragon453 anoadragon453 self-assigned this Apr 21, 2020
@anoadragon453
Copy link
Member Author

anoadragon453 commented Apr 22, 2020

As @babolivier mentioned, since the code from this PR is already in the mainline branch, it'll be brought in when we do the mainline->dinsic merge anyways.

So let's just cherry-pick the mainline commit instead to ease merging efforts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant