diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-19 17:15:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-19 17:15:24 +0100 |
| commit | ddfcdd47780dacc19a8b6ba8316cc4b2c6628b9f (patch) | |
| tree | 2b65d76c5b264d4a4cbcf7a3c5e08d260baad9e4 /synapse/rest/client/v1/room.py | |
| parent | Update changelog (diff) | |
| parent | Merge pull request #1131 from matrix-org/matthew/e2e-notifs (diff) | |
| download | synapse-ddfcdd47780dacc19a8b6ba8316cc4b2c6628b9f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 5584bfbfc0..45287bf05b 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -307,7 +307,7 @@ class PublicRoomListRestServlet(ClientV1RestServlet): server = parse_string(request, "server", default=None) try: - yield self.auth.get_user_by_req(request) + yield self.auth.get_user_by_req(request, allow_guest=True) except AuthError as e: # We allow people to not be authed if they're just looking at our # room list, but require auth when we proxy the request. @@ -339,7 +339,7 @@ class PublicRoomListRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_POST(self, request): - yield self.auth.get_user_by_req(request) + yield self.auth.get_user_by_req(request, allow_guest=True) server = parse_string(request, "server", default=None) content = parse_json_object_from_request(request) |