diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2022-01-14 14:53:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 14:53:33 +0000 |
| commit | 18862f20b5495bdc556c54e92fd4b1efdc718ba7 (patch) | |
| tree | e73bd7b1ca72deb0d4ab0ce52ba6a37f8a60e4d8 /synapse/rest | |
| parent | Fix sample_config.yaml in regards track_puppeted_user_ips (#11749) (diff) | |
| download | synapse-18862f20b5495bdc556c54e92fd4b1efdc718ba7.tar.xz | |
Remove the 'password_hash' from the Users Admin API endpoint response dictionary (#11576)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/admin/users.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 78e795c347..c2617ee30c 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -173,12 +173,11 @@ class UserRestServletV2(RestServlet): if not self.hs.is_mine(target_user): raise SynapseError(HTTPStatus.BAD_REQUEST, "Can only look up local users") - ret = await self.admin_handler.get_user(target_user) - - if not ret: + user_info_dict = await self.admin_handler.get_user(target_user) + if not user_info_dict: raise NotFoundError("User not found") - return HTTPStatus.OK, ret + return HTTPStatus.OK, user_info_dict async def on_PUT( self, request: SynapseRequest, user_id: str @@ -399,10 +398,10 @@ class UserRestServletV2(RestServlet): target_user, requester, body["avatar_url"], True ) - user = await self.admin_handler.get_user(target_user) - assert user is not None + user_info_dict = await self.admin_handler.get_user(target_user) + assert user_info_dict is not None - return 201, user + return HTTPStatus.CREATED, user_info_dict class UserRegisterServlet(RestServlet): |