diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-07-05 16:47:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-05 16:47:58 +0100 |
commit | 80cc82a4459e4bbc926c6a57ae5e29278c2f9439 (patch) | |
tree | 53731feea39bb2015e6f4d63ad5964b6022b1c79 /synapse/handlers/room_member.py | |
parent | remove dead transaction persist code (#5622) (diff) | |
download | synapse-80cc82a4459e4bbc926c6a57ae5e29278c2f9439.tar.xz |
Remove support for invite_3pid_guest. (#5625)
This has never been documented, and I'm not sure it's ever been used outside sytest. It's quite a lot of poorly-maintained code, so I'd like to get rid of it. For now I haven't removed the database table; I suggest we leave that for a future clearout.
Diffstat (limited to 'synapse/handlers/room_member.py')
-rw-r--r-- | synapse/handlers/room_member.py | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 66b05b4732..679daaa074 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -119,24 +119,6 @@ class RoomMemberHandler(object): raise NotImplementedError() @abc.abstractmethod - def get_or_register_3pid_guest(self, requester, medium, address, inviter_user_id): - """Get a guest access token for a 3PID, creating a guest account if - one doesn't already exist. - - Args: - requester (Requester) - medium (str) - address (str) - inviter_user_id (str): The user ID who is trying to invite the - 3PID - - Returns: - Deferred[(str, str)]: A 2-tuple of `(user_id, access_token)` of the - 3PID guest account. - """ - raise NotImplementedError() - - @abc.abstractmethod def _user_joined_room(self, target, room_id): """Notifies distributor on master process that the user has joined the room. @@ -890,21 +872,6 @@ class RoomMemberHandler(object): "sender_avatar_url": inviter_avatar_url, } - if self.config.invite_3pid_guest: - guest_user_id, guest_access_token = yield self.get_or_register_3pid_guest( - requester=requester, - medium=medium, - address=address, - inviter_user_id=inviter_user_id, - ) - - invite_config.update( - { - "guest_access_token": guest_access_token, - "guest_user_id": guest_user_id, - } - ) - data = yield self.simple_http_client.post_urlencoded_get_json( is_url, invite_config ) @@ -1010,12 +977,6 @@ class RoomMemberMasterHandler(RoomMemberHandler): yield self.store.locally_reject_invite(target.to_string(), room_id) defer.returnValue({}) - def get_or_register_3pid_guest(self, requester, medium, address, inviter_user_id): - """Implements RoomMemberHandler.get_or_register_3pid_guest - """ - rg = self.registration_handler - return rg.get_or_register_3pid_guest(medium, address, inviter_user_id) - def _user_joined_room(self, target, room_id): """Implements RoomMemberHandler._user_joined_room """ |