From 642fad8bd47ffcb74d970de632a7316dfc15d26b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Sep 2019 11:42:47 +0100
Subject: [PATCH 1/2] Fix SSO fallback login

Well, it worked, but forgot to remove the thing saying login was
unavailable.
---
 synapse/static/client/login/js/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/static/client/login/js/login.js b/synapse/static/client/login/js/login.js
index e02663f50..276c271bb 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();
     }
 };

From 6db22e4702fcaa7b4f6b814e215071d5aca6893e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 12 Sep 2019 11:46:37 +0100
Subject: [PATCH 2/2] changelog

---
 changelog.d/6024.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6024.bugfix

diff --git a/changelog.d/6024.bugfix b/changelog.d/6024.bugfix
new file mode 100644
index 000000000..ddad34595
--- /dev/null
+++ b/changelog.d/6024.bugfix
@@ -0,0 +1 @@
+Fix bug where login error was shown incorrectly on SSO fallback login.