Skip to content

Commit

Permalink
Fix login loop where the sso flow returns to #/login
Browse files Browse the repository at this point in the history
due to fragmentAfterLogin going back to `#/login`
and #11643

Signed-off-by: Michael Telatynski <[email protected]>
  • Loading branch information
t3chguy committed Jun 3, 2020
1 parent 7659272 commit ddf3d92
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/vector/platform/ElectronPlatform.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions src/vector/platform/VectorBasePlatform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit ddf3d92

Please sign in to comment.