OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop 

Including start_sso and start_cas in redirect loop prevention
pull/21833/head
Michael Telatynski 2020-06-30 16:56:38 +01:00 committed by GitHub
parent bb9ae7b55b b2b909aa53
commit cd06910713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/MatrixChat.tsx
View File

@ -1932,11 +1932,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
getFragmentAfterLogin() { getFragmentAfterLogin() {
let fragmentAfterLogin = ""; let fragmentAfterLogin = "";
if (this.props.initialScreenAfterLogin && const initialScreenAfterLogin = this.props.initialScreenAfterLogin;
if (initialScreenAfterLogin &&
// XXX: workaround for https://github.com/vector-im/riot-web/issues/11643 causing a login-loop // XXX: workaround for https://github.com/vector-im/riot-web/issues/11643 causing a login-loop
!["welcome", "login", "register"].includes(this.props.initialScreenAfterLogin.screen) !["welcome", "login", "register", "start_sso", "start_cas"].includes(initialScreenAfterLogin.screen)
) { ) {
fragmentAfterLogin = `/${this.props.initialScreenAfterLogin.screen}`; fragmentAfterLogin = `/${initialScreenAfterLogin.screen}`;
} }
return fragmentAfterLogin; return fragmentAfterLogin;
} }