diff options
-rw-r--r-- | docs/sample_config.yaml | 10 | ||||
-rw-r--r-- | synapse/config/emailconfig.py | 15 |
2 files changed, 19 insertions, 6 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index f168853f67..7bd8dcf45d 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -2015,9 +2015,13 @@ email: # * The contents of password reset emails sent by the homeserver: # 'password_reset.html' and 'password_reset.txt' # - # * HTML pages for success and failure that a user will see when they follow - # the link in the password reset email: 'password_reset_success.html' and - # 'password_reset_failure.html' + # * An HTML page that a user will see when they follow the link in the password + # reset email. The user will be asked to confirm the action before their + # password is reset: 'password_reset_confirmation.html' + # + # * HTML pages for success and failure that a user will see when they confirm + # the password reset flow using the page above: 'password_reset_success.html' + # and 'password_reset_failure.html' # # * The contents of address verification emails sent during registration: # 'registration.html' and 'registration.txt' diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index 7a796996c0..019b78509b 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -198,6 +198,9 @@ class EmailConfig(Config): "add_threepid_template_text", "add_threepid.txt" ) + password_reset_template_confirmation_html = ( + "password_reset_confirmation.html" + ) password_reset_template_failure_html = email_config.get( "password_reset_template_failure_html", "password_reset_failure.html" ) @@ -228,6 +231,7 @@ class EmailConfig(Config): self.email_registration_template_text, self.email_add_threepid_template_html, self.email_add_threepid_template_text, + self.email_password_reset_template_confirmation_html, self.email_password_reset_template_failure_html, self.email_registration_template_failure_html, self.email_add_threepid_template_failure_html, @@ -242,6 +246,7 @@ class EmailConfig(Config): registration_template_text, add_threepid_template_html, add_threepid_template_text, + password_reset_template_confirmation_html, password_reset_template_failure_html, registration_template_failure_html, add_threepid_template_failure_html, @@ -404,9 +409,13 @@ class EmailConfig(Config): # * The contents of password reset emails sent by the homeserver: # 'password_reset.html' and 'password_reset.txt' # - # * HTML pages for success and failure that a user will see when they follow - # the link in the password reset email: 'password_reset_success.html' and - # 'password_reset_failure.html' + # * An HTML page that a user will see when they follow the link in the password + # reset email. The user will be asked to confirm the action before their + # password is reset: 'password_reset_confirmation.html' + # + # * HTML pages for success and failure that a user will see when they confirm + # the password reset flow using the page above: 'password_reset_success.html' + # and 'password_reset_failure.html' # # * The contents of address verification emails sent during registration: # 'registration.html' and 'registration.txt' |