Add user_type to returned fields in admin API user list endpoints

changelog.d/5731.misc

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

synapse/storage/__init__.py

@@ -469,7 +469,7 @@ def get_users(self):
  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 @@ def get_users_paginate(self, order, start, limit):
  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 @@ def search_users(self, term):
  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",
  )