Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Search in columns 'name' and 'displayname' in the admin users endpoint #7377

Merged
merged 8 commits into from
Aug 25, 2020
Merged

Search in columns 'name' and 'displayname' in the admin users endpoint #7377

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bed8190
Search in columns 'name' and 'displayname' in the admin users endpoint
awesome-manuel Apr 30, 2020
3970339
Rename filter parameter from 'user_id' to 'name'
awesome-manuel Jun 10, 2020
06004a5
Support legacy parameter 'user_id'
awesome-manuel Jun 15, 2020
2468621
Merge remote-tracking branch 'upstream/develop' into admin_users
awesome-manuel Jun 19, 2020
e699f7e
Merge remote-tracking branch 'upstream/develop' into admin_users
awesome-manuel Aug 24, 2020
ae5477c
Keep functionality of legacy parameter 'user_id'
awesome-manuel Aug 24, 2020
42bcd0b
Use suggested SQL pattern
awesome-manuel Aug 25, 2020
7ea27cd
Fix SQL pattern
awesome-manuel Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion synapse/rest/admin/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ async def on_GET(self, request):

start = parse_integer(request, "from", default=0)
limit = parse_integer(request, "limit", default=100)
name = parse_string(request, "name", default=None)
user_id = parse_string(request, "user_id", default=None)
name = parse_string(request, "name", default=user_id)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still doesn't address the concern I mentioned. Now user_id will return results from both displayname and name columns. This breaks backwards compatibility.

What I'm asking for is:

  • If user_id is provided, results are filtered according to the name column only.
  • If name is provided, results are filtered according to the name and displayname columns.
  • If both user_id and name are provided, results are filtered according to the name column only.

guests = parse_boolean(request, "guests", default=True)
deactivated = parse_boolean(request, "deactivated", default=False)

Expand Down