diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 11:29:07 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-03-03 11:29:07 +0000 |
| commit | 6a8880b9c3511ce571007f6e876ef233b1f6e60b (patch) | |
| tree | 1005b67ecd6285fd45b08bace2807a87bc3a3eec | |
| parent | Merge branch 'babolivier/sso_module_api' into 'release-v1.11.1' (diff) | |
| parent | Fix wrong handler being used in SAML handler (diff) | |
| download | synapse-6a8880b9c3511ce571007f6e876ef233b1f6e60b.tar.xz | |
Merge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1'
Fix wrong handler being used in SAML handler See merge request new-vector/synapse!5
| -rw-r--r-- | synapse/handlers/saml_handler.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/saml_handler.py b/synapse/handlers/saml_handler.py index 7f411b53b9..9406753393 100644 --- a/synapse/handlers/saml_handler.py +++ b/synapse/handlers/saml_handler.py @@ -25,7 +25,6 @@ from synapse.api.errors import SynapseError from synapse.config import ConfigError from synapse.http.servlet import parse_string from synapse.module_api import ModuleApi -from synapse.rest.client.v1.login import SSOAuthHandler from synapse.types import ( UserID, map_username_to_mxid_localpart, @@ -48,7 +47,7 @@ class Saml2SessionData: class SamlHandler: def __init__(self, hs): self._saml_client = Saml2Client(hs.config.saml2_sp_config) - self._sso_auth_handler = SSOAuthHandler(hs) + self._auth_handler = hs.get_auth_handler() self._registration_handler = hs.get_registration_handler() self._clock = hs.get_clock() @@ -116,7 +115,7 @@ class SamlHandler: self.expire_sessions() user_id = await self._map_saml_response_to_user(resp_bytes, relay_state) - self._sso_auth_handler.complete_sso_login(user_id, request, relay_state) + self._auth_handler.complete_sso_login(user_id, request, relay_state) async def _map_saml_response_to_user(self, resp_bytes, client_redirect_url): try: |