Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Lint

Browse Source
This commit is contained in:
Brendan Abolivier 2019-08-01 12:11:27 +02:00
parent 3ff3dfe5a3
commit f25f638c35
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sample_config.yaml
View File

@ -805,7 +805,7 @@ uploads_path: "DATADIR/uploads"
# # Directory in which Synapse will try to find the HTML files to serve to the # # Directory in which Synapse will try to find the HTML files to serve to the
# # user when trying to renew an account. Optional, defaults to # # user when trying to renew an account. Optional, defaults to
# # synapse/res/templates. # # synapse/res/templates.
# template_dir: "res/templates" # template_dir: "res/templates"
# # HTML to be displayed to the user after they successfully renewed their # # HTML to be displayed to the user after they successfully renewed their
# # account. Optional. # # account. Optional.
# account_renewed_html_path: "account_renewed.html" # account_renewed_html_path: "account_renewed.html"

19
synapse/config/registration.py
View File

@ -14,10 +14,10 @@
# limitations under the License. # limitations under the License.
import os import os
import pkg_resources
from distutils.util import strtobool from distutils.util import strtobool
import pkg_resources
from synapse.config._base import Config, ConfigError from synapse.config._base import Config, ConfigError
from synapse.types import RoomAlias from synapse.types import RoomAlias
from synapse.util.stringutils import random_string_with_symbols from synapse.util.stringutils import random_string_with_symbols
@ -54,13 +54,10 @@ class AccountValidityConfig(Config):
template_dir = pkg_resources.resource_filename("synapse", "res/templates") template_dir = pkg_resources.resource_filename("synapse", "res/templates")
if "account_renewed_html_path" in config: if "account_renewed_html_path" in config:
file_path = os.path.join( file_path = os.path.join(template_dir, config["account_renewed_html_path"])
template_dir, config["account_renewed_html_path"],
)
self.account_renewed_html_content = self.read_file( self.account_renewed_html_content = self.read_file(
file_path, file_path, "account_validity.account_renewed_html_path"
"account_validity.account_renewed_html_path",
) )
else: else:
self.account_renewed_html_content = ( self.account_renewed_html_content = (
@ -68,12 +65,10 @@ class AccountValidityConfig(Config):
) )
if "invalid_token_html_path" in config: if "invalid_token_html_path" in config:
file_path = os.path.join( file_path = os.path.join(template_dir, config["invalid_token_html_path"])
template_dir, config["invalid_token_html_path"],
)
self.invalid_token_html_content = self.read_file( self.invalid_token_html_content = self.read_file(
file_path, "account_validity.invalid_token_html_path", file_path, "account_validity.invalid_token_html_path"
) )
else: else:
self.invalid_token_html_content = ( self.invalid_token_html_content = (
@ -184,7 +179,7 @@ class RegistrationConfig(Config):
# # Directory in which Synapse will try to find the HTML files to serve to the # # Directory in which Synapse will try to find the HTML files to serve to the
# # user when trying to renew an account. Optional, defaults to # # user when trying to renew an account. Optional, defaults to
# # synapse/res/templates. # # synapse/res/templates.
# template_dir: "res/templates" # template_dir: "res/templates"
# # HTML to be displayed to the user after they successfully renewed their # # HTML to be displayed to the user after they successfully renewed their
# # account. Optional. # # account. Optional.
# account_renewed_html_path: "account_renewed.html" # account_renewed_html_path: "account_renewed.html"

6
synapse/rest/client/v2_alpha/account_validity.py
View File

@ -52,7 +52,7 @@ class AccountValidityRenewServlet(RestServlet):
renewal_token = request.args[b"token"][0] renewal_token = request.args[b"token"][0]
token_valid = yield self.account_activity_handler.renew_account( token_valid = yield self.account_activity_handler.renew_account(
renewal_token.decode("utf8"), renewal_token.decode("utf8")
) )
if token_valid: if token_valid:
@ -64,9 +64,7 @@ class AccountValidityRenewServlet(RestServlet):
request.setResponseCode(status_code) request.setResponseCode(status_code)
request.setHeader(b"Content-Type", b"text/html; charset=utf-8") request.setHeader(b"Content-Type", b"text/html; charset=utf-8")
request.setHeader( request.setHeader(b"Content-Length", b"%d" % (len(response),))
b"Content-Length", b"%d" % (len(response),)
)
request.write(response.encode("utf8")) request.write(response.encode("utf8"))
finish_request(request) finish_request(request)
defer.returnValue(None) defer.returnValue(None)