diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2019-09-12 12:02:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 12:02:14 +0100 |
| commit | 59975f9a638e999df2e76c55f23827700ff3065b (patch) | |
| tree | cc4c8e6be3eac63216018fa62d1e024bdd63d1f4 | |
| parent | add report_stats_endpoint config option (#6012) (diff) | |
| parent | changelog (diff) | |
| download | synapse-59975f9a638e999df2e76c55f23827700ff3065b.tar.xz | |
Merge pull request #6024 from matrix-org/dbkr/fix_sso_fallback_login
Fix SSO fallback login
| -rw-r--r-- | changelog.d/6024.bugfix | 1 | ||||
| -rw-r--r-- | synapse/static/client/login/js/login.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6024.bugfix b/changelog.d/6024.bugfix new file mode 100644 index 0000000000..ddad34595b --- /dev/null +++ b/changelog.d/6024.bugfix @@ -0,0 +1 @@ +Fix bug where login error was shown incorrectly on SSO fallback login. diff --git a/synapse/static/client/login/js/login.js b/synapse/static/client/login/js/login.js index e02663f50e..276c271bbe 100644 --- a/synapse/static/client/login/js/login.js +++ b/synapse/static/client/login/js/login.js @@ -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(); } }; |