user_id now in user_threepids

This commit is contained in:
David Baker 2015-05-01 15:04:20 +01:00
parent 2d386d7038
commit eb9bd2d949
2 changed files with 6 additions and 6 deletions

View file

@ -65,12 +65,12 @@ class PasswordRestServlet(RestServlet):
if 'medium' not in threepid or 'address' not in threepid:
raise SynapseError(500, "Malformed threepid")
# if using email, we must know about the email they're authing with!
threepid_user = yield self.hs.get_datastore().get_user_by_threepid(
threepid_user_id = yield self.hs.get_datastore().get_user_id_by_threepid(
threepid['medium'], threepid['address']
)
if not threepid_user:
if not threepid_user_id:
raise SynapseError(404, "Email address not found", Codes.NOT_FOUND)
user_id = threepid_user
user_id = threepid_user_id
else:
logger.error("Auth succeeded but no known type!", result.keys())
raise SynapseError(500, "", Codes.UNKNOWN)