gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Michael Telatynski 2020-06-02 16:26:08 +01:00
parent 3869a4d22e
commit d18b0f87d4
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,8 +457,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
}); });
} }
getSSOCallbackUrl(hsUrl: string, isUrl: string, fragmentAfterLogin: string): URL { getSSOCallbackUrl(fragmentAfterLogin: string): URL {
const url = super.getSSOCallbackUrl(hsUrl, isUrl, fragmentAfterLogin); const url = super.getSSOCallbackUrl(fragmentAfterLogin);
url.protocol = "riot"; url.protocol = "riot";
url.searchParams.set("riot-desktop-ssoid", this.ssoID); url.searchParams.set("riot-desktop-ssoid", this.ssoID);
return url; return url;

6
src/vector/platform/VectorBasePlatform.ts
View File

@ -37,12 +37,6 @@ export const updateCheckStatusEnum = {
export default abstract class VectorBasePlatform extends BasePlatform { export default abstract class VectorBasePlatform extends BasePlatform {
protected _favicon: Favicon; protected _favicon: Favicon;
constructor() {
super();
this.startUpdateCheck = this.startUpdateCheck.bind(this);
}
async getConfig(): Promise<{}> { async getConfig(): Promise<{}> {
return getVectorConfig(); return getVectorConfig();
} }