summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-05-01 15:04:20 +0100
committerDavid Baker <dave@matrix.org>2015-05-01 15:04:37 +0100
commiteb9bd2d9491e550fa2abcd70efa22e56c282f9e1 (patch)
tree0b8ead8a1afcee0b40717a7321566c521ef1bf40 /synapse/rest/client/v2_alpha
parentThat wasn't a deferred (diff)
downloadsynapse-eb9bd2d9491e550fa2abcd70efa22e56c282f9e1.tar.xz
user_id now in user_threepids
Diffstat (limited to 'synapse/rest/client/v2_alpha')
-rw-r--r--synapse/rest/client/v2_alpha/account.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py

index 3e522ad39b..b082140f1f 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py
@@ -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)