kaslo/synapse
1
0
Fork 0
Code Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Morgan
2020-02-25 14:27:10 +00:00
parent 057be54878 59975f9a63
commit 1b2c568aaa
2 changed files with 2 additions and 1 deletions
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();
}
if (!matrixLogin.serverAcceptsPassword && !matrixLogin.serverAcceptsCas) {
if (!matrixLogin.serverAcceptsPassword && !matrixLogin.serverAcceptsCas && !matrixLogin.serverAcceptsSso) {
$("#no_login_types").show();
}
};