Fix element-desktop-ssoid being included in OIDC Authorization call

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
element-hq · May 3, 2024 · b82100e · b82100e
1 parent 2c8b32d
commit b82100e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
@@ -377,10 +377,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return this.ipc.call("getAvailableSpellCheckLanguages");
     }
 
-    public getSSOCallbackUrl(fragmentAfterLogin?: string): URL {
-        const url = super.getSSOCallbackUrl(fragmentAfterLogin);
+    public getSSOCallbackUrl(forOidc = false, fragmentAfterLogin?: string): URL {
+        const url = super.getSSOCallbackUrl(forOidc, fragmentAfterLogin);
         url.protocol = "element";
-        url.searchParams.set(SSO_ID_KEY, this.ssoID);
+        if (!forOidc) {
+            url.searchParams.set(SSO_ID_KEY, this.ssoID);
+        }
         return url;
     }
 
@@ -446,8 +448,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
 
     public async getOidcClientMetadata(): Promise<OidcRegistrationClientMetadata> {
         const baseMetadata = await super.getOidcClientMetadata();
-        const redirectUri = this.getSSOCallbackUrl();
-        redirectUri.searchParams.delete(SSO_ID_KEY); // it will be shuttled via the state param instead
+        const redirectUri = this.getSSOCallbackUrl(true);
         return {
             ...baseMetadata,
             applicationType: "native",