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

Use the right protocol for SSO URLs #14513

Merged
merged 1 commit into from
Jul 16, 2020
Merged

Use the right protocol for SSO URLs #14513

merged 1 commit into from
Jul 16, 2020

Conversation

turt2live
Copy link
Member

@turt2live turt2live commented Jul 15, 2020

Fixes #14517

@turt2live turt2live requested a review from a team July 15, 2020 23:05
@turt2live turt2live merged commit 8eac445 into develop Jul 16, 2020
@turt2live turt2live deleted the travis/fix-sso branch July 16, 2020 01:48
@t3chguy t3chguy mentioned this pull request Jul 16, 2020
@@ -502,7 +502,7 @@ export default class ElectronPlatform extends VectorBasePlatform {

getSSOCallbackUrl(fragmentAfterLogin: string): URL {
const url = super.getSSOCallbackUrl(fragmentAfterLogin);
url.protocol = "riot";
url.protocol = "element";
url.searchParams.set("riot-desktop-ssoid", this.ssoID);
Copy link
Contributor

Choose a reason for hiding this comment

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

This stays "riot-desktop-ssoid" for compatibility?

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch - will get this fixed

refi64 added a commit to refi64/riot-web-lc that referenced this pull request Jul 17, 2020
[Full Changelog](element-hq/element-web@v1.7.0...v1.7.1)
* Upgrade to React SDK 2.10.1
* Fix SSO session ID paramater
[\element-hq#14544](element-hq#14544)
* Run pngcrush on vector-icons
[\element-hq#14488](element-hq#14488)
* Fix hosting signup link
[\element-hq#14502](element-hq#14502)
* Use the right protocol for SSO URLs
[\element-hq#14513](element-hq#14513)
* Fix mstile-310x150 by renaming it
[\element-hq#14485](element-hq#14485)
* Update blog and twitter links to point to Element
[\element-hq#14478](element-hq#14478)
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.

SSO broken since rename of Riot and modular
3 participants