diff options
| author | Eric Eastwood <erice@element.io> | 2021-12-09 02:53:17 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2021-12-09 02:53:17 -0600 |
| commit | 6b64184585b4935c75e6f4ed44ac17ca48e1f71f (patch) | |
| tree | 048c8b90df46d609514b8bba2c6df5bb809225d2 /synapse/config/cas.py | |
| parent | Merge branch 'develop' into madlittlemods/return-historical-events-in-order-f... (diff) | |
| parent | Add a constant for receipt types (m.read). (#11531) (diff) | |
| download | synapse-6b64184585b4935c75e6f4ed44ac17ca48e1f71f.tar.xz | |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: scripts-dev/complement.sh synapse/handlers/room_batch.py
Diffstat (limited to 'synapse/config/cas.py')
| -rw-r--r-- | synapse/config/cas.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py index 3f81814043..6f2754092e 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py @@ -1,4 +1,5 @@ # Copyright 2015, 2016 OpenMarket Ltd +# Copyright 2021 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,7 +29,7 @@ class CasConfig(Config): section = "cas" - def read_config(self, config, **kwargs): + def read_config(self, config, **kwargs) -> None: cas_config = config.get("cas_config", None) self.cas_enabled = cas_config and cas_config.get("enabled", True) @@ -51,7 +52,7 @@ class CasConfig(Config): self.cas_displayname_attribute = None self.cas_required_attributes = [] - def generate_config_section(self, config_dir_path, server_name, **kwargs): + def generate_config_section(self, config_dir_path, server_name, **kwargs) -> str: return """\ # Enable Central Authentication Service (CAS) for registration and login. # |