diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-03-02 16:43:33 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-03-02 16:43:33 +0000 |
| commit | 27d099edd66ee41c92d3c4603777c0a2fa897cc4 (patch) | |
| tree | 0412b1ec5c7a294f5f87aa5ce8eed1a56653ec1e /synapse | |
| parent | Merge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1' (diff) | |
| parent | Fixed set a user as an admin with the new API (#6928) (diff) | |
| download | synapse-27d099edd66ee41c92d3c4603777c0a2fa897cc4.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/admin/users.py | 6 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/registration.py | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 2107b5dc56..064908fbb0 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -211,9 +211,7 @@ class UserRestServletV2(RestServlet): if target_user == auth_user and not set_admin_to: raise SynapseError(400, "You may not demote yourself.") - await self.admin_handler.set_user_server_admin( - target_user, set_admin_to - ) + await self.store.set_server_admin(target_user, set_admin_to) if "password" in body: if ( @@ -648,6 +646,6 @@ class UserAdminServlet(RestServlet): if target_user == auth_user and not set_admin_to: raise SynapseError(400, "You may not demote yourself.") - await self.store.set_user_server_admin(target_user, set_admin_to) + await self.store.set_server_admin(target_user, set_admin_to) return 200, {} diff --git a/synapse/storage/data_stores/main/registration.py b/synapse/storage/data_stores/main/registration.py index 49306642ed..3e53c8568a 100644 --- a/synapse/storage/data_stores/main/registration.py +++ b/synapse/storage/data_stores/main/registration.py @@ -301,12 +301,16 @@ class RegistrationWorkerStore(SQLBaseStore): admin (bool): true iff the user is to be a server admin, false otherwise. """ - return self.db.simple_update_one( - table="users", - keyvalues={"name": user.to_string()}, - updatevalues={"admin": 1 if admin else 0}, - desc="set_server_admin", - ) + + def set_server_admin_txn(txn): + self.db.simple_update_one_txn( + txn, "users", {"name": user.to_string()}, {"admin": 1 if admin else 0} + ) + self._invalidate_cache_and_stream( + txn, self.get_user_by_id, (user.to_string(),) + ) + + return self.db.runInteraction("set_server_admin", set_server_admin_txn) def _query_for_auth(self, txn, token): sql = ( |