Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-type 

Add `user_type` to returned fields in admin API user list endpoints
This commit is contained in:
Jason Robinson 2019-07-22 16:28:51 +03:00 committed by GitHub
parent 0cb72812f9 66f5ff72fd
commit 8e513e7afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5731.misc Normal file
View File

@ -0,0 +1 @@
Return 'user_type' in admin API user endpoints results.

6
synapse/storage/__init__.py
View File

@ -469,7 +469,7 @@ class DataStore(
return self._simple_select_list( return self._simple_select_list(
table="users", table="users",
keyvalues={}, keyvalues={},
retcols=["name", "password_hash", "is_guest", "admin"], retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
desc="get_users", desc="get_users",
) )
@ -494,7 +494,7 @@ class DataStore(
orderby=order, orderby=order,
start=start, start=start,
limit=limit, limit=limit,
retcols=["name", "password_hash", "is_guest", "admin"], retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
) )
count = yield self.runInteraction("get_users_paginate", self.get_user_count_txn) count = yield self.runInteraction("get_users_paginate", self.get_user_count_txn)
retval = {"users": users, "total": count} retval = {"users": users, "total": count}
@ -514,7 +514,7 @@ class DataStore(
table="users", table="users",
term=term, term=term,
col="name", col="name",
retcols=["name", "password_hash", "is_guest", "admin"], retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
desc="search_users", desc="search_users",
) )