Small tweaks to SAML2 configuration.

- Add saml2 config docs to default config.
- Use existence of saml2 config to indicate if saml2 should be enabled.

1 files changed, 4 insertions, 4 deletions

diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index f64f5e990e..998d4d44c6 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -38,8 +38,8 @@ class LoginRestServlet(ClientV1RestServlet):
 
     def __init__(self, hs):
         super(LoginRestServlet, self).__init__(hs)
-        self.idp_redirect_url = hs.config.saml2_config['idp_redirect_url']
-        self.saml2_enabled = hs.config.saml2_config['enabled']
+        self.idp_redirect_url = hs.config.saml2_idp_redirect_url
+        self.saml2_enabled = hs.config.saml2_enabled
 
     def on_GET(self, request):
         flows = [{"type": LoginRestServlet.PASS_TYPE}]
@@ -127,7 +127,7 @@ class SAML2RestServlet(ClientV1RestServlet):
 
     def __init__(self, hs):
         super(SAML2RestServlet, self).__init__(hs)
-        self.sp_config = hs.config.saml2_config['config_path']
+        self.sp_config = hs.config.saml2_config_path
 
     @defer.inlineCallbacks
     def on_POST(self, request):
@@ -177,6 +177,6 @@ def _parse_json(request):
 
 def register_servlets(hs, http_server):
     LoginRestServlet(hs).register(http_server)
-    if hs.config.saml2_config['enabled']:
+    if hs.config.saml2_enabled:
         SAML2RestServlet(hs).register(http_server)
     # TODO PasswordResetRestServlet(hs).register(http_server)