diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-02-26 12:22:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 12:22:55 +0000 |
| commit | 8c75b621bfe03725cc8da071516ebc66d3872760 (patch) | |
| tree | 5ba2ed0d2bc178d3fc8f846b9d08625eeb7c4e83 /synapse | |
| parent | Sanity-check database before running upgrades (#6982) (diff) | |
| download | synapse-8c75b621bfe03725cc8da071516ebc66d3872760.tar.xz | |
Ensure 'deactivated' parameter is a boolean on user admin API, Fix error handling of call to deactivate user (#6990)
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/admin/users.py | 11 | ||||
| -rw-r--r-- | synapse/rest/client/v1/login.py | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 2107b5dc56..c5b461a236 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -228,13 +228,16 @@ class UserRestServletV2(RestServlet): ) if "deactivated" in body: - deactivate = bool(body["deactivated"]) + deactivate = body["deactivated"] + if not isinstance(deactivate, bool): + raise SynapseError( + 400, "'deactivated' parameter is not of type boolean" + ) + if deactivate and not user["deactivated"]: - result = await self.deactivate_account_handler.deactivate_account( + await self.deactivate_account_handler.deactivate_account( target_user.to_string(), False ) - if not result: - raise SynapseError(500, "Could not deactivate user") user = await self.admin_handler.get_user(target_user) return 200, user diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 1294e080dc..2c99536678 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -599,6 +599,7 @@ class SSOAuthHandler(object): redirect_url = self._add_login_token_to_redirect_url( client_redirect_url, login_token ) + # Load page request.redirect(redirect_url) finish_request(request) |