imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4685 from matrix-org/t3chguy/sso-query

Browse source 
Fix login loop where the sso flow returns to `#/login`
This commit is contained in:
Michael Telatynski 2020-06-03 20:28:01 +01:00 • committed by GitHub
commit 10bdb4975e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/MatrixChat.tsx
View file

@ -1924,7 +1924,10 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
// console.log(`Rendering MatrixChat with view ${this.state.view}`);
let fragmentAfterLogin = "";
if (this.props.initialScreenAfterLogin) {
if (this.props.initialScreenAfterLogin &&
// XXX: workaround for https://github.com/vector-im/riot-web/issues/11643 causing a login-loop
!["welcome", "login", "register"].includes(this.props.initialScreenAfterLogin.screen)
) {
fragmentAfterLogin = `/${this.props.initialScreenAfterLogin.screen}`;
}