diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-03-08 10:20:41 +0000 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-03-08 10:20:41 +0000 |
| commit | f40131b4d98766e5f341a406a0f24e470d763ee9 (patch) | |
| tree | f694a2cfe324606734155df34b6830fab31df6eb /synapse/handlers | |
| parent | Merge pull request #626 from matrix-org/erikj/visibility (diff) | |
| parent | Fix tests (diff) | |
| download | synapse-f40131b4d98766e5f341a406a0f24e470d763ee9.tar.xz | |
Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id
Send the user ID matching the guest access token
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/room.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 0cb6c521c4..57113ae4a5 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -884,6 +884,10 @@ class RoomMemberHandler(BaseHandler): inviter_user_id=inviter_user_id, ) + guest_user_info = yield self.hs.get_auth().get_user_by_access_token( + guest_access_token + ) + is_url = "%s%s/_matrix/identity/api/v1/store-invite" % ( id_server_scheme, id_server, ) @@ -900,6 +904,7 @@ class RoomMemberHandler(BaseHandler): "sender": inviter_user_id, "sender_display_name": inviter_display_name, "sender_avatar_url": inviter_avatar_url, + "guest_user_id": guest_user_info["user"].to_string(), "guest_access_token": guest_access_token, } ) |