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

Allow guests to operate in encrypted rooms #7314

Merged
merged 5 commits into from
Aug 3, 2020
Merged

Allow guests to operate in encrypted rooms #7314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ce2ad1
Allow guests to operate in encrypted rooms
awesome-michael Apr 21, 2020
1776b00
Remove access to deprecated endpoint
awesome-michael Jul 25, 2020
5d323c2
Add changelog
awesome-michael Jul 29, 2020
be8b233
Merge develop into guest_access
awesome-michael Jul 29, 2020
6fa4d0e
Rename changelog
awesome-michael Jul 30, 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
2 changes: 1 addition & 1 deletion synapse/rest/client/v1/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def __init__(self, hs):
self._event_serializer = hs.get_event_client_serializer()

async def on_GET(self, request, event_id):
requester = await self.auth.get_user_by_req(request)
requester = await self.auth.get_user_by_req(request, allow_guest=True)
Copy link
Member

Choose a reason for hiding this comment

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

this endpoint is deprecated, and nothing should be using it. See https://matrix.org/docs/spec/client_server/r0.6.1#deprecated-get-matrix-client-r0-events-eventid.

event = await self.event_handler.get_event(requester.user, None, event_id)

time_now = self.clock.time_msec()
Expand Down
2 changes: 1 addition & 1 deletion synapse/rest/client/v1/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,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,
Expand Down