Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login 

Fix SSO fallback login
This commit is contained in:
David Baker 2019-09-12 12:02:14 +01:00 committed by GitHub
parent dd2e5b0038 6db22e4702
commit 59975f9a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6024.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug where login error was shown incorrectly on SSO fallback login.

2
synapse/static/client/login/js/login.js
View File

@ -62,7 +62,7 @@ var show_login = function() {
$("#sso_flow").show(); $("#sso_flow").show();
} }
if (!matrixLogin.serverAcceptsPassword && !matrixLogin.serverAcceptsCas) { if (!matrixLogin.serverAcceptsPassword && !matrixLogin.serverAcceptsCas && !matrixLogin.serverAcceptsSso) {
$("#no_login_types").show(); $("#no_login_types").show();
} }
}; };