summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-19 16:16:49 +0000
committerErik Johnston <erik@matrix.org>2015-11-19 16:16:49 +0000
commit37de8a7f4a017e5c62bd73f1c381374b464a6cc1 (patch)
tree67645229628acd147d3adf78c9f654a171c44933 /synapse/rest
parentMerge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse (diff)
downloadsynapse-37de8a7f4a017e5c62bd73f1c381374b464a6cc1.tar.xz
Remove m.login.token from advertised flows.
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/login.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index 0171f6c018..d6d2ebaba1 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -58,9 +58,10 @@ class LoginRestServlet(ClientV1RestServlet):
             flows.append({"type": LoginRestServlet.SAML2_TYPE})
         if self.cas_enabled:
             flows.append({"type": LoginRestServlet.CAS_TYPE})
+            flows.append({"type": LoginRestServlet.TOKEN_TYPE})
         if self.password_enabled:
             flows.append({"type": LoginRestServlet.PASS_TYPE})
-        flows.append({"type": LoginRestServlet.TOKEN_TYPE})
+
         return (200, {"flows": flows})
 
     def on_OPTIONS(self, request):