diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-07-08 14:52:26 +0100 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-07-08 23:52:26 +1000 |
commit | 1af2fcd492c81075a9d75a5578d8d599af3cea0c (patch) | |
tree | deb79e3d7fdb0ef304bf76e8a61cd7a9d8e5aa9a /synapse/handlers | |
parent | Add a few more common environment directory names to black exclusion (#5630) (diff) | |
download | synapse-1af2fcd492c81075a9d75a5578d8d599af3cea0c.tar.xz |
Move get_or_create_user to test code (#5628)
This is only used in tests, so...
Diffstat (limited to 'synapse/handlers')
-rw-r--r-- | synapse/handlers/register.py | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index fd55eb1654..853020180b 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -506,57 +506,6 @@ class RegistrationHandler(BaseHandler): defer.returnValue(data) @defer.inlineCallbacks - def get_or_create_user(self, requester, localpart, displayname, password_hash=None): - """Creates a new user if the user does not exist, - else revokes all previous access tokens and generates a new one. - - Args: - localpart : The local part of the user ID to register. If None, - one will be randomly generated. - Returns: - A tuple of (user_id, access_token). - Raises: - RegistrationError if there was a problem registering. - - NB this is only used in tests. TODO: move it to the test package! - """ - if localpart is None: - raise SynapseError(400, "Request must include user id") - yield self.auth.check_auth_blocking() - need_register = True - - try: - yield self.check_username(localpart) - except SynapseError as e: - if e.errcode == Codes.USER_IN_USE: - need_register = False - else: - raise - - user = UserID(localpart, self.hs.hostname) - user_id = user.to_string() - token = self.macaroon_gen.generate_access_token(user_id) - - if need_register: - yield self.register_with_store( - user_id=user_id, - token=token, - password_hash=password_hash, - create_profile_with_displayname=user.localpart, - ) - else: - yield self._auth_handler.delete_access_tokens_for_user(user_id) - yield self.store.add_access_token_to_user(user_id=user_id, token=token) - - if displayname is not None: - logger.info("setting user display name: %s -> %s", user_id, displayname) - yield self.profile_handler.set_displayname( - user, requester, displayname, by_admin=True - ) - - defer.returnValue((user_id, token)) - - @defer.inlineCallbacks def _join_user_to_room(self, requester, room_identifier): room_id = None room_member_handler = self.hs.get_room_member_handler() |