diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 16:56:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 16:56:29 -0700 |
| commit | 19bb5c80241782dbb257aabb40094c1aa8c22847 (patch) | |
| tree | 97fdf219de3ed852dfe3e35aebe98a4f1122a9ba /synapse/handlers/initial_sync.py | |
| parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
| parent | add user signature stream change cache to slaved device store (diff) | |
| download | synapse-19bb5c80241782dbb257aabb40094c1aa8c22847.tar.xz | |
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Cross-signing [2/4] - upload/download keys
Diffstat (limited to 'synapse/handlers/initial_sync.py')
| -rw-r--r-- | synapse/handlers/initial_sync.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index 42d6650ed9..f991efeee3 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -449,8 +449,7 @@ class InitialSyncHandler(BaseHandler): # * The user is a guest user, and has joined the room # else it will throw. member_event = yield self.auth.check_user_was_in_room(room_id, user_id) - return (member_event.membership, member_event.event_id) - return + return member_event.membership, member_event.event_id except AuthError: visibility = yield self.state_handler.get_current_state( room_id, EventTypes.RoomHistoryVisibility, "" @@ -459,8 +458,7 @@ class InitialSyncHandler(BaseHandler): visibility and visibility.content["history_visibility"] == "world_readable" ): - return (Membership.JOIN, None) - return + return Membership.JOIN, None raise AuthError( 403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN ) |