Remove local threepids on account deactivation (#6426)

This commit is contained in:
Andrew Morgan 2019-11-28 10:40:42 +00:00 committed by Andrew Morgan
parent 9b9ee75666
commit 2030193e55
3 changed files with 17 additions and 0 deletions

1
changelog.d/6426.bugfix Normal file
View File

@ -0,0 +1 @@
Clean up local threepids from user on account deactivation.

View File

@ -95,6 +95,9 @@ class DeactivateAccountHandler(BaseHandler):
user_id, threepid["medium"], threepid["address"]
)
# Remove all 3PIDs this user has bound to the homeserver
yield self.store.user_delete_threepids(user_id)
# delete any devices belonging to the user, which will also
# delete corresponding access tokens.
yield self._device_handler.delete_all_devices_for_user(user_id)

View File

@ -577,6 +577,19 @@ class RegistrationWorkerStore(SQLBaseStore):
return self._simple_delete(
"user_threepids",
keyvalues={"user_id": user_id, "medium": medium, "address": address},
desc="user_delete_threepid",
)
def user_delete_threepids(self, user_id: str):
"""Delete all threepid this user has bound
Args:
user_id: The user id to delete all threepids of
"""
return self._simple_delete(
"user_threepids",
keyvalues={"user_id": user_id},
desc="user_delete_threepids",
)