Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 84f27cf

Browse files
committed
Include user erased status when fetching user info via the admin API
1 parent 35c2a88 commit 84f27cf

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

synapse/handlers/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ async def get_user(self, user: UserID) -> Optional[JsonDict]:
100100
user_info_dict["avatar_url"] = profile.avatar_url
101101
user_info_dict["threepids"] = threepids
102102
user_info_dict["external_ids"] = external_ids
103+
user_info_dict["erased"] = await self.store.is_user_erased(user.to_string())
103104

104105
return user_info_dict
105106

tests/rest/admin/test_user.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,7 @@ def test_deactivate_user_erase_true(self) -> None:
12211221
self.assertEqual("[email protected]", channel.json_body["threepids"][0]["address"])
12221222
self.assertEqual("mxc://servername/mediaid", channel.json_body["avatar_url"])
12231223
self.assertEqual("User1", channel.json_body["displayname"])
1224+
self.assertFalse(channel.json_body["erased"])
12241225

12251226
# Deactivate and erase user
12261227
channel = self.make_request(
@@ -1245,6 +1246,7 @@ def test_deactivate_user_erase_true(self) -> None:
12451246
self.assertEqual(0, len(channel.json_body["threepids"]))
12461247
self.assertIsNone(channel.json_body["avatar_url"])
12471248
self.assertIsNone(channel.json_body["displayname"])
1249+
self.assertTrue(channel.json_body["erased"])
12481250

12491251
self._is_erased("@user:test", True)
12501252

@@ -2783,6 +2785,7 @@ def _check_fields(self, content: JsonDict) -> None:
27832785
self.assertIn("avatar_url", content)
27842786
self.assertIn("admin", content)
27852787
self.assertIn("deactivated", content)
2788+
self.assertIn("erased", content)
27862789
self.assertIn("shadow_banned", content)
27872790
self.assertIn("creation_ts", content)
27882791
self.assertIn("appservice_id", content)

0 commit comments

Comments
 (0)