summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-11-30 16:53:20 +0000
committerGitHub <noreply@github.com>2016-11-30 16:53:20 +0000
commit321fe5c44c3cdd9c7ac3651657de42aa71f11b29 (patch)
treeb2b6679c398ceec7651ae59027c3f85faeb1e7b7 /synapse/handlers/register.py
parentMerge pull request #1653 from matrix-org/rav/guest_e2e (diff)
parentComments (diff)
downloadsynapse-321fe5c44c3cdd9c7ac3651657de42aa71f11b29.tar.xz
Merge pull request #1656 from matrix-org/rav/remove_time_caveat
Stop putting a time caveat on access tokens
Diffstat (limited to '')
-rw-r--r--synapse/handlers/register.py5
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(