Merge commit 'b6c6fb795' into anoa/dinsic_release_1_21_x

* commit 'b6c6fb795': Allow guests to operate in encrypted rooms (#7314)
matrix-org · Oct 16, 2020 · d670be7 · d670be7
2 parents 0fe6f8d + b6c6fb7
commit d670be7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/7314.misc b/changelog.d/7314.misc
@@ -0,0 +1 @@
+Allow guest access to the `GET /_matrix/client/r0/rooms/{room_id}/members` endpoint, according to MSC2689. Contributed by Awesome Technologies Innovationslabor GmbH.
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
@@ -444,7 +444,7 @@ def __init__(self, hs):
 
     async def on_GET(self, request, room_id):
         # TODO support Pagination stream API (limit/tokens)
-        requester = await self.auth.get_user_by_req(request)
+        requester = await self.auth.get_user_by_req(request, allow_guest=True)
         handler = self.message_handler
 
         # request the state as of a given event, as identified by a stream token,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Allow guest access to the `GET /_matrix/client/r0/rooms/{room_id}/members` endpoint, according to MSC2689. Contributed by Awesome Technologies Innovationslabor GmbH.