summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-07-14 15:51:52 +0100
committerGitHub <noreply@github.com>2016-07-14 15:51:52 +0100
commit209e04fa1192c3134f35f034d1ce02c6ad2fe658 (patch)
treed25564446dd0027da91269a427bab598ccf56024 /synapse/rest
parentMerge pull request #915 from matrix-org/dbkr/more_requesttokens (diff)
parentBug fix: expire invalid access tokens (diff)
downloadsynapse-209e04fa1192c3134f35f034d1ce02c6ad2fe658.tar.xz
Merge pull request #918 from negzi/bugfix_for_token_expiry
Bug fix: expire invalid access tokens
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/register.py b/synapse/rest/client/v1/register.py

index ce7099b18f..8e1f1b7845 100644 --- a/synapse/rest/client/v1/register.py +++ b/synapse/rest/client/v1/register.py
@@ -429,7 +429,7 @@ class CreateUserRestServlet(ClientV1RestServlet): user_id, token = yield handler.get_or_create_user( localpart=localpart, displayname=displayname, - duration_seconds=duration_seconds, + duration_in_ms=(duration_seconds * 1000), password_hash=password_hash )