From ddf3d92d434ccec77f882b070e6bc1545ad29f86 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 2 Jun 2020 16:26:08 +0100 Subject: [PATCH] Fix login loop where the sso flow returns to `#/login` due to fragmentAfterLogin going back to `#/login` and https://github.com/vector-im/riot-web/issues/11643 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/platform/ElectronPlatform.tsx | 4 ++-- src/vector/platform/VectorBasePlatform.ts | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx index 62137063cd..f68614d408 100644 --- a/src/vector/platform/ElectronPlatform.tsx +++ b/src/vector/platform/ElectronPlatform.tsx @@ -457,8 +457,8 @@ export default class ElectronPlatform extends VectorBasePlatform { }); } - getSSOCallbackUrl(hsUrl: string, isUrl: string, fragmentAfterLogin: string): URL { - const url = super.getSSOCallbackUrl(hsUrl, isUrl, fragmentAfterLogin); + getSSOCallbackUrl(fragmentAfterLogin: string): URL { + const url = super.getSSOCallbackUrl(fragmentAfterLogin); url.protocol = "riot"; url.searchParams.set("riot-desktop-ssoid", this.ssoID); return url; diff --git a/src/vector/platform/VectorBasePlatform.ts b/src/vector/platform/VectorBasePlatform.ts index 0c3997e773..e9febd9042 100644 --- a/src/vector/platform/VectorBasePlatform.ts +++ b/src/vector/platform/VectorBasePlatform.ts @@ -37,12 +37,6 @@ export const updateCheckStatusEnum = { export default abstract class VectorBasePlatform extends BasePlatform { protected _favicon: Favicon; - constructor() { - super(); - - this.startUpdateCheck = this.startUpdateCheck.bind(this); - } - async getConfig(): Promise<{}> { return getVectorConfig(); }