summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-09-28 10:44:44 +0100
committerGitHub <noreply@github.com>2017-09-28 10:44:44 +0100
commitbf86a41ef1c81f2e0495f6132fec7e14d50ecf00 (patch)
tree004e0c3acc15bea438e498d07f68427b3a22fdee /synapse/rest
parentMerge pull request #2475 from matrix-org/erikj/joined_members_auth (diff)
parentFix /joined_members to work with AS users (diff)
downloadsynapse-bf86a41ef1c81f2e0495f6132fec7e14d50ecf00.tar.xz
Merge pull request #2476 from matrix-org/erikj/joined_members_auth
Fix /joined_members to work with AS users
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 4be0fee38d..6c379d53ac 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -403,10 +403,9 @@ class JoinedRoomMemberListRestServlet(ClientV1RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, room_id):
         requester = yield self.auth.get_user_by_req(request)
-        user_id = requester.user.to_string()
 
         users_with_profile = yield self.message_handler.get_joined_members(
-            user_id, room_id,
+            requester, room_id,
         )
 
         defer.returnValue((200, {