imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/oidc-config

Browse source
This commit is contained in:
Michael Telatynski 2024-05-13 17:49:02 +01:00
commit 706f4c6e20
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
4 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/vector/platform/ElectronPlatform.tsx
View file

@ -57,8 +57,6 @@ interface SquirrelUpdate {
updateURL: string;
}
const LEGACY_PROTOCOL = "element";
const OIDC_PROTOCOL = "io.element.desktop";
const SSO_ID_KEY = "element-desktop-ssoid";
const isMac = navigator.platform.toUpperCase().includes("MAC");
@ -381,7 +379,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
public getSSOCallbackUrl(fragmentAfterLogin?: string): URL {
const url = super.getSSOCallbackUrl(fragmentAfterLogin);
url.protocol = LEGACY_PROTOCOL;
url.protocol = "element";
url.searchParams.set(SSO_ID_KEY, this.ssoID);
return url;
}
@ -468,7 +466,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
*/
public getOidcCallbackUrl(): URL {
const url = super.getOidcCallbackUrl();
url.protocol = OIDC_PROTOCOL;
url.protocol = "io.element.desktop";
return url;
}
}