mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-19 17:56:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

lint

Browse source
This commit is contained in:
Andrew Morgan 2019-06-06 16:14:15 +01:00
parent 96f43fe81d
commit 22e4dfa7f0
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/handlers/auth.py
View file

@ -469,7 +469,10 @@ class AuthHandler(BaseHandler):
identity_handler = self.hs.get_handlers().identity_handler
logger.info("Getting validated threepid. threepidcreds: %r", (threepid_creds,))
if not password_servlet or self.hs.config.email_password_reset_behaviour == "remote":
if (
not password_servlet
or self.hs.config.email_password_reset_behaviour == "remote"
):
threepid = yield identity_handler.threepid_from_creds(threepid_creds)
elif self.hs.config.email_password_reset_behaviour == "local":
row = yield self.store.get_threepid_validation_session(

10
synapse/rest/client/v2_alpha/account.py
View file

@ -248,7 +248,10 @@ class PasswordResetSubmitTokenServlet(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, medium):
if medium != "email":
raise SynapseError(400, "This medium is currently not supported for password resets")
raise SynapseError(
400,
"This medium is currently not supported for password resets",
)
sid = parse_string(request, "sid")
client_secret = parse_string(request, "client_secret")
@ -315,7 +318,10 @@ class PasswordResetSubmitTokenServlet(RestServlet):
@defer.inlineCallbacks
def on_POST(self, request, medium):
if medium != "email":
raise SynapseError(400, "This medium is currently not supported for password resets")
raise SynapseError(
400,
"This medium is currently not supported for password resets",
)
body = parse_json_object_from_request(request)
assert_params_in_dict(body, [