diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-01-11 11:48:43 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-01-12 21:40:49 +0000 |
commit | 47e63cc67a059fdc28f01297740b1071c0c6ab5c (patch) | |
tree | 61f6db36461cef662a865739c50d63691162da0f /synapse/handlers/saml_handler.py | |
parent | Allow admin users to create or modify users without a shared secret (#6495) (diff) | |
download | synapse-47e63cc67a059fdc28f01297740b1071c0c6ab5c.tar.xz |
Pass the module_api into the SamlMappingProvider
... for consistency with other modules, and because we'll need it sooner or later and it will be a pain to introduce later.
Diffstat (limited to 'synapse/handlers/saml_handler.py')
-rw-r--r-- | synapse/handlers/saml_handler.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/saml_handler.py b/synapse/handlers/saml_handler.py index 0082f85c26..96f3d016fe 100644 --- a/synapse/handlers/saml_handler.py +++ b/synapse/handlers/saml_handler.py @@ -24,6 +24,7 @@ from saml2.client import Saml2Client 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, @@ -59,7 +60,8 @@ class SamlHandler: # plugin to do custom mapping from saml response to mxid self._user_mapping_provider = hs.config.saml2_user_mapping_provider_class( - hs.config.saml2_user_mapping_provider_config + hs.config.saml2_user_mapping_provider_config, + ModuleApi(hs, hs.get_auth_handler()), ) # identifier for the external_ids table @@ -265,11 +267,12 @@ class SamlConfig(object): class DefaultSamlMappingProvider(object): __version__ = "0.0.1" - def __init__(self, parsed_config: SamlConfig): + def __init__(self, parsed_config: SamlConfig, module_api: ModuleApi): """The default SAML user mapping provider Args: parsed_config: Module configuration + module_api: module api proxy """ self._mxid_source_attribute = parsed_config.mxid_source_attribute self._mxid_mapper = parsed_config.mxid_mapper |