Merge branch 'anoa/hs_password_reset_sending_email' into anoa/hs_password_reset

This commit is contained in:
Andrew Morgan 2019-06-06 14:56:14 +01:00
commit fa2794405d

View file

@ -39,11 +39,6 @@ class RegistrationWorkerStore(SQLBaseStore):
self.config = hs.config
self.clock = hs.get_clock()
# Create a background job for culling expired 3PID validity tokens
hs.get_clock().looping_call(
self.cull_expired_threepid_validation_tokens, THIRTY_MINUTES_IN_MS,
)
@cached()
def get_user_by_id(self, user_id):
return self._simple_select_one(
@ -603,6 +598,11 @@ class RegistrationStore(
"user_threepids_grandfather", self._bg_user_threepids_grandfather,
)
# Create a background job for culling expired 3PID validity tokens
hs.get_clock().looping_call(
self.cull_expired_threepid_validation_tokens, THIRTY_MINUTES_IN_MS,
)
@defer.inlineCallbacks
def add_access_token_to_user(self, user_id, token, device_id=None):
"""Adds an access token for the given user.