diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-13 13:10:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 13:10:52 +0000 |
| commit | da87791975e578d83224b590f97892fb5cd4361a (patch) | |
| tree | 295c9f586a6982fdf6f7f616fc18c7d82ba6fa8c /synapse/handlers/room_member.py | |
| parent | Merge pull request #2984 from matrix-org/erikj/fix_rest_regeix (diff) | |
| parent | Refactor get_or_register_3pid_guest (diff) | |
| download | synapse-da87791975e578d83224b590f97892fb5cd4361a.tar.xz | |
Merge pull request #2983 from matrix-org/erikj/rename_register_3pid
Refactor get_or_register_3pid_guest
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index ed3b97730d..c3c720536e 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -735,20 +735,16 @@ class RoomMemberHandler(object): } if self.config.invite_3pid_guest: - registration_handler = self.registration_handler - guest_access_token = yield registration_handler.guest_access_token_for( + rh = self.registration_handler + guest_user_id, guest_access_token = yield rh.get_or_register_3pid_guest( medium=medium, address=address, inviter_user_id=inviter_user_id, ) - guest_user_info = yield self.auth.get_user_by_access_token( - guest_access_token - ) - invite_config.update({ "guest_access_token": guest_access_token, - "guest_user_id": guest_user_info["user"].to_string(), + "guest_user_id": guest_user_id, }) data = yield self.simple_http_client.post_urlencoded_get_json( |