diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-12 15:19:55 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-12 15:19:55 +0000 |
| commit | 0d08670f613e2f96f0aa38ef667e0bfb4b675617 (patch) | |
| tree | 1ac237483399c7e2c81352d4908dddc0a2cfb18a /synapse/rest | |
| parent | Fix bug where assumed dict was namedtuple (diff) | |
| parent | Allow guest access to room initialSync (diff) | |
| download | synapse-0d08670f613e2f96f0aa38ef667e0bfb4b675617.tar.xz | |
Merge pull request #360 from matrix-org/daniel/guestroominitialsync
Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index c583025e30..d298aee3ab 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -372,12 +372,13 @@ class RoomInitialSyncRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): - user, _, _ = yield self.auth.get_user_by_req(request) + user, _, is_guest = yield self.auth.get_user_by_req(request, allow_guest=True) pagination_config = PaginationConfig.from_request(request) content = yield self.handlers.message_handler.room_initial_sync( room_id=room_id, user_id=user.to_string(), pagin_config=pagination_config, + is_guest=is_guest, ) defer.returnValue((200, content)) |