summary refs log tree commit diff
path: root/synapse/handlers/deactivate_account.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-25 17:16:28 +0100
committerErik Johnston <erik@matrix.org>2019-09-25 17:16:28 +0100
commitd2bd0bc6b188cca8c85ec34c79a70596ec0e46b1 (patch)
tree15032c3b14c0c9e3e52db8cd5fa4a04d985f034e /synapse/handlers/deactivate_account.py
parentUse if `is not None` (diff)
parentThreepid validity checks on msisdns should not be dependent on 'threepid_beha... (diff)
downloadsynapse-d2bd0bc6b188cca8c85ec34c79a70596ec0e46b1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips
Diffstat (limited to 'synapse/handlers/deactivate_account.py')
-rw-r--r--synapse/handlers/deactivate_account.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/deactivate_account.py b/synapse/handlers/deactivate_account.py
index 5f804d1f13..d83912c9a4 100644
--- a/synapse/handlers/deactivate_account.py
+++ b/synapse/handlers/deactivate_account.py
@@ -73,7 +73,9 @@ class DeactivateAccountHandler(BaseHandler):
         # unbinding
         identity_server_supports_unbinding = True
 
-        threepids = yield self.store.user_get_threepids(user_id)
+        # Retrieve the 3PIDs this user has bound to an identity server
+        threepids = yield self.store.user_get_bound_threepids(user_id)
+
         for threepid in threepids:
             try:
                 result = yield self._identity_handler.try_unbind_threepid(