tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source 
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
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(
table="users",
keyvalues={},
retcols=["name", "password_hash", "is_guest", "admin"],
retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
desc="get_users",
)
@ -494,7 +494,7 @@ class DataStore(
orderby=order,
start=start,
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)
retval = {"users": users, "total": count}
@ -514,7 +514,7 @@ class DataStore(
table="users",
term=term,
col="name",
retcols=["name", "password_hash", "is_guest", "admin"],
retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
desc="search_users",
)