diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-03-18 07:50:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 07:50:00 -0400 |
| commit | 88b41986dbc54e8601ad4d889f4ebff952858b4f (patch) | |
| tree | de3e5df88c1388266b34621994c04fba71dba099 /synapse/rest | |
| parent | Update INSTALL.md updated CentOS8 install instructions (#6925) (diff) | |
| download | synapse-88b41986dbc54e8601ad4d889f4ebff952858b4f.tar.xz | |
Add an option to the set password API to choose whether to logout other devices. (#7085)
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/admin/users.py | 6 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 80f959248d..8551ac19b8 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -221,8 +221,9 @@ class UserRestServletV2(RestServlet): raise SynapseError(400, "Invalid password") else: new_password = body["password"] + logout_devices = True await self.set_password_handler.set_password( - target_user.to_string(), new_password, requester + target_user.to_string(), new_password, logout_devices, requester ) if "deactivated" in body: @@ -536,9 +537,10 @@ class ResetPasswordRestServlet(RestServlet): params = parse_json_object_from_request(request) assert_params_in_dict(params, ["new_password"]) new_password = params["new_password"] + logout_devices = params.get("logout_devices", True) await self._set_password_handler.set_password( - target_user_id, new_password, requester + target_user_id, new_password, logout_devices, requester ) return 200, {} diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index dc837d6c75..631cc74cb4 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -265,8 +265,11 @@ class PasswordRestServlet(RestServlet): assert_params_in_dict(params, ["new_password"]) new_password = params["new_password"] + logout_devices = params.get("logout_devices", True) - await self._set_password_handler.set_password(user_id, new_password, requester) + await self._set_password_handler.set_password( + user_id, new_password, logout_devices, requester + ) return 200, {} |