diff options
author | Erik Johnston <erikj@jki.re> | 2016-07-14 15:51:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-14 15:51:52 +0100 |
commit | 209e04fa1192c3134f35f034d1ce02c6ad2fe658 (patch) | |
tree | d25564446dd0027da91269a427bab598ccf56024 /synapse/handlers/register.py | |
parent | Merge pull request #915 from matrix-org/dbkr/more_requesttokens (diff) | |
parent | Bug fix: expire invalid access tokens (diff) | |
download | synapse-209e04fa1192c3134f35f034d1ce02c6ad2fe658.tar.xz |
Merge pull request #918 from negzi/bugfix_for_token_expiry
Bug fix: expire invalid access tokens
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r-- | synapse/handlers/register.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 8c3381df8a..6b33b27149 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -360,7 +360,7 @@ class RegistrationHandler(BaseHandler): defer.returnValue(data) @defer.inlineCallbacks - def get_or_create_user(self, localpart, displayname, duration_seconds, + def get_or_create_user(self, localpart, displayname, duration_in_ms, password_hash=None): """Creates a new user if the user does not exist, else revokes all previous access tokens and generates a new one. @@ -390,8 +390,8 @@ class RegistrationHandler(BaseHandler): user = UserID(localpart, self.hs.hostname) user_id = user.to_string() - token = self.auth_handler().generate_short_term_login_token( - user_id, duration_seconds) + token = self.auth_handler().generate_access_token( + user_id, None, duration_in_ms) if need_register: yield self.store.register( |