diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
| commit | dc4b23e1a102071227288bb9d2ad77611f0d34c8 (patch) | |
| tree | c1147b1f393c416daa7fd8855850e42caf9d9956 /synapse/handlers/register.py | |
| parent | Stop generating refresh tokens (diff) | |
| parent | Merge pull request #1660 from matrix-org/rav/better_content_type_validation (diff) | |
| download | synapse-dc4b23e1a102071227288bb9d2ad77611f0d34c8.tar.xz | |
Merge branch 'develop' into rav/no_more_refresh_tokens
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 7e119f13b1..886fec8701 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -369,7 +369,7 @@ class RegistrationHandler(BaseHandler): defer.returnValue(data) @defer.inlineCallbacks - def get_or_create_user(self, requester, localpart, displayname, duration_in_ms, + 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. @@ -399,8 +399,7 @@ class RegistrationHandler(BaseHandler): user = UserID(localpart, self.hs.hostname) user_id = user.to_string() - token = self.auth_handler().generate_access_token( - user_id, None, duration_in_ms) + token = self.auth_handler().generate_access_token(user_id) if need_register: yield self.store.register( |