@@ -121,7 +121,7 @@ class ThreePidValSessionStore:
if not s.clientSecret == clientSecret:
raise IncorrectClientSecretException()
- if s.mtime + ValidationSession.THREEPID_SESSION_VALID_LIFETIME < time_msec():
+ if s.mtime + ValidationSession.THREEPID_SESSION_VALID_LIFETIME_MS < time_msec():
raise SessionExpiredException()
if not s.validated:
@@ -17,10 +17,10 @@
class ValidationSession:
# how long a user can wait before validating a session after starting it
- THREEPID_SESSION_VALIDATION_TIMEOUT = 24 * 60 * 60 * 1000
+ THREEPID_SESSION_VALIDATION_TIMEOUT_MS = 24 * 60 * 60 * 1000
# how long we keep sessions for after they've been validated
- THREEPID_SESSION_VALID_LIFETIME = 24 * 60 * 60 * 1000
+ THREEPID_SESSION_VALID_LIFETIME_MS = 24 * 60 * 60 * 1000
def __init__(self, _id, _medium, _address, _clientSecret, _validated, _mtime):
self.id = _id
@@ -93,7 +93,7 @@ class EmailValidator:
logger.info("Incorrect client secret", (sid))
- if s.mtime + ValidationSession.THREEPID_SESSION_VALIDATION_TIMEOUT < time_msec():
+ if s.mtime + ValidationSession.THREEPID_SESSION_VALIDATION_TIMEOUT_MS < time_msec():
logger.info("Session expired")