summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-10 23:09:31 +0100
committerErik Johnston <erik@matrix.org>2019-06-10 23:09:31 +0100
commit49e01e5710fdbd9bb8da24844718eb2f5d6ee5c7 (patch)
tree21b0e6d2a3c7f1bda031e18851515e0c185e205a
parentMerge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero (diff)
downloadsynapse-49e01e5710fdbd9bb8da24844718eb2f5d6ee5c7.tar.xz
Fix defaults on checking threepids
-rw-r--r--synapse/handlers/auth.py1
-rw-r--r--synapse/storage/registration.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py

index 7f8ddc99c6..a0cf37a9f9 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py
@@ -479,6 +479,7 @@ class AuthHandler(BaseHandler): medium, threepid_creds["client_secret"], sid=threepid_creds["sid"], + validated=True, ) threepid = { diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 9b41cbd757..1dd1182e82 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py
@@ -998,7 +998,7 @@ class RegistrationStore( client_secret, address=None, sid=None, - validated=None, + validated=True, ): """Gets a session_id and last_send_attempt (if available) for a client_secret/medium/(address|session_id) combo