Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/rest/client/v2_alpha/account.py
View File

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

6
synapse/storage/registration.py
View File

@ -202,15 +202,15 @@ class RegistrationStore(SQLBaseStore):
defer.returnValue(ret) defer.returnValue(ret)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_user_by_threepid(self, medium, address): def get_user_id_by_threepid(self, medium, address):
ret = yield self._simple_select_one( ret = yield self._simple_select_one(
"user_threepids", "user_threepids",
{ {
"medium": medium, "medium": medium,
"address": address "address": address
}, },
['user'], True, 'get_user_by_threepid' ['user_id'], True, 'get_user_id_by_threepid'
) )
if ret: if ret:
defer.returnValue(ret['user']) defer.returnValue(ret['user_id'])
defer.returnValue(None) defer.returnValue(None)