diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-06-06 17:34:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 17:34:07 +0100 |
| commit | 3719680ee42b72b8480fa76a1455576897b65ef0 (patch) | |
| tree | b7c49efd558e6e6ac6842b66c1ac3fef593ebfae /synapse/push/pusher.py | |
| parent | Stop hardcoding trust of old matrix.org key (#5374) (diff) | |
| download | synapse-3719680ee42b72b8480fa76a1455576897b65ef0.tar.xz | |
Add ability to perform password reset via email without trusting the identity server (#5377)
Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
Diffstat (limited to 'synapse/push/pusher.py')
| -rw-r--r-- | synapse/push/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/pusher.py b/synapse/push/pusher.py index 14bc7823cf..aff85daeb5 100644 --- a/synapse/push/pusher.py +++ b/synapse/push/pusher.py @@ -70,8 +70,8 @@ class PusherFactory(object): mailer = Mailer( hs=self.hs, app_name=app_name, - notif_template_html=self.notif_template_html, - notif_template_text=self.notif_template_text, + template_html=self.notif_template_html, + template_text=self.notif_template_text, ) self.mailers[app_name] = mailer return EmailPusher(self.hs, pusherdict, mailer) |