diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-11-25 15:16:47 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-11-25 15:16:47 +0000 |
| commit | cb79a2b78546ffcecc6b8fad6664535c8dbf4aec (patch) | |
| tree | 104072b132e9d415d2d6fdd388629bc75d02b402 /synapse/handlers/identity.py | |
| parent | Prevent the media store from writing outside of the configured directory (diff) | |
| parent | Improve performance of `remove_{hidden,deleted}_devices_from_device_inbox` (#... (diff) | |
| download | synapse-cb79a2b78546ffcecc6b8fad6664535c8dbf4aec.tar.xz | |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to '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", |