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

Support build-time specified protocol scheme for oidc callback (#29814)

Browse Source 
* Support build-time specified protocol scheme for oidc callback

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Add tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2025-05-22 11:24:53 +01:00
committed by GitHub
parent bd142412e5
commit f5125ac2b8
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ import {
type OidcRegistrationClientMetadata,
} from "matrix-js-sdk/src/matrix";
import React from "react";
import { secureRandomString } from "matrix-js-sdk/src/randomstring";
import { logger } from "matrix-js-sdk/src/logger";
import BasePlatform, { UpdateCheckStatus, type UpdateStatus } from "../../BasePlatform";
@@ -97,8 +96,10 @@ function getUpdateCheckStatus(status: boolean | string): UpdateStatus {
export default class ElectronPlatform extends BasePlatform {
private readonly ipc = new IPCManager("ipcCall", "ipcReply");
private readonly eventIndexManager: BaseEventIndexManager = new SeshatIndexManager();
// this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile
private readonly ssoID: string = secureRandomString(32);
private readonly initialised: Promise<void>;
private protocol!: string;
private sessionId!: string;
private config!: IConfigOptions;
public constructor() {
super();
@@ -186,13 +187,21 @@ export default class ElectronPlatform extends BasePlatform {
await this.ipc.call("callDisplayMediaCallback", source ?? { id: "", name: "", thumbnailURL: "" });
});
void this.ipc.call("startSSOFlow", this.ssoID);
BreadcrumbsStore.instance.on(UPDATE_EVENT, this.onBreadcrumbsUpdate);
this.initialised = this.initialise();
}
private async initialise(): Promise<void> {
const { protocol, sessionId, config } = await window.electron!.initialise();
this.protocol = protocol;
this.sessionId = sessionId;
this.config = config;
}
public async getConfig(): Promise<IConfigOptions | undefined> {
return this.ipc.call("getConfig");
await this.initialised;
return this.config;
}
private onBreadcrumbsUpdate = (): void => {
@@ -391,7 +400,7 @@ export default class ElectronPlatform extends BasePlatform {
public getSSOCallbackUrl(fragmentAfterLogin?: string): URL {
const url = super.getSSOCallbackUrl(fragmentAfterLogin);
url.protocol = "element";
url.searchParams.set(SSO_ID_KEY, this.ssoID);
url.searchParams.set(SSO_ID_KEY, this.sessionId);
return url;
}
@@ -469,7 +478,7 @@ export default class ElectronPlatform extends BasePlatform {
}
public getOidcClientState(): string {
return `:${SSO_ID_KEY}:${this.ssoID}`;
return `:${SSO_ID_KEY}:${this.sessionId}`;
}
/**
@@ -477,7 +486,7 @@ export default class ElectronPlatform extends BasePlatform {
*/
public getOidcCallbackUrl(): URL {
const url = super.getOidcCallbackUrl();
url.protocol = "io.element.desktop";
url.protocol = this.protocol;
// Trim the double slash into a single slash to comply with https://datatracker.ietf.org/doc/html/rfc8252#section-7.1
if (url.href.startsWith(`${url.protocol}//`)) {
url.href = url.href.replace("://", ":/");