Fix up password reset template config names (#5863)

Fixes #5833

The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.

changelog.d/5863.bugfix

@@ -0,0 +1 @@
+Fix Synapse looking for config options `password_reset_failure_template` and `password_reset_success_template`, when they are actually `password_reset_template_failure_html`, `password_reset_template_success_html`.

synapse/config/emailconfig.py

@@ -132,31 +132,31 @@ def read_config(self, config, **kwargs):
  self.email_password_reset_template_text = email_config.get(
  "password_reset_template_text", "password_reset.txt"
  )
- self.email_password_reset_failure_template = email_config.get(
- "password_reset_failure_template", "password_reset_failure.html"
+ self.email_password_reset_template_failure_html = email_config.get(
+ "password_reset_template_failure_html", "password_reset_failure.html"
  )
  # This template does not support any replaceable variables, so we will
  # read it from the disk once during setup
- email_password_reset_success_template = email_config.get(
- "password_reset_success_template", "password_reset_success.html"
+ email_password_reset_template_success_html = email_config.get(
+ "password_reset_template_success_html", "password_reset_success.html"
  )
 
  # Check templates exist
  for f in [
  self.email_password_reset_template_html,
  self.email_password_reset_template_text,
- self.email_password_reset_failure_template,
- email_password_reset_success_template,
+ self.email_password_reset_template_failure_html,
+ email_password_reset_template_success_html,
  ]:
  p = os.path.join(self.email_template_dir, f)
  if not os.path.isfile(p):
  raise ConfigError("Unable to find template file %s" % (p,))
 
  # Retrieve content of web templates
  filepath = os.path.join(
- self.email_template_dir, email_password_reset_success_template
+ self.email_template_dir, email_password_reset_template_success_html
  )
- self.email_password_reset_success_html_content = self.read_file(
+ self.email_password_reset_template_success_html_content = self.read_file(
  filepath, "email.password_reset_template_success_html"
  )
 

synapse/rest/client/v2_alpha/account.py

@@ -282,13 +282,13 @@ def on_GET(self, request, medium):
  return None
 
  # Otherwise show the success template
- html = self.config.email_password_reset_success_html_content
+ html = self.config.email_password_reset_template_success_html_content
  request.setResponseCode(200)
  except ThreepidValidationError as e:
  # Show a failure page with a reason
  html = self.load_jinja2_template(
  self.config.email_template_dir,
- self.config.email_password_reset_failure_template,
+ self.config.email_password_reset_template_failure_html,
  template_vars={"failure_reason": e.msg},
  )
  request.setResponseCode(e.code)