diff options
| author | H. Shay <hillerys@element.io> | 2021-11-12 16:24:05 -0800 |
|---|---|---|
| committer | H. Shay <hillerys@element.io> | 2021-11-12 16:24:05 -0800 |
| commit | d82615c177b67283caabd64184f11a5ba294e803 (patch) | |
| tree | 2a5e44928d17d039308e7283d777b4c41950ba65 | |
| parent | remove legacy code supporting depreciated config flag "trust_identity_server_... (diff) | |
| download | synapse-d82615c177b67283caabd64184f11a5ba294e803.tar.xz | |
remove legacy code supporting depreciated config flag "trust_identity_server_for_password_resets" from synapse/handlers/identity.py
| -rw-r--r-- | synapse/handlers/identity.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 3dbe611f95..c83eaea359 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -464,15 +464,6 @@ class IdentityHandler: if next_link: params["next_link"] = next_link - if self.hs.config.email.using_identity_server_from_trusted_list: - # Warn that a deprecated config option is in use - logger.warning( - 'The config option "trust_identity_server_for_password_resets" ' - 'has been replaced by "account_threepid_delegate". ' - "Please consult the sample config at docs/sample_config.yaml for " - "details and update your config file." - ) - try: data = await self.http_client.post_json_get_json( id_server + "/_matrix/identity/api/v1/validate/email/requestToken", @@ -517,15 +508,6 @@ class IdentityHandler: if next_link: params["next_link"] = next_link - if self.hs.config.email.using_identity_server_from_trusted_list: - # Warn that a deprecated config option is in use - logger.warning( - 'The config option "trust_identity_server_for_password_resets" ' - 'has been replaced by "account_threepid_delegate". ' - "Please consult the sample config at docs/sample_config.yaml for " - "details and update your config file." - ) - try: data = await self.http_client.post_json_get_json( id_server + "/_matrix/identity/api/v1/validate/msisdn/requestToken", |