Merge pull request #932 from matrix-org/rav/register_refactor

Further registration refactoring
This commit is contained in:
David Baker 2016-07-20 11:03:33 +01:00 committed by GitHub
commit e967bc86e7
5 changed files with 57 additions and 22 deletions

View file

@ -81,14 +81,16 @@ class RegistrationStore(SQLBaseStore):
)
@defer.inlineCallbacks
def register(self, user_id, token, password_hash,
def register(self, user_id, token=None, password_hash=None,
was_guest=False, make_guest=False, appservice_id=None,
create_profile_with_localpart=None, admin=False):
"""Attempts to register an account.
Args:
user_id (str): The desired user ID to register.
token (str): The desired access token to use for this user.
token (str): The desired access token to use for this user. If this
is not None, the given access token is associated with the user
id.
password_hash (str): Optional. The password hash for this user.
was_guest (bool): Optional. Whether this is a guest account being
upgraded to a non-guest account.