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

matrix-org · Feb 25, 2020 · 1b2c568 · 1b2c568
2 parents 057be54 + 59975f9
commit 1b2c568
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/6024.bugfix 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
@@ -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();
     }
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix bug where login error was shown incorrectly on SSO fallback login.