diff options
| author | Erik Johnston <erik@matrix.org> | 2020-01-20 17:23:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 17:23:59 +0000 |
| commit | ceecedc68ba1af25b0ee60c5cf927fd1fd245b9f (patch) | |
| tree | 485516ca1afdc48271e2b102a9ece8b376d9754f | |
| parent | Fix empty account_validity config block (#6747) (diff) | |
| download | synapse-ceecedc68ba1af25b0ee60c5cf927fd1fd245b9f.tar.xz | |
Fix changing password via user admin API. (#6730)
| -rw-r--r-- | changelog.d/6730.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/admin/users.py | 4 | ||||
| -rw-r--r-- | tests/rest/admin/test_user.py | 13 |
3 files changed, 16 insertions, 2 deletions
diff --git a/changelog.d/6730.bugfix b/changelog.d/6730.bugfix new file mode 100644 index 0000000000..beb444ca66 --- /dev/null +++ b/changelog.d/6730.bugfix @@ -0,0 +1 @@ +Fix changing password via user admin API. diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 574cb90c74..c178c960c5 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -193,8 +193,8 @@ class UserRestServletV2(RestServlet): raise SynapseError(400, "Invalid password") else: new_password = body["password"] - await self._set_password_handler.set_password( - target_user, new_password, requester + await self.set_password_handler.set_password( + target_user.to_string(), new_password, requester ) if "deactivated" in body: diff --git a/tests/rest/admin/test_user.py b/tests/rest/admin/test_user.py index 7352d609e6..8f09f51c61 100644 --- a/tests/rest/admin/test_user.py +++ b/tests/rest/admin/test_user.py @@ -435,6 +435,19 @@ class UserRestTestCase(unittest.HomeserverTestCase): self.assertEqual(0, channel.json_body["is_guest"]) self.assertEqual(0, channel.json_body["deactivated"]) + # Change password + body = json.dumps({"password": "hahaha"}) + + request, channel = self.make_request( + "PUT", + self.url, + access_token=self.admin_user_tok, + content=body.encode(encoding="utf_8"), + ) + self.render(request) + + self.assertEqual(200, int(channel.result["code"]), msg=channel.result["body"]) + # Modify user body = json.dumps({"displayname": "foobar", "deactivated": True}) |