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

Remove duplicate slashes in generated consent URLs #4192

Merged
merged 3 commits into from Nov 16, 2018

Conversation

Projects
None yet
2 participants
@turt2live
Copy link
Member

turt2live commented Nov 16, 2018

public_baseurl will get a trailing slash when the config is read.

@turt2live turt2live requested a review from matrix-org/synapse-core Nov 16, 2018

@richvdh
Copy link
Member

richvdh left a comment

Yep I noticed that. It's a shame we have so many copies of this code and wonder if it should be factored out to the urlbuilder thing.

Lgtm anyway.

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Nov 16, 2018

Apart from the CI fail

@turt2live

This comment has been minimized.

Copy link
Member

turt2live commented Nov 16, 2018

well, at least the tests caught the change...

Will fix.

Fix the terms UI auth tests
By setting the config value directly, we skip the block that adds the slash automatically for us.

@turt2live turt2live merged commit 0bb273d into develop Nov 16, 2018

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@turt2live turt2live deleted the travis/fix-consent-urls branch Nov 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment