Merge pull request element-hq#14513 from vector-im/travis/fix-sso

turt2live · web-flow · commit 8eac445ddc76 · 2020-07-15T19:48:17.000-06:00
Use the right protocol for SSO URLs
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
@@ -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);
         return url;
     }

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ export default class ElectronPlatform extends VectorBasePlatform {`
`502`	`502`
`503`	`503`	`getSSOCallbackUrl(fragmentAfterLogin: string): URL {`
`504`	`504`	`const url = super.getSSOCallbackUrl(fragmentAfterLogin);`
`505`		`- url.protocol = "riot";`
	`505`	`+ url.protocol = "element";`
`506`	`506`	`url.searchParams.set("riot-desktop-ssoid", this.ssoID);`
`507`	`507`	`return url;`
`508`	`508`	`}`