nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Michael Telatynski
2024-11-22 11:52:32 +00:00
parent e0e522a0e9 8df26a54cf
commit 7d20bd4d06
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,10 +474,8 @@ export default class ElectronPlatform extends BasePlatform {
const url = super.getOidcCallbackUrl(); const url = super.getOidcCallbackUrl();
url.protocol = "io.element.desktop"; url.protocol = "io.element.desktop";
// Trim the double slash into a single slash to comply with https://datatracker.ietf.org/doc/html/rfc8252#section-7.1 // Trim the double slash into a single slash to comply with https://datatracker.ietf.org/doc/html/rfc8252#section-7.1
// Chrome seems to have a strange issue where non-standard protocols prevent URL object mutations on pathname if (url.href.startsWith(`${url.protocol}://`)) {
// field, so we cannot mutate `pathname` reliably and instead have to rewrite the href manually. url.href = url.href.replace("://", ":/");
if (url.pathname.startsWith("//")) {
url.href = url.href.replace(url.pathname, url.pathname.slice(1));
} }
return url; return url;
} }